Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

DCOS_OSS-4316 REX-Ray: bump to v0.11.4 [1.11 Backport] and unmute test_rexray.py #5067

Merged
merged 3 commits into from Apr 11, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 2 additions & 0 deletions CHANGES.md
Expand Up @@ -22,6 +22,8 @@ Format of the entries must be.

* Fix a race condition in L4LB (DCOS_OSS-4939)

* Updated REX-Ray version to 0.11.4 (DCOS_OSS-4316) (COPS-3961) [rexray v0.11.4](https://github.com/rexray/rexray/releases/tag/v0.11.4)

### Security updates

* Update to OpenSSL 1.0.2r. (DCOS_OSS-4868)
Expand Down
8 changes: 3 additions & 5 deletions packages/dcos-integration-test/extra/test_rexray.py
Expand Up @@ -7,11 +7,6 @@
from test_helpers import get_expanded_config


@pytest.mark.xfailflake(
jira='DCOS_OSS-4922',
reason='test_rexray.test_move_external_volume_to_new_agent fails',
since='2019-03-18'
)
def test_move_external_volume_to_new_agent(dcos_api_session):
"""Test that an external volume is successfully attached to a new agent.

Expand All @@ -23,6 +18,9 @@ def test_move_external_volume_to_new_agent(dcos_api_session):
if not (expanded_config['provider'] == 'aws' or expanded_config['platform'] == 'aws'):
pytest.skip('Must be run in an AWS environment!')

if expanded_config.get('security') == 'strict':
pytest.skip('See: https://jira.mesosphere.com/browse/DCOS_OSS-4922')

hosts = dcos_api_session.slaves[0], dcos_api_session.slaves[-1]
test_uuid = uuid.uuid4().hex
test_label = 'integration-test-move-external-volume-{}'.format(test_uuid)
Expand Down
4 changes: 2 additions & 2 deletions packages/rexray/buildinfo.json
Expand Up @@ -2,7 +2,7 @@
"single_source" : {
"kind": "git",
"git": "https://github.com/rexray/rexray.git",
"ref": "fc8bfbd2d02c2690fc3a755a9560dd12c88e0852",
"ref_origin": "v0.11.2"
"ref": "e7414eaa971b27977d2283f2882825393493179d",
"ref_origin": "v0.11.4"
}
}