Merge pull request #306 from dduportal/chore/update-0.38.0

chore(updatecli) adapt manifest for v0.38.0
jenkinsci · Nov 20, 2022 · 12e6b1e · 12e6b1e
2 parents 0043492 + c0f7f00
commit 12e6b1e
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 45 deletions.
diff --git a/.github/workflows/updatecli.yaml b/.github/workflows/updatecli.yaml
@@ -15,7 +15,7 @@ jobs:
         uses: actions/checkout@v3
 
       - name: Install Updatecli in the runner
-        uses: updatecli/updatecli-action@v2.14.0
+        uses: updatecli/updatecli-action@v2.15.0
 
       - name: Run Updatecli in Dry Run mode
         run: updatecli diff --config ./updatecli/updatecli.d --values ./updatecli/values.github-action.yaml

diff --git a/updatecli/updatecli.d/jenkins-agent-parent.yaml b/updatecli/updatecli.d/jenkins-agent-parent.yaml
@@ -42,60 +42,27 @@ conditions:
       architecture: amd64
       image: jenkins/agent
       tag: '{{source "lastVersion" }}-alpine-jdk17'
-  checkJdk11DebianAmd64DockerImage:
+  checkJdk11DebianDockerImages:
     kind: dockerimage
     name: Check if the container image "jenkins/agent:<lastVersion>-jdk11" for linux/amd64 is available
     disablesourceinput: true
     spec:
-      architecture: amd64
-      image: jenkins/agent
-      tag: '{{source "lastVersion" }}-jdk11'
-  checkJdk11DebianArm64DockerImage:
-    kind: dockerimage
-    name: Check if the container image "jenkins/agent:<lastVersion>-jdk11" for linux/arm64 is available
-    disablesourceinput: true
-    spec:
-      architecture: arm64
-      image: jenkins/agent
-      tag: '{{source "lastVersion" }}-jdk11'
-  checkJdk11DebianArmv7DockerImage:
-    kind: dockerimage
-    name: Check if the container image "jenkins/agent:<lastVersion>-jdk11" for linux/arm/v7 is available
-    disablesourceinput: true
-    spec:
-      architecture: arm/v7
+      architectures:
+        - amd64
+        - arm64
+        - arm/v7
+        - s390x
       image: jenkins/agent
       tag: '{{source "lastVersion" }}-jdk11'
-  checkJdk11DebianS390xDockerImage:
-    kind: dockerimage
-    name: Check if the container image "jenkins/agent:<lastVersion>-jdk11" for linux/s390x is available
-    disablesourceinput: true
-    spec:
-      architecture: s390x
-      image: jenkins/agent
-      tag: '{{source "lastVersion" }}-jdk11'
-  checkJdk17DebianAmd64DockerImage:
+  checkJdk17DebianDockerImages:
     kind: dockerimage
     name: Check if the container image "jenkins/agent:<lastVersion>-jdk17" for linux/amd64 is available
     disablesourceinput: true
     spec:
-      architecture: amd64
-      image: jenkins/agent
-      tag: '{{source "lastVersion" }}-jdk17'
-  checkJdk17DebianArm64DockerImage:
-    kind: dockerimage
-    name: Check if the container image "jenkins/agent:<lastVersion>-jdk17" for linux/arm64 is available
-    disablesourceinput: true
-    spec:
-      architecture: arm64
-      image: jenkins/agent
-      tag: '{{source "lastVersion" }}-jdk17'
-  checkJdk17DebianArmv7DockerImage:
-    kind: dockerimage
-    name: Check if the container image "jenkins/agent:<lastVersion>-jdk17" for linux/arm/v7 is available
-    disablesourceinput: true
-    spec:
-      architecture: arm/v7
+      architectures:
+        - amd64
+        - arm64
+        - arm/v7
       image: jenkins/agent
       tag: '{{source "lastVersion" }}-jdk17'
   checkJdk11WindowsNanoserver1809DockerImage: