From 51fc0956e1c63804e600295b3fc00484e58b5b8f Mon Sep 17 00:00:00 2001 From: Michael Bonfils Date: Thu, 25 Jul 2019 11:56:26 +0200 Subject: [PATCH] Use 19.04 and 18.10 SDS versions for test --- .gitmodules | 2 +- .travis.yml | 10 +++++----- test-requirements.txt | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.gitmodules b/.gitmodules index 38e795e4..bae6f2e0 100644 --- a/.gitmodules +++ b/.gitmodules @@ -7,7 +7,7 @@ path = third_party/oio-sds url = https://github.com/open-io/oio-sds.git # Latest stable/supported version - branch = 4.x + branch = 5.x [submodule "third_party/swift3"] path = third_party/swift3 url = https://github.com/open-io/swift3 diff --git a/.travis.yml b/.travis.yml index 3d12f3d5..b6c96656 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,16 +14,16 @@ env: matrix: - TEST_SUITE=s3 # Latest stable/supported versions - TEST_SUITE=s3 SDS_BRANCH=master # Integration with latest versions - - TEST_SUITE=s3 SDS_BRANCH=4.2.x SWIFT_BRANCH=stable/pike # Previous versions + - TEST_SUITE=s3 SDS_BRANCH=4.x SWIFT_BRANCH=stable/pike # Previous versions - TEST_SUITE=encryption - TEST_SUITE=encryption SDS_BRANCH=master - - TEST_SUITE=encryption SDS_BRANCH=4.2.x SWIFT_BRANCH=stable/pike + - TEST_SUITE=encryption SDS_BRANCH=4.x SWIFT_BRANCH=stable/pike - TEST_SUITE=swift - - TEST_SUITE=swift SDS_BRANCH=4.2.x SWIFT_BRANCH=stable/pike + - TEST_SUITE=swift SDS_BRANCH=4.x SWIFT_BRANCH=stable/pike - TEST_SUITE=ns-wide-versioning - - TEST_SUITE=ns-wide-versioning SDS_BRANCH=4.2.x SWIFT_BRANCH=stable/pike + - TEST_SUITE=ns-wide-versioning SDS_BRANCH=4.x SWIFT_BRANCH=stable/pike - TEST_SUITE=unit - - TEST_SUITE=unit SDS_BRANCH=4.2.x SWIFT_BRANCH=stable/pike + - TEST_SUITE=unit SDS_BRANCH=4.x SWIFT_BRANCH=stable/pike before_install: - sudo apt-get update -qq diff --git a/test-requirements.txt b/test-requirements.txt index f23a5053..a6530f75 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -5,6 +5,6 @@ lxml mock nose nose-timer -oio>=4.1.0 +oio>=4.8.0 s3cmd unittest2