Add tomcat 7 tests

rundeck · Mar 7, 2019 · 91f7d7d · 91f7d7d
1 parent 6f61eb5
commit 91f7d7d
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 10 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -76,11 +76,16 @@ jobs:
     - script_block 'docker.pull' pull_rdtest
     - script_block 'api-test' 'DOCKER_COMPOSE_SPEC=docker-compose-api-mysql.yaml bash test/run-docker-api-tests.sh'
 
-  - env: JOB='Docker Tomcat API tests'
+  - env: JOB='Docker Tomcat 8 API tests'
     script:
     - script_block 'sync-artifacts' fetch_common_artifacts
     - script_block 'api-test' 'bash test/run-docker-tomcat-tests.sh'
 
+  - env: JOB='Docker Tomcat 7 API tests'
+    script:
+    - script_block 'sync-artifacts' fetch_common_artifacts
+    - script_block 'api-test' 'bash test/run-docker-tomcat-tests.sh 7-jre8'
+
   - stage: test
     env: JOB='Test deb install'
     script:

diff --git a/test/docker/dockers/tomcat/Dockerfile b/test/docker/dockers/tomcat/Dockerfile
@@ -1,4 +1,6 @@
-FROM tomcat:8
+ARG TOMCAT_TAG
+
+FROM tomcat:${TOMCAT_TAG:-8}
 
 RUN apt-get update && \
     apt-get -y install coreutils file jq netcat xmlstarlet

diff --git a/test/docker/test-api-tomcat.sh b/test/docker/test-api-tomcat.sh
@@ -4,6 +4,8 @@ set -euo pipefail
 
 . common.sh
 
+TOMCAT_TAG="${1}"
+
 # Sets the compose file to use for test run
 # Different compose files used for different environments
 export DOCKER_COMPOSE_SPEC=${DOCKER_COMPOSE_SPEC:-docker-compose-tomcat-test.yml}
@@ -28,6 +30,7 @@ cp -r ../api dockers/tomcat/api_test/
 docker build \
     -t rd-tomcat:latest \
     --cache-from rdtest:latest \
+    --build-arg TOMCAT_TAG=$TOMCAT_TAG \
     --build-arg LAUNCHER_URL=$LAUNCHER_URL \
     --build-arg CLI_DEB_URL=$CLI_DEB_URL \
     --build-arg CLI_VERS=$CLI_VERS \

diff --git a/test/run-docker-tomcat-tests.sh b/test/run-docker-tomcat-tests.sh
@@ -6,19 +6,15 @@ IFS=$'\n\t'
 readonly ARGS=("$@")
 DOCKER_DIR=$PWD/test/docker
 
+TOMCAT_TAG="${1:-8}"
+
 usage() {
       grep '^#/' <"$0" | cut -c4- # prints the #/ lines above as usage info
 }
 die(){
     echo >&2 "$@" ; exit 2
 }
 
-check_args(){
-    if [ ${#ARGS[@]} -gt 0 ] ; then
-        DOCKER_DIR=$1
-    fi
-}
-
 copy_jar(){
     local FARGS=("$@")
     local DIR=${FARGS[0]}
@@ -34,7 +30,7 @@ run_tests(){
     local DIR=${FARGS[0]}
 
     cd $DIR
-    bash $DIR/test-api-tomcat.sh
+    bash $DIR/test-api-tomcat.sh $TOMCAT_TAG
 }
 
 run_docker_test(){
@@ -46,7 +42,6 @@ run_docker_test(){
 
 
 main() {
-    check_args
     run_docker_test  $DOCKER_DIR
 }
 main