From 0ab054c7b943d65bb9034d1d7987f556e9d54d05 Mon Sep 17 00:00:00 2001
From: Brian Clozel <bclozel@vmware.com>
Date: Mon, 14 Feb 2022 10:55:07 +0100
Subject: [PATCH] Upgrade concourse-release-scripts in CI

This commit also reverts the change of resource type for the publication
of the CI image and fixes a bug in the CI image setup with available
JDKs.
---
 ci/images/setup.sh | 4 ++--
 ci/pipeline.yml    | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/ci/images/setup.sh b/ci/images/setup.sh
index ff18f849f40..3e1e0bc05c2 100755
--- a/ci/images/setup.sh
+++ b/ci/images/setup.sh
@@ -14,7 +14,7 @@ rm -rf /var/lib/apt/lists/*
 
 curl https://raw.githubusercontent.com/spring-io/concourse-java-scripts/v0.0.4/concourse-java.sh > /opt/concourse-java.sh
 
-curl --output /opt/concourse-release-scripts.jar https://repo.spring.io/release/io/spring/concourse/releasescripts/concourse-release-scripts/0.3.2/concourse-release-scripts-0.3.2.jar
+curl --output /opt/concourse-release-scripts.jar https://repo.spring.io/release/io/spring/concourse/releasescripts/concourse-release-scripts/0.3.3/concourse-release-scripts-0.3.3.jar
 
 ###########################################################
 # JAVA
@@ -22,7 +22,7 @@ curl --output /opt/concourse-release-scripts.jar https://repo.spring.io/release/
 
 mkdir -p /opt/openjdk
 pushd /opt/openjdk > /dev/null
-for jdk in java8 java11 java16
+for jdk in java8 java11 java17
 do
   JDK_URL=$( /get-jdk-url.sh $jdk )
   mkdir $jdk
diff --git a/ci/pipeline.yml b/ci/pipeline.yml
index 03545186aea..eb8de81ea1e 100644
--- a/ci/pipeline.yml
+++ b/ci/pipeline.yml
@@ -87,7 +87,7 @@ resources:
     branch: ((branch))
     paths: ["ci/images/*"]
 - name: ci-image
-  type: registry-image
+  type: docker-image
   icon: docker
   source:
     <<: *docker-resource-source