diff options
author | Max Wittig <max.wittig95@gmail.com> | 2019-07-11 18:22:25 +0200 |
---|---|---|
committer | Max Wittig <max.wittig95@gmail.com> | 2019-07-11 18:22:25 +0200 |
commit | 44f112d98a298b0b92de0434463f33a7e0e0c4d6 (patch) | |
tree | a51b0aabcd51796c0cf232fb7e6fd7aeb17bf291 | |
parent | ad1c0dda37f573673beaf9f25187f51751a5a484 (diff) | |
download | gitlab-chore/fix-travis-again.tar.gz |
fix: fix testsfix/travis-testschore/fix-travis-again
-rw-r--r-- | .travis-ci.yml (renamed from .travis.yml) | 9 | ||||
-rwxr-xr-x | tools/build_test_env.sh | 3 |
2 files changed, 10 insertions, 2 deletions
diff --git a/.travis.yml b/.travis-ci.yml index 1e9cc4d..f2162de 100644 --- a/.travis.yml +++ b/.travis-ci.yml @@ -1,8 +1,15 @@ sudo: required +dist: xenial services: - docker +addons: + apt: + sources: + - deadsnakes + packages: + - python3.7 language: python -python: 2.7 +python: 3.7 env: - TOX_ENV=py_func_v4 - TOX_ENV=cli_func_v4 diff --git a/tools/build_test_env.sh b/tools/build_test_env.sh index 624f879..566ffbd 100755 --- a/tools/build_test_env.sh +++ b/tools/build_test_env.sh @@ -122,6 +122,7 @@ done # Get the token TOKEN=$($(dirname $0)/generate_token.py) +echo $TOKEN cat > $CONFIG << EOF [global] @@ -138,6 +139,6 @@ log "Config file content ($CONFIG):" log <$CONFIG log "Pausing to give GitLab some time to finish starting up..." -sleep 60 +sleep 500 log "Test environment initialized." |