From 94b20c3885fc914f8baec75fc6ee4ea2b9daa9d6 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 1 Oct 2024 18:02:09 +0000 Subject: [PATCH 1/4] Bump org.junit.jupiter:junit-jupiter from 5.11.0 to 5.11.1 in /start Bumps [org.junit.jupiter:junit-jupiter](https://github.com/junit-team/junit5) from 5.11.0 to 5.11.1. - [Release notes](https://github.com/junit-team/junit5/releases) - [Commits](https://github.com/junit-team/junit5/compare/r5.11.0...r5.11.1) --- updated-dependencies: - dependency-name: org.junit.jupiter:junit-jupiter dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- start/inventory/pom.xml | 2 +- start/system/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 From e6c6afab2367944c2d15e6c6c5e03c52fc382cf9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 1 Oct 2024 18:17:19 +0000 Subject: [PATCH 2/4] Bump org.junit.jupiter:junit-jupiter from 5.11.0 to 5.11.1 in /finish Bumps [org.junit.jupiter:junit-jupiter](https://github.com/junit-team/junit5) from 5.11.0 to 5.11.1. - [Release notes](https://github.com/junit-team/junit5/releases) - [Commits](https://github.com/junit-team/junit5/compare/r5.11.0...r5.11.1) --- updated-dependencies: - dependency-name: org.junit.jupiter:junit-jupiter dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- finish/inventory/pom.xml | 2 +- finish/system/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 From 95aac6778732f52743587c649566f9f15e2f2ebf Mon Sep 17 00:00:00 2001 From: Gilbert Kwan Date: Wed, 2 Oct 2024 14:37:22 -0400 Subject: [PATCH 3/4] Update dockerImageTest.sh --- scripts/dockerImageTest.sh | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/scripts/dockerImageTest.sh b/scripts/dockerImageTest.sh index 7e1a4c6..3f821e2 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 From 73bb5399d6a61f6390395d7fbb07da79c6adf651 Mon Sep 17 00:00:00 2001 From: Gilbert Kwan Date: Wed, 2 Oct 2024 14:43:56 -0400 Subject: [PATCH 4/4] Update dockerImageTest.sh --- scripts/dockerImageTest.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/dockerImageTest.sh b/scripts/dockerImageTest.sh index 3f821e2..9121894 100755 --- a/scripts/dockerImageTest.sh +++ b/scripts/dockerImageTest.sh @@ -25,9 +25,9 @@ cat system/Dockerfile inventory/Dockerfile echo "$DOCKER_PASSWORD" | sudo -u runner docker login -u "$DOCKER_USERNAME" --password-stdin cp.stg.icr.io 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 + 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 + 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