Skip to content

Commit 04fb086

Browse files
committed
ansible: update agents to run on Java 11+
Latest Jenkins LTS release has dropped support for Java 8.
1 parent 8dad541 commit 04fb086

13 files changed

Lines changed: 54 additions & 15 deletions

ansible/MANUAL_STEPS.md

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
* [Disk layout](#disk-layout)
1313
* [AIX 7.1](#aix-71)
1414
* [Remove en1 network interface](#remove-en1-network-interface)
15+
* [Update XL C/C++ Runtime](#update-xl-cc-runtime)
1516
* [AIX 7.2 Install](#aix-72-install)
1617
* [ccache 3.7.4 on AIX 7.2](#ccache-374-on-aix-72)
1718
* [Enable the AHA fs](#enable-the-aha-fs)
@@ -412,6 +413,33 @@ to list the available interfaces. To add back the `en1` interface, run
412413
sudo autoconf6 -i en1
413414
```
414415

416+
### Update XL C/C++ Runtime
417+
418+
Java 17 requires XL C/C++ Runtime 16.1 available from https://www.ibm.com/support/pages/fix-list-xl-cc-runtime-aix#161X.
419+
Once downloaded, unpack the files with `zcat`:
420+
```
421+
zcat 16.1.0.9-IBM-xlCrte-AIX-FP009.tar.Z | tar -xvf -
422+
```
423+
and then install with `installp`:
424+
```
425+
installp -aXYgd . -e /tmp/install.log all
426+
```
427+
428+
Use `lslpp -l xlC\*` to view the curently installed version.
429+
430+
```
431+
# lslpp -l xlC\*
432+
Fileset Level State Description
433+
----------------------------------------------------------------------------
434+
Path: /usr/lib/objrepos
435+
xlC.aix61.rte 13.1.3.3 COMMITTED IBM XL C++ Runtime for AIX 6.1
436+
and later
437+
xlC.cpp 9.0.0.0 COMMITTED C for AIX Preprocessor
438+
xlC.rte 13.1.3.3 COMMITTED IBM XL C++ Runtime for AIX
439+
xlC.sup.aix50.rte 9.0.0.1 COMMITTED XL C/C++ Runtime for AIX 5.2
440+
#
441+
```
442+
415443
## AIX 7.2 Install
416444

417445
Most packages should be installed via ansible.

ansible/roles/docker/templates/alpine311.Dockerfile.j2

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ RUN apk add --no-cache --virtual .build-deps \
3232
python3 \
3333
tar \
3434
ccache \
35-
openjdk8 \
35+
openjdk11 \
3636
git \
3737
procps \
3838
openssh-client \

ansible/roles/docker/templates/alpine312.Dockerfile.j2

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ RUN apk add --no-cache --virtual .build-deps \
3030
python3 \
3131
tar \
3232
ccache \
33-
openjdk8 \
33+
openjdk11 \
3434
git \
3535
procps \
3636
openssh-client \

ansible/roles/docker/templates/centos7.Dockerfile.j2

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ RUN yum -y update && \
1919
gcc-c++ \
2020
make \
2121
git \
22-
java-1.8.0-openjdk-headless \
22+
java-11-openjdk-headless \
2323
pkgconfig \
2424
curl \
2525
python3-pip \

ansible/roles/docker/templates/ubi81.Dockerfile.j2

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ RUN dnf install --disableplugin=subscription-manager -y \
2020
ccache \
2121
gcc-c++ \
2222
git \
23-
java-1.8.0-openjdk-headless \
23+
java-17-openjdk-headless \
2424
make \
2525
python3 \
2626
openssl-devel \

ansible/roles/docker/templates/ubuntu1804.Dockerfile.j2

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,15 @@ RUN apt-get update && apt-get dist-upgrade -y && apt-get install -y \
2020
g++-8 \
2121
gcc-8 \
2222
git \
23-
openjdk-8-jre-headless \
2423
curl \
2524
python-pip \
2625
python3-pip \
2726
libfontconfig1 \
2827
libtool \
2928
automake
29+
# openjdk-17-jre-headless pulls in ca-certificates-java which conflicts with
30+
# something in the list of package above when installed at the same time.
31+
RUN apt-get install -y openjdk-17-jre-headless
3032

3133
RUN pip install tap2junit
3234

ansible/roles/docker/templates/ubuntu1804_arm_cross.Dockerfile.j2

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ RUN apt-get update \
1414
g++-8 \
1515
gcc-8 \
1616
git \
17-
openjdk-8-jre-headless \
1817
curl \
1918
python-pip \
2019
python3-pip \
@@ -25,6 +24,9 @@ RUN apt-get update \
2524
g++-6-multilib \
2625
gcc-8-multilib \
2726
g++-8-multilib
27+
# openjdk-17-jre-headless pulls in ca-certificates-java which conflicts with
28+
# something in the list of package above when installed at the same time.
29+
RUN apt-get install -y openjdk-17-jre-headless
2830

2931
RUN pip install tap2junit \
3032
&& pip3 install tap2junit

ansible/roles/docker/templates/ubuntu1804_sharedlibs.Dockerfile.j2

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,14 +22,17 @@ RUN apt-get update && apt-get install apt-utils -y && \
2222
g++-8 \
2323
gcc-8 \
2424
git \
25-
openjdk-8-jre-headless \
2625
pkg-config \
2726
curl \
2827
python-pip \
2928
python3-pip \
3029
libfontconfig1 \
3130
libtool \
3231
automake
32+
# openjdk-17-jre-headless pulls in ca-certificates-java which conflicts with
33+
# something in the list of package above when installed at the same time.
34+
RUN apt-get install -y openjdk-17-jre-headless
35+
3336

3437
RUN pip install tap2junit
3538

ansible/roles/docker/templates/ubuntu2004.Dockerfile.j2

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,14 @@ ENV OSTYPE linux-gnu
1212
ENV OSVARIANT docker
1313
ENV DESTCPU {{ arch }}
1414
ENV ARCH {{ arch }}
15+
ENV DEBIAN_FRONTEND noninteractive
1516

1617
RUN apt-get update && apt-get dist-upgrade -y && apt-get install -y \
1718
ccache \
1819
g++-8 \
1920
gcc-8 \
2021
git \
21-
openjdk-8-jre-headless \
22+
openjdk-17-jre-headless \
2223
curl \
2324
python3-pip \
2425
python-is-python3 \

ansible/roles/docker/templates/ubuntu2004_armv7l.Dockerfile.j2

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ RUN apt-get update && apt-get dist-upgrade -y && apt-get install -y ccache \
1717
g++-8 \
1818
gcc-8 \
1919
git \
20-
openjdk-8-jre-headless \
20+
openjdk-17-jre-headless \
2121
pkg-config \
2222
curl \
2323
python3-pip \

0 commit comments

Comments
 (0)