diff --git a/finish/inventory/pom.xml b/finish/inventory/pom.xml index 907969f..bab04ee 100644 --- a/finish/inventory/pom.xml +++ b/finish/inventory/pom.xml @@ -56,7 +56,7 @@ org.junit.jupiter junit-jupiter - 5.11.0 + 5.11.1 test diff --git a/finish/system/pom.xml b/finish/system/pom.xml index 09bc1ef..1596598 100644 --- a/finish/system/pom.xml +++ b/finish/system/pom.xml @@ -42,7 +42,7 @@ org.junit.jupiter junit-jupiter - 5.11.0 + 5.11.1 test diff --git a/scripts/dockerImageTest.sh b/scripts/dockerImageTest.sh index 7e1a4c6..9121894 100755 --- a/scripts/dockerImageTest.sh +++ b/scripts/dockerImageTest.sh @@ -1,9 +1,10 @@ #!/bin/bash -while getopts t:d: flag; +while getopts t:d:v: flag; do case "${flag}" in t) DATE="${OPTARG}";; d) DRIVER="${OPTARG}";; + v) OL_LEVEL="${OPTARG}";; *) echo "Invalid option";; esac done @@ -13,12 +14,20 @@ echo "Testing latest OpenLiberty Docker image" sed -i "\#liberty-maven-plugin#ahttps://public.dhe.ibm.com/ibmdl/export/pub/software/openliberty/runtime/nightly/$DATE/$DRIVER" system/pom.xml inventory/pom.xml cat system/pom.xml inventory/pom.xml -sed -i "s;FROM icr.io/appcafe/open-liberty:kernel-slim-java11-openj9-ubi;FROM cp.stg.icr.io/cp/olc/open-liberty-daily:full-java11-openj9-ubi;g" system/Dockerfile inventory/Dockerfile +if [[ "$OL_LEVEL" != "" ]]; then + sed -i "s;FROM icr.io/appcafe/open-liberty:kernel-slim-java11-openj9-ubi;FROM cp.stg.icr.io/cp/olc/open-liberty-vnext:$OL_LEVEL-full-java11-openj9-ubi;g" system/Dockerfile inventory/Dockerfile +else + sed -i "s;FROM icr.io/appcafe/open-liberty:kernel-slim-java11-openj9-ubi;FROM cp.stg.icr.io/cp/olc/open-liberty-daily:full-java11-openj9-ubi;g" system/Dockerfile inventory/Dockerfile +fi sed -i "s;RUN features.sh;#RUN features.sh;g" system/Dockerfile inventory/Dockerfile cat system/Dockerfile inventory/Dockerfile echo "$DOCKER_PASSWORD" | sudo -u runner docker login -u "$DOCKER_USERNAME" --password-stdin cp.stg.icr.io -sudo -u runner docker pull -q "cp.stg.icr.io/cp/olc/open-liberty-daily:full-java11-openj9-ubi" -sudo -u runner echo "build level:"; docker inspect --format "{{ index .Config.Labels \"org.opencontainers.image.revision\"}}" cp.stg.icr.io/cp/olc/open-liberty-daily:full-java11-openj9-ubi - +if [[ "$OL_LEVEL" != "" ]]; then + sudo -u runner docker pull -q "cp.stg.icr.io/cp/olc/open-liberty-vnext:$OL_LEVEL-full-java11-openj9-ubi" + sudo -u runner echo "build level:"; docker inspect --format "{{ index .Config.Labels \"org.opencontainers.image.revision\"}}" "cp.stg.icr.io/cp/olc/open-liberty-vnext:$OL_LEVEL-full-java11-openj9-ubi" +else + sudo -u runner docker pull -q "cp.stg.icr.io/cp/olc/open-liberty-daily:full-java11-openj9-ubi" + sudo -u runner echo "build level:"; docker inspect --format "{{ index .Config.Labels \"org.opencontainers.image.revision\"}}" "cp.stg.icr.io/cp/olc/open-liberty-daily:full-java11-openj9-ubi" +fi sudo -u runner ../scripts/testApp.sh diff --git a/start/inventory/pom.xml b/start/inventory/pom.xml index 72341b8..7fe4389 100644 --- a/start/inventory/pom.xml +++ b/start/inventory/pom.xml @@ -51,7 +51,7 @@ org.junit.jupiter junit-jupiter - 5.11.0 + 5.11.1 test diff --git a/start/system/pom.xml b/start/system/pom.xml index 14e2c82..b8cdb43 100644 --- a/start/system/pom.xml +++ b/start/system/pom.xml @@ -42,7 +42,7 @@ org.junit.jupiter junit-jupiter - 5.11.0 + 5.11.1 test