Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

US-655261 build web ready on tomcat10, jdk21 image #228

Merged
merged 1 commit into from
Dec 12, 2024
Merged

US-655261 build web ready on tomcat10, jdk21 image #228

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
7 changes: 7 additions & 0 deletions tests/pega-web-ready-release-testcases_jdk11_version.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.*"]
9 changes: 8 additions & 1 deletion tests/pega-web-ready-release-testcases_jdk17_version.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.*"]
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.*"]
17 changes: 17 additions & 0 deletions tests/pega-web-ready-release-testcases_jdk21_version.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.*"]
Loading