Skip to content

Commit 6512569

Browse files
committed
plt-1858: Add Java 21 support using 3355.v388858a_47b_33-5-jdk21
1 parent 9a28960 commit 6512569

File tree

2 files changed

+10
-3
lines changed

2 files changed

+10
-3
lines changed

.github/workflows/ci.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ jobs:
1414
remoting_tag:
1515
- 4.13.2-1-jdk11
1616
- 4.13.3-1-jdk17
17+
- 3355.v388858a_47b_33-5-jdk21
1718
runs-on: ubuntu-latest
1819
steps:
1920
- name: Build and Push Docker Image

Makefile

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@ JENKINS_REMOTING_TAG := 4.13.2-1-jdk11
22
JOB := remoting-${JENKINS_REMOTING_TAG}
33
CLEAN_JOB := clean-${CORE_TAG}
44

5-
# Default target builds Java 11 variant
6-
all: remoting-4.13.2-1-jdk11 remoting-4.13.3-1-jdk17
5+
# Default target builds Java 11, 17, and 21 variants
6+
all: remoting-4.13.2-1-jdk11 remoting-4.13.3-1-jdk17 remoting-3355.v388858a_47b_33-5-jdk21
77

88
clean: ${CLEAN_JOB}
9-
.PHONY: all clean ${JOB} ${CLEAN_JOB} remoting-4.13.2-1-jdk11 remoting-4.13.3-1-jdk17
9+
.PHONY: all clean ${JOB} ${CLEAN_JOB} remoting-4.13.2-1-jdk11 remoting-4.13.3-1-jdk17 remoting-3355.v388858a_47b_33-5-jdk21
1010

1111
${JOB}: remoting-%: Dockerfile
1212
docker build \
@@ -26,5 +26,11 @@ remoting-4.13.3-1-jdk17: Dockerfile
2626
--tag dwolla/jenkins-agent-core:4.13.3-1-jdk17-SNAPSHOT \
2727
.
2828

29+
remoting-3355.v388858a_47b_33-5-jdk21: Dockerfile
30+
docker build \
31+
--build-arg JENKINS_REMOTING_TAG=3355.v388858a_47b_33-5-jdk21 \
32+
--tag dwolla/jenkins-agent-core:3355.v388858a_47b_33-5-jdk21-SNAPSHOT \
33+
.
34+
2935
${CLEAN_JOB}: clean-%:
3036
docker rmi -f dwolla/jenkins-agent-core:$*-SNAPSHOT

0 commit comments

Comments
 (0)