From 3d230bbf16da88d1fdef866be1dfdc9325facac9 Mon Sep 17 00:00:00 2001
From: Gopal Chikkam <84763627+pega-chikv@users.noreply.github.com>
Date: Thu, 12 Dec 2024 18:42:27 +0530
Subject: [PATCH] US-655261 build web ready on tomcat10+jdk21 image (#228)

---
 Makefile                                        |  6 ++++++
 ...b-ready-release-testcases_jdk11_version.yaml |  7 +++++++
 ...b-ready-release-testcases_jdk17_version.yaml |  9 ++++++++-
 ...b-ready-release-testcases_jdk21_version.yaml | 17 +++++++++++++++++
 4 files changed, 38 insertions(+), 1 deletion(-)
 create mode 100644 tests/pega-web-ready-release-testcases_jdk21_version.yaml

diff --git a/Makefile b/Makefile
index 19113aff..2fb822eb 100644
--- a/Makefile
+++ b/Makefile
@@ -11,6 +11,7 @@ image:
 	docker build --build-arg VERSION=$(VERSION) --build-arg BASE_TOMCAT_IMAGE=pegasystems/tomcat:9-jdk17 -t $(IMAGE_NAME) . # Build image and automatically tag it as latest on jdk17
 	docker build --build-arg VERSION=$(VERSION) --build-arg BASE_TOMCAT_IMAGE=pegasystems/tomcat:9-jdk11 -t $(IMAGE_NAME):3-jdk11 . # Build image using tomcat 9 , jdk 11
 	docker build --build-arg VERSION=$(VERSION) --build-arg BASE_TOMCAT_IMAGE=pegasystems/tomcat:9-jdk17 -t $(IMAGE_NAME):3-jdk17 . # Build image using tomcat 9 , jdk 17
+	docker build --build-arg VERSION=$(VERSION) --build-arg BASE_TOMCAT_IMAGE=pegasystems/tomcat:10-jdk21 -t $(IMAGE_NAME):3-jdk21 . # Build image using tomcat 10 , jdk 21
 
 test: image
 	# Build image for executing test cases against it
@@ -23,12 +24,17 @@ test: image
 	container-structure-test test --image $(IMAGE_NAME):3-jdk11 --config tests/pega-web-ready-release-testcases_jdk11_version.yaml
 	container-structure-test test --image $(IMAGE_NAME):3-jdk17 --config tests/pega-web-ready-release-testcases.yaml
 	container-structure-test test --image $(IMAGE_NAME):3-jdk17 --config tests/pega-web-ready-release-testcases_jdk17_version.yaml
+	container-structure-test test --image $(IMAGE_NAME):3-jdk21 --config tests/pega-web-ready-release-testcases.yaml
+	container-structure-test test --image $(IMAGE_NAME):3-jdk21 --config tests/pega-web-ready-release-testcases_jdk21_version.yaml
 
 push: image
 	docker tag $(IMAGE_NAME):3-jdk11 $(IMAGE_NAME):$(VERSION)-jdk11
 	docker tag $(IMAGE_NAME):3-jdk17 $(IMAGE_NAME):$(VERSION)-jdk17
+	docker tag $(IMAGE_NAME):3-jdk21 $(IMAGE_NAME):$(VERSION)-jdk21
 	docker push $(IMAGE_NAME):$(VERSION)-jdk11
 	docker push $(IMAGE_NAME):$(VERSION)-jdk17
+	docker push $(IMAGE_NAME):$(VERSION)-jdk21
 	docker push $(IMAGE_NAME):3-jdk11
 	docker push $(IMAGE_NAME):3-jdk17
+	docker push $(IMAGE_NAME):3-jdk21
 	docker push $(IMAGE_NAME):latest
\ No newline at end of file
diff --git a/tests/pega-web-ready-release-testcases_jdk11_version.yaml b/tests/pega-web-ready-release-testcases_jdk11_version.yaml
index 32dbfb12..2ee1b8af 100644
--- a/tests/pega-web-ready-release-testcases_jdk11_version.yaml
+++ b/tests/pega-web-ready-release-testcases_jdk11_version.yaml
@@ -8,3 +8,10 @@ commandTests:
     - |
         java -version  2>&1 | grep "OpenJDK 64-Bit Server VM Temurin"
     expectedOutput: [".*OpenJDK 64-Bit Server VM Temurin-11.*"]
+  - name: "TOMCAT VERSION check"
+    command: "bash"
+    args:
+    - -c
+    - |
+        env  2>&1 | grep "TOMCAT_VERSION"
+    expectedOutput: ["TOMCAT_VERSION=9.*"]
diff --git a/tests/pega-web-ready-release-testcases_jdk17_version.yaml b/tests/pega-web-ready-release-testcases_jdk17_version.yaml
index 9643f79f..c6b7bc60 100644
--- a/tests/pega-web-ready-release-testcases_jdk17_version.yaml
+++ b/tests/pega-web-ready-release-testcases_jdk17_version.yaml
@@ -7,4 +7,11 @@ commandTests:
     - -c
     - |
         java -version  2>&1 | grep "OpenJDK 64-Bit Server VM Temurin"
-    expectedOutput: [".*OpenJDK 64-Bit Server VM Temurin-17.*"]
\ No newline at end of file
+    expectedOutput: [".*OpenJDK 64-Bit Server VM Temurin-17.*"]
+  - name: "TOMCAT VERSION check"
+    command: "bash"
+    args:
+    - -c
+    - |
+        env  2>&1 | grep "TOMCAT_VERSION"
+    expectedOutput: ["TOMCAT_VERSION=9.*"]
\ No newline at end of file
diff --git a/tests/pega-web-ready-release-testcases_jdk21_version.yaml b/tests/pega-web-ready-release-testcases_jdk21_version.yaml
new file mode 100644
index 00000000..8bbeb67a
--- /dev/null
+++ b/tests/pega-web-ready-release-testcases_jdk21_version.yaml
@@ -0,0 +1,17 @@
+schemaVersion: "2.0.0"
+
+commandTests:
+  - name: "JAVA VERSION check"
+    command: "bash"
+    args:
+    - -c
+    - |
+        java -version  2>&1 | grep "OpenJDK 64-Bit Server VM Temurin"
+    expectedOutput: [".*OpenJDK 64-Bit Server VM Temurin-21.*"]
+  - name: "TOMCAT VERSION check"
+    command: "bash"
+    args:
+    - -c
+    - |
+        env  2>&1 | grep "TOMCAT_VERSION"
+    expectedOutput: ["TOMCAT_VERSION=10.*"]