From 72d741a9b75893326266804b2790eec89dad6755 Mon Sep 17 00:00:00 2001 From: Andrey Smirnov Date: Fri, 13 Apr 2018 23:18:53 +0300 Subject: [PATCH 1/4] Replace S3 creds --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index fa83eda3..3a72b6c0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -20,7 +20,7 @@ addons: env: global: - secure: "YSwtFrMqh4oUvdSQTXBXMHHLWeQgyNEL23ChIZwU0nuDGIcQZ65kipu0PzefedtUbK4ieC065YCUi4UDDh6gPotB/Wu1pnYg3dyQ7rFvhaVYAAUEpajAdXZhlx+7+J8a4FZMeC/kqiahxoRgLbthF9019ouIqhGB9zHKI6/yZwc=" - - secure: "V7OjWrfQ8UbktgT036jYQPb/7GJT3Ol9LObDr8FYlzsQ+F1uj2wLac6ePuxcOS4FwWOJinWGM1h+JiFkbxbyFqfRNJ0jj0O2p93QyDojxFVOn1mXqqvV66KFqAWR2Vzkny/gDvj8LTvdB1cgAIm2FNOkQc6E1BFnyWS2sN9ea5E=" + - secure: "EcCzJsqQ3HnIkprBPS1YHErsETcb7KQFBYEzVDE7RYDApWeapLq+r/twMtWMd/fkGeLzr3kWSg7nhSadeHMLYeMl9j+U7ncC5CWG5NMBOj/jowlb9cMCCDlmzMoZLAgR6jm1cJyrWCLsWVlv+D0ZiB0fx4xaBZP/gIr9g6nEwC8=" - secure: "OxiVNmre2JzUszwPNNilKDgIqtfX2gnRSsVz6nuySB1uO2yQsOQmKWJ9cVYgH2IB5H8eWXKOhexcSE28kz6TPLRuEcU9fnqKY3uEkdwm7rJfz9lf+7C4bJEUdA1OIzJppjnWUiXxD7CEPL1DlnMZM24eDQYqa/4WKACAgkK53gE=" - NO_FTP_ACCESS: "yes" before_install: From 9a65bbe12ca86c1187612f749a144a6e2baed374 Mon Sep 17 00:00:00 2001 From: Andrey Smirnov Date: Fri, 13 Apr 2018 23:42:07 +0300 Subject: [PATCH 2/4] Add debug output on tests being skipped --- system/s3_lib.py | 4 +++- system/swift_lib.py | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/system/s3_lib.py b/system/s3_lib.py index 6e06c020..bf74a93b 100644 --- a/system/s3_lib.py +++ b/system/s3_lib.py @@ -8,8 +8,10 @@ try: if 'AWS_SECRET_ACCESS_KEY' in os.environ and 'AWS_ACCESS_KEY_ID' in os.environ: s3_conn = boto.connect_s3() else: + print "S3 tests disabled: AWS creds not found in the environment" s3_conn = None -except ImportError: +except ImportError, e: + print "S3 tests disabled: can't import boto", e s3_conn = None diff --git a/system/swift_lib.py b/system/swift_lib.py index 30b50ad0..2ddb0e15 100644 --- a/system/swift_lib.py +++ b/system/swift_lib.py @@ -23,8 +23,10 @@ try: swift_conn = swiftclient.Connection(auth_url, auth_username, auth_password, auth_version=1) else: + print "Swift tests disabled: OpenStack creds not found in the environment" swift_conn = None -except ImportError: +except ImportError, e: + print "Swift tests disabled: unable to import swiftclient", e swift_conn = None From 548dcdb242a5151a6d359b982db7dbe1773509fe Mon Sep 17 00:00:00 2001 From: Andrey Smirnov Date: Fri, 13 Apr 2018 23:53:01 +0300 Subject: [PATCH 3/4] Add google_compute_engine boto dependency (why???) --- system/requirements.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/system/requirements.txt b/system/requirements.txt index b9847875..4fd59d9a 100644 --- a/system/requirements.txt +++ b/system/requirements.txt @@ -3,3 +3,4 @@ requests requests-unixsocket python-swiftclient flake8 +google_compute_engine From e65fff058c5e420019f4e7dcbd5c65154ed9bd24 Mon Sep 17 00:00:00 2001 From: Andrey Smirnov Date: Fri, 13 Apr 2018 23:55:49 +0300 Subject: [PATCH 4/4] Fix build on Travis --- .travis.yml | 1 + system/requirements.txt | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 3a72b6c0..60cda437 100644 --- a/.travis.yml +++ b/.travis.yml @@ -23,6 +23,7 @@ env: - secure: "EcCzJsqQ3HnIkprBPS1YHErsETcb7KQFBYEzVDE7RYDApWeapLq+r/twMtWMd/fkGeLzr3kWSg7nhSadeHMLYeMl9j+U7ncC5CWG5NMBOj/jowlb9cMCCDlmzMoZLAgR6jm1cJyrWCLsWVlv+D0ZiB0fx4xaBZP/gIr9g6nEwC8=" - secure: "OxiVNmre2JzUszwPNNilKDgIqtfX2gnRSsVz6nuySB1uO2yQsOQmKWJ9cVYgH2IB5H8eWXKOhexcSE28kz6TPLRuEcU9fnqKY3uEkdwm7rJfz9lf+7C4bJEUdA1OIzJppjnWUiXxD7CEPL1DlnMZM24eDQYqa/4WKACAgkK53gE=" - NO_FTP_ACCESS: "yes" + - BOTO_CONFIG: /dev/null before_install: - virtualenv system/env - . system/env/bin/activate diff --git a/system/requirements.txt b/system/requirements.txt index 4fd59d9a..b9847875 100644 --- a/system/requirements.txt +++ b/system/requirements.txt @@ -3,4 +3,3 @@ requests requests-unixsocket python-swiftclient flake8 -google_compute_engine