From d4b0b74860cf198845fffa0810f3d45fc69e0b42 Mon Sep 17 00:00:00 2001 From: Abhilash Raj Date: Tue, 23 May 2017 15:59:20 -0700 Subject: [PATCH] Test should test the current branch version and not the 'latest'. --- .travis.yml | 3 ++- tests/generate_tests.sh | 15 +++++++++++++++ 2 files changed, 17 insertions(+), 1 deletion(-) create mode 100644 tests/generate_tests.sh diff --git a/.travis.yml b/.travis.yml index 3704d07..804737b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,7 +12,8 @@ install: - docker-compose --version before_script: - - docker-compose up -d + - tests/generate_tests.sh + - docker-compose -f docker-compose.yaml -f docker-test.yaml up -d - docker inspect -f '{{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}' mailman-core - docker inspect -f '{{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}' mailman-web - docker-compose ps diff --git a/tests/generate_tests.sh b/tests/generate_tests.sh new file mode 100644 index 0000000..779cd13 --- /dev/null +++ b/tests/generate_tests.sh @@ -0,0 +1,15 @@ +if [ "$TRAVIS_BRANCH" = "master" ]; then + TAG="latest" +else + TAG="$TRAVIS_BRANCH" +fi + + +cat > docker-test.yaml <