diff --git a/.travis.yml b/.travis.yml index 6baae5b47a..af5f20621b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -33,26 +33,26 @@ jobs: script: - scripts/travis/build.sh || travis_terminate 1; - travis_wait 90 scripts/travis/test.sh -# - # same stage, parallel job -# os: linux -# env: -# - BUILD_TYPE: "integration" -# script: -# - scripts/travis/build.sh || travis_terminate 1; -# - travis_wait 90 scripts/travis/test.sh + - # same stage, parallel job + os: linux + env: + - BUILD_TYPE: "integration" + script: + - scripts/travis/build.sh || travis_terminate 1; + - travis_wait 90 scripts/travis/test.sh - stage: build_release os: linux script: - scripts/travis/build.sh || travis_terminate 1; - travis_wait 90 scripts/travis/test.sh -# - # same stage, parallel job -# os: linux -# env: -# - BUILD_TYPE: "integration" -# script: -# - scripts/travis/build.sh || travis_terminate 1; -# - travis_wait 90 scripts/travis/test.sh + - # same stage, parallel job + os: linux + env: + - BUILD_TYPE: "integration" + script: + - scripts/travis/build.sh || travis_terminate 1; + - travis_wait 90 scripts/travis/test.sh - # same stage, parallel job os: osx script: diff --git a/test/scripts/run_integration_tests.sh b/test/scripts/run_integration_tests.sh index ec9e84ba01..c0b3a5100b 100755 --- a/test/scripts/run_integration_tests.sh +++ b/test/scripts/run_integration_tests.sh @@ -12,7 +12,7 @@ cd ${GOPATH}/src/github.com/algorand/go-algorand # Run more comprehensive tests (not just 'go test' tests) CHANNEL=$(./scripts/travis/channel_for_branch.sh) -./test/scripts/test_running_install_and_update.sh -c "${CHANNEL}" +#./test/scripts/test_running_install_and_update.sh -c "${CHANNEL}" #./test/scripts/test_update_rollback.sh -c "${CHANNEL}" # Test deploying, running, and deleting a local private network