From 1dee938cb6fbd60c8870e0c6e7c8dac7560e80b7 Mon Sep 17 00:00:00 2001
From: Stephane Nicoll <snicoll@vmware.com>
Date: Wed, 22 Sep 2021 09:11:45 +0200
Subject: [PATCH] Remove CI job for Java 16

---
 ci/images/ci-image-jdk16/Dockerfile |  8 -----
 ci/images/get-jdk-url.sh            |  5 +--
 ci/pipeline.yml                     | 53 +----------------------------
 3 files changed, 2 insertions(+), 64 deletions(-)
 delete mode 100644 ci/images/ci-image-jdk16/Dockerfile

diff --git a/ci/images/ci-image-jdk16/Dockerfile b/ci/images/ci-image-jdk16/Dockerfile
deleted file mode 100644
index 20215d6a..00000000
--- a/ci/images/ci-image-jdk16/Dockerfile
+++ /dev/null
@@ -1,8 +0,0 @@
-FROM ubuntu:focal-20210723
-
-ADD setup.sh /setup.sh
-ADD get-jdk-url.sh /get-jdk-url.sh
-RUN ./setup.sh java16
-
-ENV JAVA_HOME /opt/openjdk
-ENV PATH $JAVA_HOME/bin:$PATH
\ No newline at end of file
diff --git a/ci/images/get-jdk-url.sh b/ci/images/get-jdk-url.sh
index 383644aa..ac77d87b 100755
--- a/ci/images/get-jdk-url.sh
+++ b/ci/images/get-jdk-url.sh
@@ -8,10 +8,7 @@ case "$1" in
 	java11)
 		 echo "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.12%2B7/OpenJDK11U-jdk_x64_linux_hotspot_11.0.12_7.tar.gz"
 	;;
-	java16)
-		 echo "https://github.com/adoptium/temurin16-binaries/releases/download/jdk-16.0.2%2B7/OpenJDK16U-jdk_x64_linux_hotspot_16.0.2_7.tar.gz"
-	;;
-  java17)
+	java17)
 		 echo "https://github.com/adoptium/temurin17-binaries/releases/download/jdk17-2021-09-01-12-34-beta/OpenJDK17-jdk_x64_linux_hotspot_2021-09-01-12-34.tar.gz"
 	;;
   *)
diff --git a/ci/pipeline.yml b/ci/pipeline.yml
index f9207f21..7aa9d7fd 100644
--- a/ci/pipeline.yml
+++ b/ci/pipeline.yml
@@ -122,12 +122,6 @@ resources:
   source:
     <<: *registry-image-resource-source
     repository: ((docker-hub-organization))/initializr-ci-jdk11
-- name: ci-image-jdk16
-  type: registry-image
-  icon: docker
-  source:
-    <<: *registry-image-resource-source
-    repository: ((docker-hub-organization))/initializr-ci-jdk16
 - name: ci-image-jdk17
   type: registry-image
   icon: docker
@@ -158,14 +152,6 @@ resources:
     access_token: ((github-ci-status-token))
     branch: ((branch))
     context: jdk11-build
-- name: repo-status-jdk16-build
-  type: github-status-resource
-  icon: eye-check-outline
-  source:
-    repository: ((github-repo-name))
-    access_token: ((github-ci-status-token))
-    branch: ((branch))
-    context: jdk16-build
 - name: repo-status-jdk17-build
   type: github-status-resource
   icon: eye-check-outline
@@ -206,14 +192,6 @@ jobs:
       vars:
         ci-image-name: ci-image-jdk11
         <<: *registry-mirror-vars
-    - task: build-ci-image-jdk16
-      privileged: true
-      file: git-repo/ci/tasks/build-ci-image.yml
-      output_mapping:
-        image: ci-image-jdk16
-      vars:
-        ci-image-name: ci-image-jdk16
-        <<: *registry-mirror-vars
     - task: build-ci-image-jdk17
       privileged: true
       file: git-repo/ci/tasks/build-ci-image.yml
@@ -229,9 +207,6 @@ jobs:
     - put: ci-image-jdk11
       params:
         image: ci-image-jdk11/image.tar
-    - put: ci-image-jdk16
-      params:
-        image: ci-image-jdk16/image.tar
     - put: ci-image-jdk17
       params:
         image: ci-image-jdk17/image.tar
@@ -294,32 +269,6 @@ jobs:
     - put: slack-alert
       params:
         <<: *slack-success-params
-- name: jdk16-build
-  serial: true
-  public: true
-  plan:
-    - get: ci-image-jdk16
-    - get: git-repo
-    - get: daily
-      trigger: true
-    - put: repo-status-jdk16-build
-      params: { state: "pending", commit: "git-repo" }
-    - do:
-        - task: build-project
-          image: ci-image-jdk16
-          <<: *build-project-task-params
-      on_failure:
-        do:
-          - put: repo-status-jdk16-build
-            params: { state: "failure", commit: "git-repo" }
-          - put: slack-alert
-            params:
-              <<: *slack-fail-params
-    - put: repo-status-jdk16-build
-      params: { state: "success", commit: "git-repo" }
-    - put: slack-alert
-      params:
-        <<: *slack-success-params
 - name: jdk17-build
   serial: true
   public: true
@@ -459,7 +408,7 @@ jobs:
       body: generated-changelog/changelog.md
 groups:
 - name: "build"
-  jobs: ["build", "jdk11-build", "jdk16-build", "jdk17-build", "windows-build"]
+  jobs: ["build", "jdk11-build", "jdk17-build", "windows-build"]
 - name: "releases"
   jobs: ["stage-release", "promote-release", "create-github-release"]
 - name: "ci-images"