Skip to content

Commit bff20e0

Browse files
committed
feat(ci): Remove Ubuntu17 variant
This variant was used by profiling to test against with a JVM without debug symbols. It is now tested of the profiling product side.
1 parent 41f81d1 commit bff20e0

File tree

2 files changed

+0
-19
lines changed

2 files changed

+0
-19
lines changed

Dockerfile

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -73,21 +73,6 @@ RUN <<-EOT
7373
sudo curl -L --fail "https://javadl.oracle.com/webapps/download/AutoDL?BundleId=248746_8c876547113c4e4aab3c868e9e0ec572" | sudo tar -xvzf - -C /usr/lib/jvm/oracle8 --strip-components 1
7474
EOT
7575

76-
# Install Ubuntu's OpenJDK 17 and fix broken symlinks:
77-
# some files in /usr/lib/jvm/ubuntu17 are symlinks to /etc/java-17-openjdk/, so we just copy all symlinks targets.
78-
RUN <<-EOT
79-
set -eux
80-
sudo apt-get update
81-
sudo apt-get install -y openjdk-17-jdk
82-
sudo mv /usr/lib/jvm/java-17-openjdk-amd64 /usr/lib/jvm/ubuntu17
83-
sudo mkdir -p /usr/lib/jvm/ubuntu17/conf/ /usr/lib/jvm/ubuntu17/lib/
84-
sudo cp -rf --remove-destination /etc/java-17-openjdk/* /usr/lib/jvm/ubuntu17/conf/
85-
sudo cp -rf --remove-destination /etc/java-17-openjdk/* /usr/lib/jvm/ubuntu17/lib/
86-
sudo cp -f --remove-destination /etc/java-17-openjdk/jvm-amd64.cfg /usr/lib/jvm/ubuntu17/lib/
87-
sudo apt-get clean
88-
sudo rm -rf /var/lib/apt/lists/*
89-
EOT
90-
9176
# Remove cruft from JDKs that is not used in the build process.
9277
RUN <<-EOT
9378
sudo rm -rf \
@@ -212,7 +197,6 @@ COPY --from=all-jdk /usr/lib/jvm/ibm8 /usr/lib/jvm/ibm8
212197
COPY --from=all-jdk /usr/lib/jvm/semeru8 /usr/lib/jvm/semeru8
213198
COPY --from=all-jdk /usr/lib/jvm/semeru11 /usr/lib/jvm/semeru11
214199
COPY --from=all-jdk /usr/lib/jvm/semeru17 /usr/lib/jvm/semeru17
215-
COPY --from=all-jdk /usr/lib/jvm/ubuntu17 /usr/lib/jvm/ubuntu17
216200
COPY --from=all-jdk /usr/lib/jvm/graalvm17 /usr/lib/jvm/graalvm17
217201
COPY --from=all-jdk /usr/lib/jvm/graalvm21 /usr/lib/jvm/graalvm21
218202

@@ -233,7 +217,5 @@ ENV JAVA_SEMERU8_HOME=/usr/lib/jvm/semeru8
233217
ENV JAVA_SEMERU11_HOME=/usr/lib/jvm/semeru11
234218
ENV JAVA_SEMERU17_HOME=/usr/lib/jvm/semeru17
235219

236-
ENV JAVA_UBUNTU17_HOME=/usr/lib/jvm/ubuntu17
237-
238220
ENV JAVA_GRAALVM17_HOME=/usr/lib/jvm/graalvm17
239221
ENV JAVA_GRAALVM21_HOME=/usr/lib/jvm/graalvm21

build

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ readonly VARIANTS=(
1414
semeru8
1515
semeru11
1616
semeru17
17-
ubuntu17
1817
graalvm17
1918
graalvm21
2019
)

0 commit comments

Comments
 (0)