TSK-1197: use only postgres:10 tag; use only docker compose up; clean up docker compose installation for travis

TSK-1197: moved docker-compose install to the right place; fixed variable definition TSK-1197: remove docker-compose installation, use preinstalled travis version TSK-1197: harmonize postgres db version parameter in scripts preparedb and test.sh TSK-1197: removed DB2_10_5 handling from scripts
2020-05-05 08:48:55 +02:00 · 2020-05-05 08:48:55 +02:00 · aad225d4d5
parent 3fea9ab975
commit aad225d4d5
6 changed files with 24 additions and 106 deletions
--- a/.travis.yml
+++ b/.travis.yml
@ -39,9 +39,10 @@ env:
  jobs:
    - DB=H2
    - DB=DB2_11_1
-    - DB=POSTGRES_10_4
+    - DB=POSTGRES_10

 install: skip
+
 # include SONAR_PROJECT_KEY as a second parameter if this is not a pull request
 script: ci/test.sh "$DB" "$([ "false" = "$TRAVIS_PULL_REQUEST" ] && echo "$SONAR_PROJECT_KEY")"
 before_cache: rm -rf "$HOME/.m2/repository/pro/taskana"
@ -52,17 +53,9 @@ jobs:
      language: node_js
      node_js: $NODE_VERSION
      install: skip
-      env: 
-        - DB=WEB
-        - DOCKER_COMPOSE_VERSION=1.4.2
+      env: DB=WEB
      script: ci/test.sh "$DB"
      before_cache: rm -rf "$HOME/.m2/repository/pro/taskana"
-      before_install:
-        - sudo rm /usr/local/bin/docker-compose
-        - curl -L https://github.com/docker/compose/releases/download/${DOCKER_COMPOSE_VERSION}/docker-compose-`uname -s`-`uname -m` > docker-compose
-        - chmod +x docker-compose
-        - sudo mv docker-compose /usr/local/bin
-      

    # We are using the environment variable 'MODULE' to force travis into using a different cache for each build. 
    # See https://docs.travis-ci.com/user/caching/#caches-and-build-matrices for detailed information on
--- a/ci/Dockerfile
+++ b/ci/Dockerfile
@ -1,3 +1,3 @@
-FROM postgres:10.4
+FROM postgres:10
 RUN localedef -i de_DE -c -f UTF-8 -A /usr/share/locale/locale.alias de_DE.UTF-8
 ENV LANG de_DE.utf8
--- a/ci/docker-compose.yml
+++ b/ci/docker-compose.yml
@ -1,8 +1,8 @@
 version: '3'
 services:
-  taskana-postgres_10_4:
+  taskana-postgres_10:
    build: .
-    container_name: taskana-postgres_10_4
+    container_name: taskana-postgres_10
    ports:
    - 50102:5432
    environment:
--- a/ci/prepare_db.bat
+++ b/ci/prepare_db.bat
@ -22,49 +22,14 @@ SET PROP_FILE=%HOMEPATH%\taskanaUnitTest.properties
    ECHO.
    SET /P MENU=Select task then press ENTER:
    ECHO.
-    IF [%MENU%]==[1] GOTO START_DB2_10_5
-    IF [%MENU%]==[2] GOTO STOP_DB2_10_5
    IF [%MENU%]==[3] GOTO START_DB2_11_1
    IF [%MENU%]==[4] GOTO STOP_DB2_11_1
-    IF [%MENU%]==[5] GOTO START_POSTGRES_10_4
-    IF [%MENU%]==[6] GOTO STOP_POSTGRES_10_4
+    IF [%MENU%]==[5] GOTO START_POSTGRES_10
+    IF [%MENU%]==[6] GOTO STOP_POSTGRES_10
    IF [%MENU%]==[7] GOTO STOP_ALL
    IF [%MENU%]==[8] GOTO REMOVE_PROP
    EXIT /B

