Deprecate 20

corretto · Oct 18, 2023 · dbce215 · dbce215
1 parent fce3a18
commit dbce215
Show file tree

Hide file tree

Showing 11 changed files with 4 additions and 276 deletions.
diff --git a/.github/workflows/verify-images.yml b/.github/workflows/verify-images.yml
@@ -9,7 +9,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        version: [ 8, 11, 17, 20, 21 ]
+        version: [ 8, 11, 17, 21 ]
         package: [ jdk ]
         platform: [ al2-generic, debian ]
     steps:
@@ -24,7 +24,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        version: [ 17, 20, 21 ]
+        version: [ 17, 21 ]
         package: [ slim ]
         platform: [ al2, alpine, debian ]
     steps:
@@ -69,7 +69,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        version: [ 20 ]
+        version: [ 21 ]
         package: [ jdk ]
         platform: [ al2023-generic ]
     steps:
@@ -84,7 +84,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        version: [ 8, 11, 17, 20, 21 ]
+        version: [ 8, 11, 17, 21 ]
         os_version: ["3.15", "3.16", "3.17", "3.18"]
     steps:
       - name: Checkout code

diff --git a/20/jdk/al2-generic/Dockerfile b/20/jdk/al2-generic/Dockerfile
diff --git a/20/jdk/al2023-generic/Dockerfile b/20/jdk/al2023-generic/Dockerfile
diff --git a/20/jdk/debian/Dockerfile b/20/jdk/debian/Dockerfile
diff --git a/20/slim/al2/Dockerfile b/20/slim/al2/Dockerfile
diff --git a/20/slim/alpine/Dockerfile b/20/slim/alpine/Dockerfile
diff --git a/20/slim/debian/Dockerfile b/20/slim/debian/Dockerfile
diff --git a/bin/update-dockerfiles.sh b/bin/update-dockerfiles.sh
@@ -103,7 +103,6 @@ done
 CORRETTO_8_GENERIC_LINUX=$(cat versions.json | jq -r '.["8"]' )
 CORRETTO_11_GENERIC_LINUX=$(cat versions.json | jq -r '.["11"]' )
 CORRETTO_17_GENERIC_LINUX=$(cat versions.json | jq -r '.["17"]' )
-CORRETTO_20_GENERIC_LINUX=$(cat versions.json | jq -r '.["20"]' )
 CORRETTO_21_GENERIC_LINUX=$(cat versions.json | jq -r '.["21"]' )
 
 if [ ! -z "${CORRETTO_11_GENERIC_LINUX}" ]; then
@@ -114,10 +113,6 @@ if [ ! -z "${CORRETTO_17_GENERIC_LINUX}" ]; then
     update_generic_linux ${CORRETTO_17_GENERIC_LINUX} 17
 fi
 
-if [ ! -z "${CORRETTO_20_GENERIC_LINUX}" ]; then
-    update_generic_linux ${CORRETTO_20_GENERIC_LINUX} 20
-fi
-
 if [ ! -z "${CORRETTO_21_GENERIC_LINUX}" ]; then
     update_generic_linux ${CORRETTO_21_GENERIC_LINUX} 21
 fi
@@ -146,5 +141,4 @@ python3 bin/apply-template.py
 verify_update 8 ${jdk_version}
 verify_update 11 ${CORRETTO_11_GENERIC_LINUX}
 verify_update 17 ${CORRETTO_17_GENERIC_LINUX}
-verify_update 20 ${CORRETTO_20_GENERIC_LINUX}
 verify_update 21 ${CORRETTO_21_GENERIC_LINUX}
diff --git a/test/test-image-corretto20-jdk.yaml b/test/test-image-corretto20-jdk.yaml
diff --git a/test/test-image-corretto20-slim.yaml b/test/test-image-corretto20-slim.yaml
diff --git a/versions.json b/versions.json
@@ -2,7 +2,6 @@
     "8"  : "8.392.08.1",
     "11" : "11.0.21.9.1",
     "17" : "17.0.9.8.1",
-    "20" : "20.0.2.10.1",
     "21" : "21.0.1.12.1"
 }