diff --git a/.travis.yml b/.travis.yml index 23af4a98616..7f06ecfcd85 100644 --- a/.travis.yml +++ b/.travis.yml @@ -74,7 +74,7 @@ before_install: fi; - if [[ $TRAVIS_SECURE_ENV_VARS == true ]]; then echo "Logging in to dockerhub"; - docker login --username=$DOCKER_SERVICE_LOGIN --password=$DOCKER_SERVICE_PASS; + docker login --username=$DOCKER_SERVICE_LOGIN --password=$DOCKER_SERVICE_TOKEN; fi - REPORT_PATH=${TRAVIS_BRANCH}_${TRAVIS_JOB_NUMBER}; - if [[ $TRAVIS_SECURE_ENV_VARS == true && $TRAVIS_EVENT_TYPE != cron ]]; then @@ -84,7 +84,7 @@ before_install: if [[ ${TESTS_REQUIRE_GCLOUD} == true ]]; then scripts/travis/install_and_authenticate_to_gcloud.sh; fi; - openssl aes-256-cbc -K $encrypted_4823d58debd3_key -iv $encrypted_4823d58debd3_iv -in resources_for_CI/github_deploy_key.enc -out ~/.ssh/id_rsa -d; + openssl aes-256-cbc -K $encrypted_8ebb1ef83f64_key -iv $encrypted_8ebb1ef83f64_iv -in resources_for_CI/github_deploy_key.enc -out ~/.ssh/id_rsa -d; chmod 600 ~/.ssh/id_rsa; echo "Testing github authentication:"; ssh -T git@github.com; diff --git a/resources_for_CI/github_deploy_key.enc b/resources_for_CI/github_deploy_key.enc index 54499b0e361..53a8670ba03 100644 Binary files a/resources_for_CI/github_deploy_key.enc and b/resources_for_CI/github_deploy_key.enc differ diff --git a/resources_for_CI/servicekey.json.enc b/resources_for_CI/servicekey.json.enc index a290709f7df..0e6a8fad886 100644 Binary files a/resources_for_CI/servicekey.json.enc and b/resources_for_CI/servicekey.json.enc differ diff --git a/scripts/travis/install_and_authenticate_to_gcloud.sh b/scripts/travis/install_and_authenticate_to_gcloud.sh index 84de1398095..edc2c48fb3f 100755 --- a/scripts/travis/install_and_authenticate_to_gcloud.sh +++ b/scripts/travis/install_and_authenticate_to_gcloud.sh @@ -3,7 +3,7 @@ # This is expected to be run from the travis root directory. export BOTO_CONFIG=/dev/null; # see for more information https://github.com/broadinstitute/gatk/pull/3350 -openssl aes-256-cbc -K $encrypted_703d76169d63_key -iv $encrypted_703d76169d63_iv -in resources_for_CI/servicekey.json.enc -out servicekey.json -d; +openssl aes-256-cbc -K $encrypted_c51214b7dd65_key -iv $encrypted_c51214b7dd65_iv -in resources_for_CI/servicekey.json.enc -out servicekey.json -d; scripts/travis/install_gcloud.sh; $GCLOUD_HOME/gcloud components update --quiet; if [[ $TEST_TYPE == cloud ]]; then