-:START_DB2_10_5
-    ECHO ---
-    docker ps -aq -f name=^/taskana-db2_10_5$ -f status=running > %TEMP%\temp
-    SET /P CONTAINER_RUNNING=< %TEMP%\temp
-    docker ps -aq -f name=^/taskana-db2_10_5$ > %TEMP%\temp
-    SET /P CONTAINER_EXISTS=< %TEMP%\temp
-    del %TEMP%\temp
-
-    IF DEFINED CONTAINER_EXISTS (
-        ECHO docker start taskana-db2_10_5
-        docker start taskana-db2_10_5
-    )
-
-    IF NOT DEFINED CONTAINER_EXISTS (
-        ECHO docker run -d -p 50100:50000 --name taskana-db2_10_5 taskana/db2:10.5 -d
-        docker run -d -p 50100:50000 --name taskana-db2_10_5 taskana/db2:10.5 -d
-    )
-
-    ECHO jdbcDriver=com.ibm.db2.jcc.DB2Driver> %PROP_FILE%
-    ECHO jdbcUrl=jdbc:db2://localhost:50100/tskdb>> %PROP_FILE%
-    ECHO dbUserName=db2inst1>> %PROP_FILE%
-    ECHO dbPassword=db2inst1-pwd>> %PROP_FILE%
-    ECHO schemaName=taskana>> %PROP_FILE%
-    ECHO ---
-    GOTO MENU
-
-:STOP_DB2_10_5
-    ECHO ---
-    ECHO docker stop taskana-db2_1 
-    docker stop taskana-db2_1
-    ECHO ---
-    GOTO MENU
-
 :START_DB2_11_1
    ECHO ---
    docker ps -aq -f name=^/taskana-db2_11_1$ -f status=running > %TEMP%\temp
@ -98,27 +63,9 @@ SET PROP_FILE=%HOMEPATH%\taskanaUnitTest.properties
    ECHO ---
    GOTO MENU

-:START_POSTGRES_10_4
-    ECHO ---
-    docker ps -aq -f name=^/taskana-postgres_10_4$ -f status=running > %TEMP%\temp
-    SET /P CONTAINER_RUNNING=< %TEMP%\temp
-    docker ps -aq -f name=^/taskana-postgres_10_4$ > %TEMP%\temp
-    SET /P CONTAINER_EXISTS=< %TEMP%\temp
-    del %TEMP%\temp
-
-    IF DEFINED CONTAINER_EXISTS (
-        REM ECHO docker start taskana-postgres_10_4
-        REM docker start taskana-postgres_10_4
-        ECHO docker-compose -f %~dp0/docker-compose.yml start taskana-postgres_10_4
-        docker-compose -f %~dp0/docker-compose.yml start taskana-postgres_10_4
-    )
-
-    IF NOT DEFINED CONTAINER_EXISTS (
-        REM ECHO docker run -d -p 50102:5432 --name taskana-postgres_10_4 -e POSTGRES_PASSWORD=postgres postgres:10.4
-        REM docker run -d -p 50102:5432 --name taskana-postgres_10_4 -e POSTGRES_PASSWORD=postgres postgres:10.4
-        ECHO docker-compose -f %~dp0/docker-compose.yml up -d
-        docker-compose -f %~dp0/docker-compose.yml up -d
-    )
+:START_POSTGRES_10
+    ECHO docker-compose -f %~dp0/docker-compose.yml up -d
+    docker-compose -f %~dp0/docker-compose.yml up -d

    ECHO jdbcDriver=org.postgresql.Driver> %PROP_FILE%
    ECHO jdbcUrl=jdbc:postgresql://localhost:50102/postgres>> %PROP_FILE%
@ -128,21 +75,19 @@ SET PROP_FILE=%HOMEPATH%\taskanaUnitTest.properties
    ECHO ---
    GOTO MENU

-:STOP_POSTGRES_10_4
+:STOP_POSTGRES_10
    ECHO ---
-    ECHO docker stop taskana-postgres_10_4 
-    docker stop taskana-postgres_10_4
+    ECHO docker stop taskana-postgres_10 
+    docker stop taskana-postgres_10
    ECHO ---
    GOTO MENU

 :STOP_ALL
    ECHO ---
-    ECHO docker stop taskana-db2_10_5
-    docker stop taskana-db2_10_5
    ECHO docker stop taskana-db2_11_1
    docker stop taskana-db2_11_1
