From 525885f34a8673ec6b5e12282ce8217a63e25dce Mon Sep 17 00:00:00 2001 From: Laszlo Uveges Date: Wed, 10 Jan 2024 10:07:45 +0100 Subject: [PATCH] Update ABS to `v1.2.2` and use `gsoci.azurecr.io` for images (#488) * Update ABS to v1.2.2 and use gsoci.azurecr.io for image registries * Update CHANGELOG.md --- CHANGELOG.md | 5 +++++ docs/job/push-to-docker.md | 2 +- docs/job/run-tests-with-ats.md | 2 +- src/commands/integration-test-create-cluster.yaml | 2 +- src/commands/run-tests-with-ats.yaml | 2 +- src/executors/app-build-suite.yaml | 2 +- src/executors/architect.yaml | 2 +- src/executors/gitleaks.yaml | 2 +- src/jobs/push-to-docker.yaml | 2 +- src/jobs/run-tests-with-ats.yaml | 2 +- 10 files changed, 14 insertions(+), 9 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 25ff2bd5..a88e57f8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] +### Changed + +- Update `app-build-suite` version to [`v1.2.2`](https://github.com/giantswarm/app-build-suite/releases/tag/v1.2.2). +- Switch images to be pulled from `gsoci.azurecr.io` instead of `quay.io` + ## [4.37.0] - 2023-12-20 - `push-to-registries` job changes: diff --git a/docs/job/push-to-docker.md b/docs/job/push-to-docker.md index db0de255..112b811e 100644 --- a/docs/job/push-to-docker.md +++ b/docs/job/push-to-docker.md @@ -24,7 +24,7 @@ workflows: - architect/push-to-docker: context: "architect" name: "push-REPOSITORY-to-quay" - image: "quay.io/giantswarm/REPOSITORY" + image: "gsoci.azurecr.io/giantswarm/REPOSITORY" username_envar: "QUAY_USERNAME" password_envar: "QUAY_PASSWORD" build-context: "." diff --git a/docs/job/run-tests-with-ats.md b/docs/job/run-tests-with-ats.md index 0092b816..d7084dd9 100644 --- a/docs/job/run-tests-with-ats.md +++ b/docs/job/run-tests-with-ats.md @@ -62,7 +62,7 @@ This can be circumvented by also setting the parameter [`app-test-suite_containe ### app-test-suite_container_tag -Container tag of app-test-suite to use (check [quay.io/giantswarm/app-test-suite](https://quay.io/giantswarm/app-test-suite)). +Container tag of app-test-suite to use (check gsoci.azurecr.io/giantswarm/app-test-suite). This parameter allows to specify the used container tag of app-test-suite. (Default: "0.2.2") diff --git a/src/commands/integration-test-create-cluster.yaml b/src/commands/integration-test-create-cluster.yaml index 4d1e0626..0407fa8a 100644 --- a/src/commands/integration-test-create-cluster.yaml +++ b/src/commands/integration-test-create-cluster.yaml @@ -26,7 +26,7 @@ steps: for i in $(seq 1 $tries) ; do echo "====> Attempt $i: Creating kind cluster" set +e - kind create cluster --config kind-config --image quay.io/giantswarm/kind-node:<< parameters.kubernetes-version >> + kind create cluster --config kind-config --image gsoci.azurecr.io/giantswarm/kind-node:<< parameters.kubernetes-version >> ret=$? set -e [[ $ret -eq 0 ]] && exit $ret diff --git a/src/commands/run-tests-with-ats.yaml b/src/commands/run-tests-with-ats.yaml index b7d0b1ec..9a2aa863 100644 --- a/src/commands/run-tests-with-ats.yaml +++ b/src/commands/run-tests-with-ats.yaml @@ -7,7 +7,7 @@ parameters: description: "Version of app-test-suite dats.sh container wrapper to use (git tag or commit)" type: string app-test-suite_container_tag: - description: "Container tag of app-test-suite to use (check quay.io/giantswarm/app-test-suite)" + description: "Container tag of app-test-suite to use (check gsoci.azurecr.io/giantswarm/app-test-suite)" type: string additional_app-test-suite_flags: description: "Additional app-test-suite flags to use" diff --git a/src/executors/app-build-suite.yaml b/src/executors/app-build-suite.yaml index 126e999f..19d79977 100644 --- a/src/executors/app-build-suite.yaml +++ b/src/executors/app-build-suite.yaml @@ -1,3 +1,3 @@ docker: - entrypoint: /bin/bash - image: quay.io/giantswarm/app-build-suite:1.1.3-circleci + image: gsoci.azurecr.io/giantswarm/app-build-suite:1.2.2-circleci diff --git a/src/executors/architect.yaml b/src/executors/architect.yaml index 1b26da19..cf525bf5 100644 --- a/src/executors/architect.yaml +++ b/src/executors/architect.yaml @@ -1,3 +1,3 @@ docker: - entrypoint: /bin/bash - image: quay.io/giantswarm/architect:6.14.0 + image: gsoci.azurecr.io/giantswarm/architect:6.14.0 diff --git a/src/executors/gitleaks.yaml b/src/executors/gitleaks.yaml index 77320030..d387eba7 100644 --- a/src/executors/gitleaks.yaml +++ b/src/executors/gitleaks.yaml @@ -1,3 +1,3 @@ docker: - - image: quay.io/giantswarm/gitleaks:v3.3.0 + - image: gsoci.azurecr.io/giantswarm/gitleaks:v3.3.0 entrypoint: /bin/bash diff --git a/src/jobs/push-to-docker.yaml b/src/jobs/push-to-docker.yaml index e8022844..d72500fd 100644 --- a/src/jobs/push-to-docker.yaml +++ b/src/jobs/push-to-docker.yaml @@ -1,6 +1,6 @@ parameters: image: - description: 'Name of the docker image, without tag. e.g. "quay.io/my-org/my-repo".' + description: 'Name of the docker image, without tag. e.g. "gsoci.azurecr.io/my-org/my-repo".' type: "string" password_envar: default: "ARCHITECT_DOCKER_REGISTRY_PASSWORD" diff --git a/src/jobs/run-tests-with-ats.yaml b/src/jobs/run-tests-with-ats.yaml index e74c848d..15bac3f7 100644 --- a/src/jobs/run-tests-with-ats.yaml +++ b/src/jobs/run-tests-with-ats.yaml @@ -8,7 +8,7 @@ parameters: type: string default: "v0.5.0" app-test-suite_container_tag: - description: "Container tag of app-test-suite to use (check quay.io/giantswarm/app-test-suite)" + description: "Container tag of app-test-suite to use (check gsoci.azurecr.io/giantswarm/app-test-suite)" type: string default: "0.5.0" additional_app-test-suite_flags: