From ef088b87e77ed332d919bee7185e94007abca3d9 Mon Sep 17 00:00:00 2001
From: Damien Duportal <damien.duportal@gmail.com>
Date: Mon, 7 Feb 2022 18:28:01 +0100
Subject: [PATCH 1/2] Revert "Bump docker-builder version on shared library
 resources to 2.0.9 (#295)"

This reverts commit 5e11fba4312ee495c43e21c73194540e532586c9.
---
 vars/buildDockerAndPublishImage.groovy | 2 +-
 vars/buildDockerAndPublishImage.txt    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/vars/buildDockerAndPublishImage.groovy b/vars/buildDockerAndPublishImage.groovy
index 390fe841..1ca5dae9 100644
--- a/vars/buildDockerAndPublishImage.groovy
+++ b/vars/buildDockerAndPublishImage.groovy
@@ -26,7 +26,7 @@ def call(String imageName, Map config=[:]) {
       // This container must be named `jnlp` and should use the default entrypoint/cmd (command/args) inherited from inbound-agent parent image
       containerTemplate(
         name: 'jnlp',
-        image: config.builderImage ?: 'jenkinsciinfra/builder:2.0.9',
+        image: config.builderImage ?: 'jenkinsciinfra/builder:2.0.2',
         resourceRequestCpu: '2',
         resourceLimitCpu: '2',
         resourceRequestMemory: '2Gi',
diff --git a/vars/buildDockerAndPublishImage.txt b/vars/buildDockerAndPublishImage.txt
index 33a6692b..894eed7b 100644
--- a/vars/buildDockerAndPublishImage.txt
+++ b/vars/buildDockerAndPublishImage.txt
@@ -19,7 +19,7 @@
           <li>Boolean automaticSemanticVersioning: (Optional, defaults to "false") Should we create a release for every merge to the mainBranch. This uses "jx-release-version" to determine the version number based on the commit history.</li>
           <li>String gitCredentials: (Optional, defaults to "") If "automaticSemanticVersioning" is set, name of the credential to use when tagging the git repository. Support User/password or GitHub App credential types.</li>
           <li>String metadataFromSh: (Optional, defaults to "") If "automaticSemanticVersioning" is set, use a script to calculate the build metadata to be appended to the generated version.</li>
-          <li>String builderImage: (Optional, defaults to "jenkinsciinfra/builder:2.0.9") Docker Image to be used for the container "builder" of the CI pod template.</li>
+          <li>String builderImage: (Optional, defaults to "jenkinsciinfra/builder:2.0.2") Docker Image to be used for the container "builder" of the CI pod template.</li>
         </ul>
       </li>
     </ul>

From 87b22fe766214786688827e5391c163757512f0c Mon Sep 17 00:00:00 2001
From: Damien Duportal <damien.duportal@gmail.com>
Date: Mon, 7 Feb 2022 18:28:56 +0100
Subject: [PATCH 2/2] Delete docker-builder.yml

---
 updatecli/updatecli.d/docker-builder.yml | 68 ------------------------
 1 file changed, 68 deletions(-)
 delete mode 100644 updatecli/updatecli.d/docker-builder.yml

diff --git a/updatecli/updatecli.d/docker-builder.yml b/updatecli/updatecli.d/docker-builder.yml
deleted file mode 100644
index 3638e6d3..00000000
--- a/updatecli/updatecli.d/docker-builder.yml
+++ /dev/null
@@ -1,68 +0,0 @@
----
-title: "Bump docker-builder version on shared library resources"
-
-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
-    name: Get the latest docker-builder version
-    spec:
-      owner: "jenkins-infra"
-      repository: "docker-builder"
-      token: "{{ requiredEnv .github.token }}"
-      username: "{{ .github.username }}"
-      versionFilter:
-        kind: semver
-
-conditions:
-  checkIfDockerImageIsPublished:
-    name: "Check if the Docker Image is published"
-    kind: dockerImage
-    spec:
-      image: "jenkinsciinfra/builder"
-      architecture: amd64
-
-targets:
-  updateGroovyCode:
-    name: Update docker-builder in groovy code
-    kind: file
-    spec:
-      file: vars/buildDockerAndPublishImage.groovy
-      # Please note that the patterns are specified as "block scalars" (>) with the last endline trimmed (-) to avoid tedious escaping of simple quotes
-      matchpattern: >-
-        'jenkinsciinfra/builder:(.*)'
-      replacepattern: >-
-        'jenkinsciinfra/builder:{{ source `lastVersion` }}'
-    scmID: default
-  updateDoc:
-    updateDoc:
-    name: Update docker-builder in documentation
-    kind: file
-    spec:
-      file: vars/buildDockerAndPublishImage.txt
-      matchpattern: jenkinsciinfra/builder:(\d+\.\d+\.\d+)\"
-      replacepattern: jenkinsciinfra/builder:{{ source `lastVersion` }}"
-    scmID: default
-
-pullrequests:
-  default:
-    kind: github
-    title: Bump docker-builder version on shared library resources to {{ source "lastVersion" }}
-    scmID: default
-    targets:
-      - updateGroovyCode
-      - updateDoc
-    spec:
-      labels:
-        - dependencies