deepblue/GoogleDriveManagement
1
0
Fork 0
mirror of https://github.com/GAM-team/GAM.git synced 2026-07-03 20:31:35 +00:00
Code Issues Actions 13 Packages Projects Releases Wiki Activity

Fix svars-write.py for Testing instances

Browse Source
This commit is contained in:
Jay Lee
2020-03-29 19:55:57 -04:00
parent 68745703f8
commit b677e8b4b2
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.travis.yml
View File

@@ -128,7 +128,7 @@ script:
- if [ "$TRAVIS_EVENT_TYPE" != "pull_request" ]; then export e2e=true; fi - 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 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 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 info domain; fi
- if [ "$e2e" = true ]; then $gam oauth info; fi - if [ "$e2e" = true ]; then $gam oauth info; fi
- if [ "$e2e" = true ]; then $gam oauth refresh; fi - if [ "$e2e" = true ]; then $gam oauth refresh; fi

4
src/travis/svars-write.py
View File

@@ -6,8 +6,8 @@ cfg = json.load(sys.stdin)
cfg['client_secret'] = os.getenv('client_secret') cfg['client_secret'] = os.getenv('client_secret')
jid = os.getenv('jid') jid = os.getenv('jid')
cfg['refresh_token'] = os.getenv('refresh_%s' % jid) cfg['refresh_token'] = os.getenv('refresh_%s' % jid)
vmtype = os.getenv('VMTYPE') name = os.getenv('TRAVIS_JOB_NAME')
if vmtype == 'test': if name.endswith('Testing'):
out_file = 'oauth2.txt' out_file = 'oauth2.txt'
else: else:
out_file = 'gam/oauth2.txt' out_file = 'gam/oauth2.txt'