Merge branch 'master' into updatecli_0af9fa03de4800958730c0202f9d3678…

…7ba56eeddf496e50e546f287dbfa768c

.github/dependabot.yml

@@ -26,3 +26,7 @@ updates:
   schedule:
     # Check for updates to GitHub Actions every week
     interval: "weekly"
+  labels:
+    - github-action
+    - dependencies
+    - skip-changelog

.github/workflows/updatecli.yaml

@@ -15,7 +15,7 @@ jobs:
         uses: actions/checkout@v4
 
       - name: Install Updatecli in the runner
-        uses: updatecli/updatecli-action@v2.48.0
+        uses: updatecli/updatecli-action@v2.50.0
 
       - name: Run Updatecli in Dry Run mode
         run: updatecli diff --config ./updatecli/updatecli.d --values ./updatecli/values.github-action.yaml

Makefile

@@ -51,9 +51,7 @@ list: check-reqs
 	@set -x; make --silent show | jq -r '.target | path(.. | select(.platforms[] | contains("linux/$(ARCH)"))?) | add'
 
 bats:
-	git clone https://github.com/bats-core/bats-core bats ;\
-	cd bats ;\
-	git checkout v1.7.0
+	git clone --branch v1.10.0 https://github.com/bats-core/bats-core bats
 
 prepare-test: bats check-reqs
 	git submodule update --init --recursive
@@ -79,10 +77,7 @@ test-%: prepare-test
 	@make --silent build-$*
 # Execute the test harness and write result to a TAP file
 	set -x
-	IMAGE=$* bats/bin/bats $(bats_flags) | tee target/results-$*.tap
-# convert TAP to JUNIT
-	docker run --rm -v "$(CURDIR)":/usr/src/app -w /usr/src/app node:18.18.0-alpine3.18 \
-		sh -c "npm install -g [email protected] && npm install tap-xunit -g && cat target/results-$*.tap | tap-xunit --package='jenkinsci.docker.$*' > target/junit-results-$*.xml"
+	IMAGE=$* bats/bin/bats --formatter junit $(bats_flags) | tee target/junit-results-$*.xml
 
 test: prepare-test
 	@make --silent list | while read image; do make --silent "test-$${image}"; done

README.md

@@ -123,7 +123,7 @@ make build-<OS>_<JDK_VERSION>
 That would give for JDK 11 on Alpine Linux:
 
 ```bash
-make test-alpine_jdk11
+make build-alpine_jdk11
 ```
 
 #### Building all images

alpine/Dockerfile

@@ -21,7 +21,7 @@
 # SOFTWARE.
 
 ARG JAVA_VERSION=17.0.8.1_1
-ARG ALPINE_TAG=3.18.4
+ARG ALPINE_TAG=3.19.0
 FROM eclipse-temurin:"${JAVA_VERSION}"-jdk-alpine AS jre-build
 
 RUN if [ "$TARGETPLATFORM" != 'linux/arm/v7' ]; then \

debian/Dockerfile

@@ -1,6 +1,6 @@
 ARG JAVA_VERSION=17.0.8.1_1
-ARG DEBIAN_RELEASE=bookworm-20231009
-FROM eclipse-temurin:"${JAVA_VERSION}"-jdk-focal AS jre-build
+ARG DEBIAN_RELEASE=bookworm-20231120
+FROM eclipse-temurin:"${JAVA_VERSION}"-jdk-jammy AS jre-build
 
 # This Build ARG is populated by Docker
 # Ref. https://docs.docker.com/engine/reference/builder/#automatic-platform-args-in-the-global-scope

debian/21/Dockerfile → debian/preview/Dockerfile

@@ -1,6 +1,6 @@
 ARG DEBIAN_RELEASE=bookworm-20230904
 FROM debian:"${DEBIAN_RELEASE}" AS jre-build
-ARG JAVA_VERSION=21+35
+ARG JAVA_VERSION=21.0.1+12
 # This Build ARG is populated by Docker
 # Ref. https://docs.docker.com/engine/reference/builder/#automatic-platform-args-in-the-global-scope
 ARG TARGETPLATFORM
@@ -12,8 +12,9 @@ RUN apt-get update \
   && ARCH=$(uname -m | sed -e 's/x86_64/x64/' -e 's/armv7l/arm/') \
   && JAVA_VERSION_ENCODED=$(printf '%s' "$JAVA_VERSION" | jq -jRr '@uri') \
   && BUILD_NUMBER=$(printf '%s' "$JAVA_VERSION" | cut -d'+' -f2) \
-  && JAVA_MAJOR_VERSION=$(printf '%s' "$JAVA_VERSION" | cut -d'+' -f1) \
-  && curl -sL https://github.com/adoptium/temurin"${JAVA_MAJOR_VERSION}"-binaries/releases/download/jdk-"${JAVA_VERSION_ENCODED}"-ea-beta/OpenJDK"${JAVA_MAJOR_VERSION}"U-jdk_"${ARCH}"_linux_hotspot_ea_"${JAVA_MAJOR_VERSION}"-0-"${BUILD_NUMBER}".tar.gz | tar xz -C /opt/ \
+  && JAVA_MAJOR_VERSION=$(printf '%s' "$JAVA_VERSION" | cut -d'.' -f1) \
+  && JAVA_VERSION_KEBAB=$(printf '%s' "$JAVA_VERSION" | sed 's/+/-/g;s/\./-/g') \
+  && curl -sL https://github.com/adoptium/temurin"${JAVA_MAJOR_VERSION}"-binaries/releases/download/jdk-"${JAVA_VERSION_ENCODED}"-ea-beta/OpenJDK"${JAVA_MAJOR_VERSION}"U-jdk_"${ARCH}"_linux_hotspot_ea_"${JAVA_VERSION_KEBAB}".tar.gz | tar xz -C /opt/ \
   && apt-get clean \
   && rm -rf /var/lib/apt/lists/*
 

docker-bake.hcl

@@ -5,6 +5,7 @@ group "linux" {
     "alpine_jdk21",
     "debian_jdk11",
     "debian_jdk21",
+    "debian_jdk21-preview",
   ]
 }
 
@@ -19,14 +20,14 @@ group "linux-arm64" {
 
 group "linux-arm32" {
   targets = [
-    "debian_jdk21",
+    "debian_jdk21-preview",
   ]
 }
 
 group "linux-s390x" {
   targets = [
     "debian_jdk11",
-    "debian_jdk21"
+    "debian_jdk21-preview"
   ]
 }
 
@@ -55,7 +56,7 @@ variable "VERSION" {
 }
 
 variable "ALPINE_FULL_TAG" {
-  default = "3.18.4"
+  default = "3.19.0"
 }
 
 variable "ALPINE_SHORT_TAG" {
@@ -71,11 +72,15 @@ variable "JAVA17_VERSION" {
 }
 
 variable "JAVA21_VERSION" {
-  default = "21+35"
+  default = "21.0.1_12"
+}
+
+variable "JAVA21_PREVIEW_VERSION" {
+  default = "21.0.1+12"
 }
 
 variable "DEBIAN_RELEASE" {
-  default = "bookworm-20231009"
+  default = "bookworm-20231120"
 }
 
 target "alpine_jdk11" {
@@ -118,19 +123,19 @@ target "alpine_jdk17" {
 }
 
 target "alpine_jdk21" {
-  dockerfile = "alpine/21/Dockerfile"
+  dockerfile = "alpine/Dockerfile"
   context    = "."
   args = {
     ALPINE_TAG   = ALPINE_FULL_TAG
     JAVA_VERSION = JAVA21_VERSION
   }
   tags = [
-    equal(ON_TAG, "true") ? "${REGISTRY}/${JENKINS_REPO}:${VERSION}-alpine-jdk21-preview" : "",
-    equal(ON_TAG, "true") ? "${REGISTRY}/${JENKINS_REPO}:${VERSION}-alpine${ALPINE_SHORT_TAG}-jdk21-preview" : "",
-    "${REGISTRY}/${JENKINS_REPO}:alpine-jdk21-preview",
-    "${REGISTRY}/${JENKINS_REPO}:latest-alpine-jdk21-preview",
-    "${REGISTRY}/${JENKINS_REPO}:alpine${ALPINE_SHORT_TAG}-jdk21-preview",
-    "${REGISTRY}/${JENKINS_REPO}:latest-alpine${ALPINE_SHORT_TAG}-jdk21-preview",
+    equal(ON_TAG, "true") ? "${REGISTRY}/${JENKINS_REPO}:${VERSION}-alpine-jdk21" : "",
+    equal(ON_TAG, "true") ? "${REGISTRY}/${JENKINS_REPO}:${VERSION}-alpine${ALPINE_SHORT_TAG}-jdk21" : "",
+    "${REGISTRY}/${JENKINS_REPO}:alpine-jdk21",
+    "${REGISTRY}/${JENKINS_REPO}:latest-alpine-jdk21",
+    "${REGISTRY}/${JENKINS_REPO}:alpine${ALPINE_SHORT_TAG}-jdk21",
+    "${REGISTRY}/${JENKINS_REPO}:latest-alpine${ALPINE_SHORT_TAG}-jdk21",
   ]
   platforms = ["linux/amd64", "linux/arm64"]
 }
@@ -176,12 +181,31 @@ target "debian_jdk17" {
 }
 
 target "debian_jdk21" {
-  dockerfile = "debian/21/Dockerfile"
+  dockerfile = "debian/Dockerfile"
   context    = "."
   args = {
     JAVA_VERSION   = JAVA21_VERSION
     DEBIAN_RELEASE = DEBIAN_RELEASE
   }
+  tags = [
+    equal(ON_TAG, "true") ? "${REGISTRY}/${JENKINS_REPO}:${VERSION}-jdk21" : "",
+    "${REGISTRY}/${JENKINS_REPO}:bookworm-jdk21",
+    "${REGISTRY}/${JENKINS_REPO}:debian-jdk21",
+    "${REGISTRY}/${JENKINS_REPO}:jdk21",
+    "${REGISTRY}/${JENKINS_REPO}:latest-bookworm-jdk21",
+    "${REGISTRY}/${JENKINS_REPO}:latest-debian-jdk21",
+    "${REGISTRY}/${JENKINS_REPO}:latest-jdk21",
+  ]
+  platforms = ["linux/amd64", "linux/arm64", "linux/ppc64le"]
+}
+
+target "debian_jdk21-preview" {
+  dockerfile = "debian/preview/Dockerfile"
+  context    = "."
+  args = {
+    JAVA_VERSION   = JAVA21_PREVIEW_VERSION
+    DEBIAN_RELEASE = DEBIAN_RELEASE
+  }
   tags = [
     equal(ON_TAG, "true") ? "${REGISTRY}/${JENKINS_REPO}:${VERSION}-jdk21-preview" : "",
     "${REGISTRY}/${JENKINS_REPO}:bookworm-jdk21-preview",
@@ -191,5 +215,5 @@ target "debian_jdk21" {
     "${REGISTRY}/${JENKINS_REPO}:latest-debian-jdk21-preview",
     "${REGISTRY}/${JENKINS_REPO}:latest-jdk21-preview",
   ]
-  platforms = ["linux/amd64", "linux/arm64", "linux/ppc64le", "linux/s390x", "linux/arm/v7"]
+  platforms = ["linux/s390x", "linux/arm/v7"]
 }

updatecli/scripts/check-jdk.sh

@@ -30,10 +30,11 @@ function get_jdk_download_url() {
       echo "https://github.com/adoptium/temurin19-binaries/releases/download/jdk-${jdk_version}/OpenJDK19U-jdk_${platform}_hotspot_${jdk_version//+/_}";
       return 0;;
     21*)
-      # JDK version (21+35-ea-beta)
-      ##    https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21%2B35-ea-beta/OpenJDK21U-jdk_aarch64_linux_hotspot_ea_21-0-35.tar.gz
+      # TODO: Check both generally available and early access versions, as both are in use within this repository
+      # JDK version (21.0.1+12-ea-beta)
+      ##    https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21%2B35-ea-beta/OpenJDK21U-jdk_aarch64_linux_hotspot_ea_21-0-1-12.tar.gz
       urlEncodedJDKVersion="${jdk_version//+/%2B}"
-      echo "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-${urlEncodedJDKVersion}-ea-beta/OpenJDK21U-jdk_${platform}_hotspot_ea_21-0-$(echo ${jdk_version} | cut -d '+' -f 2 | cut -d '-' -f 1)"
+      echo "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-${urlEncodedJDKVersion}-ea-beta/OpenJDK21U-jdk_${platform}_hotspot_ea_$(echo ${jdk_version} | sed 's/+/-/g;s/\./-/g')"
       return 0;;
     *)
       echo "ERROR: unsupported JDK version (${jdk_version}).";

updatecli/updatecli.d/bats.yaml

@@ -0,0 +1,47 @@
+---
+name: Bump `bats` version
+
+scms:
+  default:
+    kind: github
+    spec:
+      user: "{{ .github.user }}"
+      email: "{{ .github.email }}"
+      owner: "{{ .github.owner }}"
+      repository: "{{ .github.repository }}"
+      token: "{{ requiredEnv .github.token }}"
+      username: "{{ .github.username }}"
+      branch: "{{ .github.branch }}"
+
+sources:
+  lastVersion:
+    kind: githubrelease
+    spec:
+      owner: bats-core
+      repository: bats-core
+      token: "{{ requiredEnv .github.token }}"
+      username: "{{ .github.username }}"
+      versionfilter:
+        kind: semver
+
+targets:
+  updateMakefile:
+    name: "Updates `bats` version in the Makefile"
+    kind: file
+    spec:
+      file: Makefile
+      matchpattern: >-
+        git clone --branch (.*) https://github.com/bats-core/bats-core bats
+      replacepattern: >-
+        git clone --branch {{ source "lastVersion" }} https://github.com/bats-core/bats-core bats
+    scmid: default
+
+actions:
+  default:
+    kind: github/pullrequest
+    scmid: default
+    title: 'chore(tests): Bump `bats` version to {{ source "lastVersion" }}'
+    spec:
+      labels:
+        - chore # Because bats is only used for testing
+        - bats