Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 14 additions & 14 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion test/scripts/run_integration_tests.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down