From a653b85378f5421ea01eb97386d58151ac737db3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Nicoll?= <stephane.nicoll@broadcom.com>
Date: Fri, 15 Mar 2024 09:45:52 +0100
Subject: [PATCH] Harmonize Concourse configuration

---
 ci/config/changelog-generator.yml | 2 +-
 ci/images/ci-image/Dockerfile     | 2 +-
 ci/pipeline.yml                   | 2 +-
 ci/scripts/promote-version.sh     | 1 -
 ci/tasks/build-ci-image.yml       | 3 ++-
 ci/tasks/generate-changelog.yml   | 2 +-
 ci/tasks/promote-version.yml      | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/ci/config/changelog-generator.yml b/ci/config/changelog-generator.yml
index fce2a3a860b..2252d20802e 100644
--- a/ci/config/changelog-generator.yml
+++ b/ci/config/changelog-generator.yml
@@ -17,4 +17,4 @@ changelog:
         - "type: dependency-upgrade"
   contributors:
     exclude:
-      names: ["bclozel", "jhoeller", "poutsma", "rstoyanchev", "sbrannen", "sdeleuze", "snicoll"]
+      names: ["bclozel", "jhoeller", "poutsma", "rstoyanchev", "sbrannen", "sdeleuze", "snicoll", "simonbasle"]
diff --git a/ci/images/ci-image/Dockerfile b/ci/images/ci-image/Dockerfile
index 7d178de64a6..05c1d9f5f0f 100644
--- a/ci/images/ci-image/Dockerfile
+++ b/ci/images/ci-image/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:jammy-20240111
+FROM ubuntu:jammy-20240125
 
 ADD setup.sh /setup.sh
 ADD get-jdk-url.sh /get-jdk-url.sh
diff --git a/ci/pipeline.yml b/ci/pipeline.yml
index ceee57b3892..95349a1d598 100644
--- a/ci/pipeline.yml
+++ b/ci/pipeline.yml
@@ -37,7 +37,7 @@ resource_types:
   source:
     <<: *docker-resource-source
     repository: concourse/registry-image-resource
-    tag: 1.7.1
+    tag: 1.8.0
 - name: artifactory-resource
   type: registry-image
   source:
diff --git a/ci/scripts/promote-version.sh b/ci/scripts/promote-version.sh
index 2b932f5f20f..bd1600191a7 100755
--- a/ci/scripts/promote-version.sh
+++ b/ci/scripts/promote-version.sh
@@ -1,6 +1,5 @@
 #!/bin/bash
 
-source $(dirname $0)/common.sh
 CONFIG_DIR=git-repo/ci/config
 
 version=$( cat artifactory-repo/build-info.json | jq -r '.buildInfo.modules[0].id' | sed 's/.*:.*:\(.*\)/\1/' )
diff --git a/ci/tasks/build-ci-image.yml b/ci/tasks/build-ci-image.yml
index 34ce60ab6c7..28afb97cb62 100644
--- a/ci/tasks/build-ci-image.yml
+++ b/ci/tasks/build-ci-image.yml
@@ -26,4 +26,5 @@ run:
       cat > /root/.docker/config.json <<EOF
       { "auths": { "https://index.docker.io/v1/": { "auth": "$DOCKER_HUB_AUTH" }}}
       EOF
-      build
\ No newline at end of file
+      build
+
diff --git a/ci/tasks/generate-changelog.yml b/ci/tasks/generate-changelog.yml
index f8c5392c827..f4004743db9 100755
--- a/ci/tasks/generate-changelog.yml
+++ b/ci/tasks/generate-changelog.yml
@@ -4,7 +4,7 @@ image_resource:
   type: registry-image
   source:
     repository: springio/github-changelog-generator
-    tag: '0.0.7'
+    tag: '0.0.8'
     username: ((docker-hub-username))
     password: ((docker-hub-password))
 inputs:
diff --git a/ci/tasks/promote-version.yml b/ci/tasks/promote-version.yml
index 8dd8d6273c4..515d5b2b977 100644
--- a/ci/tasks/promote-version.yml
+++ b/ci/tasks/promote-version.yml
@@ -4,7 +4,7 @@ image_resource:
   type: registry-image
   source:
     repository: springio/concourse-release-scripts
-    tag: '0.3.4'
+    tag: '0.4.0'
     username: ((docker-hub-username))
     password: ((docker-hub-password))
 inputs: