From 4037063facb35d398e0edb391a638a1df9fc2ea3 Mon Sep 17 00:00:00 2001
From: ilewis <idlewis@users.noreply.github.com>
Date: Wed, 19 Jul 2023 11:21:30 +0100
Subject: [PATCH 1/2] Fix bugs/formating in verify script

---
 test/verify.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/test/verify.sh b/test/verify.sh
index 045170066..b82aedaae 100755
--- a/test/verify.sh
+++ b/test/verify.sh
@@ -43,7 +43,7 @@ main () {
 
    local tests=$(declare -F | cut -d" " -f3 | grep "^test")
    echo "****** Testing ${IMAGE}..."
-   for name in "${tests}"; do
+   for name in $tests; do
        timestamp=$(date '+%Y/%m/%d %H:%M:%S')
        echo "${timestamp} *** ${name} - Executing"
        eval "${name}"
@@ -99,9 +99,9 @@ testLibertyStopsAndRestarts()
     if [ "$1" == "OpenShift" ]; then
         timestamp=$(date '+%Y/%m/%d %H:%M:%S')
         echo "$timestamp *** testLibertyStopsAndRestarts on OpenShift"
-        cid=$(docker run -d -u 1001:0 $IMAGE)
+        local cid=$(docker run -d -u 1001:0 $IMAGE)
     else
-    local cid=$(docker run -d $IMAGE)
+        local cid=$(docker run -d $IMAGE)
     fi
     echo "Waiting for server to start..."
     waitForServerStart "${cid}" \

From b5e12d4ae27f6571bcb44ba62f31d0342c858989 Mon Sep 17 00:00:00 2001
From: ilewis <idlewis@users.noreply.github.com>
Date: Mon, 24 Jul 2023 14:28:44 +0100
Subject: [PATCH 2/2]  Move from Ubuntu 20.04 (focal) to 22.04 (jammy)

---
 ga/latest/kernel/Dockerfile.ubuntu.openjdk11 | 2 +-
 ga/latest/kernel/Dockerfile.ubuntu.openjdk17 | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ga/latest/kernel/Dockerfile.ubuntu.openjdk11 b/ga/latest/kernel/Dockerfile.ubuntu.openjdk11
index 968685e4b..1314c7a1e 100644
--- a/ga/latest/kernel/Dockerfile.ubuntu.openjdk11
+++ b/ga/latest/kernel/Dockerfile.ubuntu.openjdk11
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM ibm-semeru-runtimes:open-11-jre-focal
+FROM ibm-semeru-runtimes:open-11-jre-jammy
 
 USER root
 
diff --git a/ga/latest/kernel/Dockerfile.ubuntu.openjdk17 b/ga/latest/kernel/Dockerfile.ubuntu.openjdk17
index 6c75686c2..eb30ccca7 100644
--- a/ga/latest/kernel/Dockerfile.ubuntu.openjdk17
+++ b/ga/latest/kernel/Dockerfile.ubuntu.openjdk17
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM ibm-semeru-runtimes:open-17-jre-focal
+FROM ibm-semeru-runtimes:open-17-jre-jammy
 
 USER root