Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: remove blobxfer #204

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 1 addition & 12 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand All @@ -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 \
Expand Down Expand Up @@ -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}"
Expand Down
2 changes: 0 additions & 2 deletions cst.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions updatecli/updatecli.d/asdf.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions updatecli/updatecli.d/azcopy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions updatecli/updatecli.d/azure-cli.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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"
Expand Down
77 changes: 0 additions & 77 deletions updatecli/updatecli.d/blobxfer.yml

This file was deleted.

4 changes: 2 additions & 2 deletions updatecli/updatecli.d/jenkins-inbound-agent.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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?"
Expand All @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions updatecli/updatecli.d/netlify-deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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"
Expand Down
Loading