diff --git a/.travis.yml b/.travis.yml index dc2608d9..399ada35 100644 --- a/.travis.yml +++ b/.travis.yml @@ -128,7 +128,7 @@ script: - if [ "$TRAVIS_EVENT_TYPE" != "pull_request" ]; then export e2e=true; fi - if [ "$e2e" = true ]; then export gam_user=gam-travis-$jid@pdl.jaylee.us; fi - if [ "$e2e" = true ]; then openssl aes-256-cbc -K $encrypted_ab10ec38326e_key -iv $encrypted_ab10ec38326e_iv -in travis/oauth2service.json.enc -out $gampath/oauth2service.json -d; fi -- if [ "$e2e" = true ]; then cat travis/cfg_template.json | python travis/svars-write.py &> /dev/null; fi +- if [ "$e2e" = true ]; then cat travis/cfg_template.json | $python travis/svars-write.py &> /dev/null; fi - if [ "$e2e" = true ]; then $gam info domain; fi - if [ "$e2e" = true ]; then $gam oauth info; fi - if [ "$e2e" = true ]; then $gam oauth refresh; fi diff --git a/src/travis/svars-write.py b/src/travis/svars-write.py index e0ca137f..615bdcdf 100644 --- a/src/travis/svars-write.py +++ b/src/travis/svars-write.py @@ -6,8 +6,8 @@ cfg = json.load(sys.stdin) cfg['client_secret'] = os.getenv('client_secret') jid = os.getenv('jid') cfg['refresh_token'] = os.getenv('refresh_%s' % jid) -vmtype = os.getenv('VMTYPE') -if vmtype == 'test': +name = os.getenv('TRAVIS_JOB_NAME') +if name.endswith('Testing'): out_file = 'oauth2.txt' else: out_file = 'gam/oauth2.txt'