-    ECHO docker stop taskana-postgres_10_4
-    docker stop takana-postgres_10_4
+    ECHO docker stop taskana-postgres_10
+    docker stop takana-postgres_10
    ECHO ---
    GOTO MENU

--- a/ci/prepare_db.sh
+++ b/ci/prepare_db.sh
@ -12,9 +12,8 @@ set -e #fail fast
 #H
 #H database:
 #H   - H2
-#H   - DB2_10_5
 #H   - DB2_11_1
-#H   - POSTGRES_10_4
+#H   - POSTGRES_10
 # Arguments:
 #   $1: exit code
 function helpAndExit() {
@ -25,6 +24,7 @@ function helpAndExit() {
 function main() {
  [[ $# -eq 0 || "$1" == '-h' || "$1" == '--help' ]] && helpAndExit 0
  propFile="$HOME/taskanaUnitTest.properties"
+  scriptDir=`dirname $0`

  case "$1" in
  H2)
@ -32,20 +32,6 @@ function main() {
      rm "$propFile"
    fi
    ;;
-  DB2_10_5)
-    if [[ -z $(docker ps -aq -f name=^/taskana-db2_10_5$ -f status=running) ]]; then
-      if [[ -z $(docker ps -aq -f name=^/taskana-db2_10_5$) ]]; then
-        docker run -d -p 50100:50000 --name taskana-db2_10_5 taskana/db2:10.5 -d
-      else
-        docker start taskana-db2_10_5
-      fi
-    fi
-    echo 'jdbcDriver=com.ibm.db2.jcc.DB2Driver' >$propFile
-    echo 'jdbcUrl=jdbc:db2://localhost:50100/tskdb' >>$propFile
-    echo 'dbUserName=db2inst1' >>$propFile
-    echo 'dbPassword=db2inst1-pwd' >>$propFile
-    echo 'schemaName=TASKANA' >>$propFile
-    ;;
  DB2_11_1)
    if [[ -z $(docker ps -aq -f name=^/taskana-db2_11_1$ -f status=running) ]]; then
      if [[ -z $(docker ps -aq -f name=^/taskana-db2_11_1$) ]]; then
@ -60,14 +46,9 @@ function main() {
    echo 'dbPassword=db2inst1-pwd' >>$propFile
    echo 'schemaName=TASKANA' >>$propFile
    ;;
-  POSTGRES_10_4)
-    if [[ -z $(docker ps -aq -f name=^/taskana-postgres_10_4$ -f status=running) ]]; then
-      if [[ -z $(docker ps -aq -f name=^/taskana-postgres_10_4$) ]]; then
-		 docker-compose -f `dirname $0`/docker-compose.yml up -d
-      else
-		docker-compose -f `dirname $0`/docker-compose.yml start taskana-postgres_10_4
-      fi
-    fi
+  POSTGRES_10)
+    docker-compose -f $scriptDir/docker-compose.yml up -d
+   
    echo 'jdbcDriver=org.postgresql.Driver' >$propFile
    echo 'jdbcUrl=jdbc:postgresql://localhost:50102/postgres' >>$propFile
    echo 'dbUserName=postgres' >>$propFile
--- a/ci/test.sh
+++ b/ci/test.sh
@ -12,9 +12,8 @@ set -e # fail fast
 #H
 #H database:
 #H   - H2
-#H   - DB2_10_5
 #H   - DB2_11_1
-#H   - POSTGRES_10_4
+#H   - POSTGRES_10
 #H module:
 #H   - HISTORY
 #H sonar project key:
@ -44,12 +43,12 @@ function main() {
      mvn sonar:sonar -f $REL/.. -Pcoverage -Dsonar.projectKey="$2"
    fi
    ;;
-  DB2_10_5 | DB2_11_1)
+  DB2_11_1)
    set -x
    eval "$REL/prepare_db.sh '$1'"
    mvn -q verify -B -f $REL/.. -am -T 4C -Dmaven.javadoc.skip -Dcheckstyle.skip -pl :taskana-core
    ;;
-  POSTGRES_10_4)
+  POSTGRES_10)
    set -x
    eval "$REL/prepare_db.sh '$1'"
    ### INSTALL ###