Merge pull request #212 from OpenLiberty/staging

Merge staging to prod - Run test with Java 21 (#211)

Author: gkwan-ibm

Diff for: scripts/dockerImageTest.sh

@@ -12,13 +12,13 @@ echo "Testing latest OpenLiberty Docker image"
 sed -i "\#<artifactId>liberty-maven-plugin</artifactId>#,\#<configuration>#c<artifactId>liberty-maven-plugin</artifactId><version>3.8.2</version><configuration><install><runtimeUrl>https://public.dhe.ibm.com/ibmdl/export/pub/software/openliberty/runtime/nightly/""$DATE""/""$DRIVER""</runtimeUrl></install>" pom.xml
 cat pom.xml
 
-sed -i "s;FROM icr.io/appcafe/open-liberty:full-java17-openj9-ubi;FROM cp.stg.icr.io/cp/olc/open-liberty-daily:full-java17-openj9-ubi;g" Dockerfile
-sed -i "s;FROM icr.io/appcafe/open-liberty:kernel-slim-java17-openj9-ubi;FROM cp.stg.icr.io/cp/olc/open-liberty-daily:full-java17-openj9-ubi;g" Dockerfile
+sed -i "s;FROM icr.io/appcafe/open-liberty:full-java21-openj9-ubi-minimal;FROM cp.stg.icr.io/cp/olc/open-liberty-daily:full-java21-openj9-ubi-minimal;g" Dockerfile
+sed -i "s;FROM icr.io/appcafe/open-liberty:kernel-slim-java21-openj9-ubi-minimal;FROM cp.stg.icr.io/cp/olc/open-liberty-daily:full-java21-openj9-ubi-minimal;g" Dockerfile
 sed -i "s;RUN features.sh;#RUN features.sh;g" Dockerfile
 cat Dockerfile
 
 echo "$DOCKER_PASSWORD" | sudo docker login -u "$DOCKER_USERNAME" --password-stdin cp.stg.icr.io
-sudo docker pull -q "cp.stg.icr.io/cp/olc/open-liberty-daily:full-java17-openj9-ubi"
-sudo echo "build level:"; docker inspect --format "{{ index .Config.Labels \"org.opencontainers.image.revision\"}}" cp.stg.icr.io/cp/olc/open-liberty-daily:full-java17-openj9-ubi
+sudo docker pull -q "cp.stg.icr.io/cp/olc/open-liberty-daily:full-java21-openj9-ubi-minimal"
+sudo echo "build level:"; docker inspect --format "{{ index .Config.Labels \"org.opencontainers.image.revision\"}}" cp.stg.icr.io/cp/olc/open-liberty-daily:full-java21-openj9-ubi-minimal
 
 sudo -E ../scripts/testApp.sh

Diff for: scripts/testApp.sh

@@ -38,7 +38,7 @@ docker exec springBootContainer cat /logs/messages.log | grep java
 docker stop springBootContainer
 
 uname -r
-
+cp ../instantOn/Dockerfile Dockerfile
 docker run --name springBootCheckpointContainer --privileged --env WLP_CHECKPOINT=afterAppStart springboot
 docker commit springBootCheckpointContainer springboot-instanton
 docker rm springBootCheckpointContainer
@@ -50,8 +50,8 @@ docker run --rm -d \
   --security-opt seccomp=unconfined \
   -p 9080:9080 \
   springboot-instanton
+sleep 10
 docker logs springBootContainer
-sleep 15
 status="$(curl --write-out "%{http_code}\n" --silent --output /dev/null "http://localhost:9080/hello")"
 docker stop springBootContainer
 if [ "$status" == "200" ]; then