Skip to content

Commit be1c890

Browse files
authored
plt-1858: add java21 support (#48)
* plt-1858: update Jenkins images to support Java 17, add SDKMAN, and update agent configuration * plt-1858: remove retry logic from apt-get install * plt-1858: Add Java 21 support using 3355.v388858a_47b_33-5-jdk21 * plt-1858: Add --break-system-packages flag for Python 3.13+ (JDK 21)
1 parent 1c87cb6 commit be1c890

File tree

3 files changed

+17
-7
lines changed

3 files changed

+17
-7
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

Dockerfile

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,13 @@ RUN set -ex && \
3232
shellcheck \
3333
zip \
3434
&& \
35-
pip3 install --upgrade \
36-
awscli \
37-
virtualenv \
38-
&& \
35+
(python3 -c "import sys; exit(0 if sys.version_info >= (3, 13) else 1)" && \
36+
pip3 install --break-system-packages --upgrade \
37+
awscli \
38+
virtualenv) || \
39+
(pip3 install --upgrade \
40+
awscli \
41+
virtualenv) && \
3942
ln -s /usr/bin/python3 /usr/bin/python && \
4043
/tmp/build/install-esh.sh v0.3.2 && \
4144
chmod +x /usr/local/bin/sdkman-init-wrapper.sh && \

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)