diff --git a/Dockerfile b/Dockerfile index 98eb191..09d6fb4 100644 --- a/Dockerfile +++ b/Dockerfile @@ -22,10 +22,6 @@ RUN \ jq \ # jenkins.io archives stuff zip \ - # python - python3 \ - python3-pip \ - pipx \ # Required for installing azure-cli through the debian package gpg \ lsb-release \ @@ -40,12 +36,6 @@ RUN \ apt-get clean &&\ rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* -# # plugin site -ARG BLOBXFER_VERSION=1.11.0 -# hadolint ignore=DL3018 -RUN su - jenkins -c "pipx install blobxfer==${BLOBXFER_VERSION} --pip-args='--no-cache-dir'" \ - && su - jenkins -c "blobxfer --version" - ARG GH_VERSION=2.46.0 # ARG GH_SHASUM_256="6df9b0214f352fe62b2998c2d1b9828f09c8e133307c855c20c1924134d3da25" RUN curl --silent --show-error --location --output /tmp/gh.tar.gz \ @@ -141,8 +131,7 @@ RUN bash -c "git clone https://github.com/asdf-vm/asdf.git $HOME/.asdf --branch asdf global nodejs 18.19.0 && \ asdf install nodejs 20.11.1" -LABEL io.jenkins-infra.tools="azcopy,azure-cli,git,make,gh,typos,nodejs,npm,blobxfer,jenkins-inbound-agent,netlify-deploy,asdf" -LABEL io.jenkins-infra.tools.blobxfer.version="${BLOBXFER_VERSION}" +LABEL io.jenkins-infra.tools="azcopy,azure-cli,git,make,gh,typos,nodejs,npm,jenkins-inbound-agent,netlify-deploy,asdf" LABEL io.jenkins-infra.tools.gh.version="${GH_VERSION}" LABEL io.jenkins-infra.tools.jenkins-inbound-agent.version="${JENKINS_INBOUND_AGENT_VERSION}" LABEL io.jenkins-infra.tools.netlify-deploy.version="${NETLIFY_DEPLOY}" diff --git a/cst.yml b/cst.yml index fe91add..b5387a5 100644 --- a/cst.yml +++ b/cst.yml @@ -13,8 +13,6 @@ metadataTest: isRegex: true - key: io.jenkins-infra.tools.gh.version value: 2.46.0 - - key: io.jenkins-infra.tools.blobxfer.version - value: 1.11.0 - key: io.jenkins-infra.tools.jenkins-inbound-agent.version value: 3206.vb_15dcf73f6a_9-9 - key: io.jenkins-infra.tools.netlify-deploy.version diff --git a/updatecli/updatecli.d/asdf.yml b/updatecli/updatecli.d/asdf.yml index a77dd54..16f504d 100644 --- a/updatecli/updatecli.d/asdf.yml +++ b/updatecli/updatecli.d/asdf.yml @@ -43,7 +43,7 @@ conditions: disablesourceinput: true spec: file: "cst.yml" - key: "$.metadataTest.labels[5].key" + key: "$.metadataTest.labels[4].key" value: io.jenkins-infra.tools.asdf.version targets: @@ -53,7 +53,7 @@ targets: kind: yaml spec: file: "cst.yml" - key: "$.metadataTest.labels[5].value" + key: "$.metadataTest.labels[4].value" scmid: default updateDockerfileArgVersion: name: "Update the value of ARG ASDF_VERSION in the Dockerfile" diff --git a/updatecli/updatecli.d/azcopy.yml b/updatecli/updatecli.d/azcopy.yml index 5871509..243b80a 100644 --- a/updatecli/updatecli.d/azcopy.yml +++ b/updatecli/updatecli.d/azcopy.yml @@ -38,7 +38,7 @@ conditions: disablesourceinput: true spec: file: "cst.yml" - key: "$.metadataTest.labels[6].key" + key: "$.metadataTest.labels[5].key" value: io.jenkins-infra.tools.azcopy.version targets: @@ -48,7 +48,7 @@ targets: kind: yaml spec: file: "cst.yml" - key: "$.metadataTest.labels[6].value" + key: "$.metadataTest.labels[5].value" scmid: default updateDockerfileArgVersion: name: "Update the value of ARG AZCOPY_VERSION in the Dockerfile" diff --git a/updatecli/updatecli.d/azure-cli.yml b/updatecli/updatecli.d/azure-cli.yml index 731a6b2..195b2d5 100644 --- a/updatecli/updatecli.d/azure-cli.yml +++ b/updatecli/updatecli.d/azure-cli.yml @@ -45,7 +45,7 @@ conditions: disablesourceinput: true spec: file: "cst.yml" - key: "$.metadataTest.labels[7].key" + key: "$.metadataTest.labels[6].key" value: io.jenkins-infra.tools.azure-cli.version targets: @@ -55,7 +55,7 @@ targets: kind: yaml spec: file: "cst.yml" - key: "$.metadataTest.labels[7].value" + key: "$.metadataTest.labels[6].value" scmid: default updateDockerfileArgVersion: name: "Update the value of ARG AZ_CLI_VERSION in the Dockerfile" diff --git a/updatecli/updatecli.d/blobxfer.yml b/updatecli/updatecli.d/blobxfer.yml deleted file mode 100644 index 18416e9..0000000 --- a/updatecli/updatecli.d/blobxfer.yml +++ /dev/null @@ -1,77 +0,0 @@ ---- -name: Bump the `blobxfer` CLI 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 - name: get the latest blobxfer CLI version - spec: - owner: "Azure" - repository: "blobxfer" - token: "{{ requiredEnv .github.token }}" - username: "{{ .github.username }}" - versionfilter: - kind: semver - transformers: - - trimprefix: v - -conditions: - testDockerfile: - name: "Does the Dockerfile have an ARG instruction which key is BLOBXFER_VERSION?" - kind: dockerfile - disablesourceinput: true - spec: - file: Dockerfile - instruction: - keyword: "ARG" - matcher: "BLOBXFER_VERSION" - testTestHarness: - name: "Does the test harness checks for a label io.jenkins-infra.tools.blobxfer.version?" - kind: yaml - disablesourceinput: true - spec: - file: "cst.yml" - key: "$.metadataTest.labels[2].key" - value: io.jenkins-infra.tools.blobxfer.version - -targets: - updateTestVersion: - name: "Update the test harness" - sourceid: lastVersion - kind: yaml - spec: - file: "cst.yml" - key: "$.metadataTest.labels[2].value" - scmid: default - updateDockerfileVersion: - name: "Update the value of ARG BLOBXFER_VERSION in the Dockerfile" - sourceid: lastVersion - kind: dockerfile - spec: - file: Dockerfile - instruction: - keyword: "ARG" - matcher: "BLOBXFER_VERSION" - scmid: default - -actions: - default: - kind: github/pullrequest - scmid: default - title: Bump the `blobxfer` CLI version to {{ source "lastVersion" }} - spec: - labels: - - dependencies - - blobxfer diff --git a/updatecli/updatecli.d/jenkins-inbound-agent.yml b/updatecli/updatecli.d/jenkins-inbound-agent.yml index 32522d8..65d57e3 100644 --- a/updatecli/updatecli.d/jenkins-inbound-agent.yml +++ b/updatecli/updatecli.d/jenkins-inbound-agent.yml @@ -43,7 +43,7 @@ conditions: disablesourceinput: true spec: file: "cst.yml" - key: "$.metadataTest.labels[3].key" + key: "$.metadataTest.labels[2].key" value: io.jenkins-infra.tools.jenkins-inbound-agent.version checkDockerImagePublished: name: "Is latest dockerfile docker-inbound-agent image published?" @@ -63,7 +63,7 @@ targets: kind: yaml spec: file: "cst.yml" - key: "$.metadataTest.labels[3].value" + key: "$.metadataTest.labels[2].value" scmid: default updateDockerfileVersion: name: "Update the value of ARG JENKINS_INBOUND_AGENT_VERSION in the Dockerfile" diff --git a/updatecli/updatecli.d/netlify-deploy.yml b/updatecli/updatecli.d/netlify-deploy.yml index 906ef6f..cdbc5d0 100644 --- a/updatecli/updatecli.d/netlify-deploy.yml +++ b/updatecli/updatecli.d/netlify-deploy.yml @@ -43,7 +43,7 @@ conditions: disablesourceinput: true spec: file: "cst.yml" - key: "$.metadataTest.labels[4].key" + key: "$.metadataTest.labels[3].key" value: io.jenkins-infra.tools.netlify-deploy.version targets: @@ -53,7 +53,7 @@ targets: kind: yaml spec: file: "cst.yml" - key: "$.metadataTest.labels[4].value" + key: "$.metadataTest.labels[3].value" scmid: default updateDockerfileVersion: name: "Update the value of ARG NETLIFY_DEPLOY in the Dockerfile"