feat: update all CI templates to pull common-ci-tasks images from $CI_REGISTRY...

feat: update all CI templates to pull common-ci-tasks images from $CI_REGISTRY instead of registry.gitlab.com

.gitlab-ci-other-versions.yml

@@ -8,6 +8,7 @@ variables:
   GL_COMMON_CI_TASKS_YAMLLINT_VERSION: "1.35.1"  # datasource=github-tags depName=adrienverge/yamllint
   GL_COMMON_CI_TASKS_HCLFMT_VERSION: "2.22.0"  # datasource=github-tags depName=hashicorp/hcl
   GL_COMMON_CI_TASKS_KANIKO_VERSION: "1.23.2"  # datasource=github-releases depName=GoogleContainerTools/kaniko
+  GL_COMMON_CI_TASKS_JQ_VERSION: "1.7.1"  # datasource=github-releases depName=jqlang/jq
   # These are versions used in the Renovate runner image
   GL_COMMON_RENOVATE_GIT_VERSION: "2.47.0"  # datasource=github-tags depName=git/git

asdf-tool-versions.yml

@@ -6,7 +6,7 @@ spec:
 validate_mise_tool_versions:
   stage: $[[ inputs.stage ]]
   image:
-    name: registry.gitlab.com/gitlab-com/gl-infra/common-ci-tasks/mise:v2.51.0
+    name: ${CI_REGISTRY}/gitlab-com/gl-infra/common-ci-tasks/mise:v2.51.0
     entrypoint: [""]
   needs: []
   variables:

container-diff.yml

@@ -21,7 +21,7 @@ $[[ inputs.job_name ]]:
   needs:
     - $[[ inputs.needs ]]
   image:
-    name: registry.gitlab.com/gitlab-com/gl-infra/common-ci-tasks-images/container-diff:latest
+    name: ${CI_REGISTRY}/gitlab-com/gl-infra/common-ci-tasks-images/container-diff:latest
     entrypoint: [""]
   script:
     - mkdir -p /cache

docker.yml

@@ -5,7 +5,7 @@ include:
 .docker_buildx_base:
   image:
-    name: registry.gitlab.com/gitlab-com/gl-infra/common-ci-tasks-images/docker:latest
+    name: ${CI_REGISTRY}/gitlab-com/gl-infra/common-ci-tasks-images/docker:latest
     entrypoint: [""]
   retry: 2
   services:

goreleaser.yml

@@ -61,7 +61,7 @@ goreleaser_validate:
   extends:
     - .goreleaser_validate_base
   image:
-    name: registry.gitlab.com/gitlab-com/gl-infra/common-ci-tasks-images/goreleaser:${GL_ASDF_GORELEASER_VERSION}
+    name: ${CI_REGISTRY}/gitlab-com/gl-infra/common-ci-tasks-images/goreleaser:${GL_ASDF_GORELEASER_VERSION}
     entrypoint: [""]
   rules:
     - if: '($CI_PIPELINE_SOURCE == "merge_request_event" || $CI_PIPELINE_SOURCE == "parent_pipeline" || ($CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH && $CI_PIPELINE_SOURCE != "schedule"))'
@@ -212,7 +212,7 @@ goreleaser_build:
       exists:
         - .goreleaser.yml
       variables:
-        GL_COMMON_CI_TASKS_GORELEASER_IMAGE: registry.gitlab.com/gitlab-com/gl-infra/common-ci-tasks-images/goreleaser-golang-fips:${GL_ASDF_GOLANG_VERSION}-${GL_ASDF_GORELEASER_VERSION}
+        GL_COMMON_CI_TASKS_GORELEASER_IMAGE: ${CI_REGISTRY}/gitlab-com/gl-infra/common-ci-tasks-images/goreleaser-golang-fips:${GL_ASDF_GOLANG_VERSION}-${GL_ASDF_GORELEASER_VERSION}
         GL_COMMON_CI_TASKS_GORELEASER_ARGUMENTS: release --snapshot --clean --skip=publish ${GORELEASER_BUILD_EXTRA_ARGS:-}
     # FIPS, normal build
@@ -220,7 +220,7 @@ goreleaser_build:
       exists:
         - .goreleaser.yml
       variables:
-        GL_COMMON_CI_TASKS_GORELEASER_IMAGE: registry.gitlab.com/gitlab-com/gl-infra/common-ci-tasks-images/goreleaser-golang-fips:${GL_ASDF_GOLANG_VERSION}-${GL_ASDF_GORELEASER_VERSION}
+        GL_COMMON_CI_TASKS_GORELEASER_IMAGE: ${CI_REGISTRY}/gitlab-com/gl-infra/common-ci-tasks-images/goreleaser-golang-fips:${GL_ASDF_GOLANG_VERSION}-${GL_ASDF_GORELEASER_VERSION}
         GL_COMMON_CI_TASKS_GORELEASER_ARGUMENTS: build --snapshot --clean ${GORELEASER_BUILD_EXTRA_ARGS:-}
     # Non-FIPS, goreleaser-mock-release label set
@@ -228,14 +228,14 @@ goreleaser_build:
       exists:
         - .goreleaser.yml
       variables:
-        GL_COMMON_CI_TASKS_GORELEASER_IMAGE: registry.gitlab.com/gitlab-com/gl-infra/common-ci-tasks-images/goreleaser:${GL_ASDF_GORELEASER_VERSION}
+        GL_COMMON_CI_TASKS_GORELEASER_IMAGE: ${CI_REGISTRY}/gitlab-com/gl-infra/common-ci-tasks-images/goreleaser:${GL_ASDF_GORELEASER_VERSION}
         GL_COMMON_CI_TASKS_GORELEASER_ARGUMENTS: release --snapshot --clean --skip=publish ${GORELEASER_BUILD_EXTRA_ARGS:-}
     # Finally, the default
     - exists:
         - .goreleaser.yml
       variables:
-        GL_COMMON_CI_TASKS_GORELEASER_IMAGE: registry.gitlab.com/gitlab-com/gl-infra/common-ci-tasks-images/goreleaser:${GL_ASDF_GORELEASER_VERSION}
+        GL_COMMON_CI_TASKS_GORELEASER_IMAGE: ${CI_REGISTRY}/gitlab-com/gl-infra/common-ci-tasks-images/goreleaser:${GL_ASDF_GORELEASER_VERSION}
         GL_COMMON_CI_TASKS_GORELEASER_ARGUMENTS: build --snapshot --clean --single-target ${GORELEASER_BUILD_EXTRA_ARGS:-}
 #################################################################
@@ -260,14 +260,14 @@ goreleaser:
         - .goreleaser.yml
       variables:
         GL_COMMON_CI_TASKS_GORELEASER_MESSAGE: Running go-releaser release in FIPS mode
-        GL_COMMON_CI_TASKS_GORELEASER_IMAGE: registry.gitlab.com/gitlab-com/gl-infra/common-ci-tasks-images/goreleaser-golang-fips:${GL_ASDF_GOLANG_VERSION}-${GL_ASDF_GORELEASER_VERSION}
+        GL_COMMON_CI_TASKS_GORELEASER_IMAGE: ${CI_REGISTRY}/gitlab-com/gl-infra/common-ci-tasks-images/goreleaser-golang-fips:${GL_ASDF_GOLANG_VERSION}-${GL_ASDF_GORELEASER_VERSION}
     # Non-FIPS
     - exists:
         - .goreleaser.yml
       variables:
         GL_COMMON_CI_TASKS_GORELEASER_MESSAGE: Running go-releaser release in non-FIPS mode
-        GL_COMMON_CI_TASKS_GORELEASER_IMAGE: registry.gitlab.com/gitlab-com/gl-infra/common-ci-tasks-images/goreleaser:${GL_ASDF_GORELEASER_VERSION}
+        GL_COMMON_CI_TASKS_GORELEASER_IMAGE: ${CI_REGISTRY}/gitlab-com/gl-infra/common-ci-tasks-images/goreleaser:${GL_ASDF_GORELEASER_VERSION}
 #################################################################
 #  Deprecated Jobs, to be removed

hclfmt.yml

@@ -11,7 +11,7 @@ hclfmt:
   stage: $[[ inputs.stage ]]
   needs: []
   image:
-    name: registry.gitlab.com/gitlab-com/gl-infra/common-ci-tasks-images/hclfmt:${GL_COMMON_CI_TASKS_HCLFMT_VERSION}
+    name: ${CI_REGISTRY}/gitlab-com/gl-infra/common-ci-tasks-images/hclfmt:${GL_COMMON_CI_TASKS_HCLFMT_VERSION}
     entrypoint: [""]
   script:
     - find . -name '*.hcl'|xargs hclfmt -w -require-no-change

jsonfmt.yml

@@ -8,7 +8,7 @@ jsonfmt:
   stage: $[[ inputs.stage ]]
   needs: []
   image:
-    name: registry.gitlab.com/gitlab-com/gl-infra/common-ci-tasks-images/jq:1.6
+    name: ${CI_REGISTRY}/gitlab-com/gl-infra/common-ci-tasks-images/jq:${GL_COMMON_CI_TASKS_JQ_VERSION}
     entrypoint: [""]
   script:
     - rm -rf "${CI_PROJECT_DIR}/jsonfmt-reports/"

renovate-bot.yml

@@ -35,7 +35,7 @@ include:
 .base_renovate_bot:
   image:
-    name: registry.gitlab.com/gitlab-com/gl-infra/common-ci-tasks/renovate:v2.51.0
+    name: ${CI_REGISTRY}/gitlab-com/gl-infra/common-ci-tasks/renovate:v2.51.0
     entrypoint: [""]
   stage: $[[ inputs.renovate_bot_stage ]]
   variables:

scripts/prepare-release.sh

@@ -21,7 +21,7 @@ inline_sed() {
 for i in *.md templates/*.md *.yml templates/*.yml docs/*.md; do
   inline_sed -E 's/(re[fv]): v[[:digit:]]+\.[[:digit:]]+(\.[[:digit:]]+)? +# *renovate:managed/\1: v'"$next_version"'  # renovate:managed/' "$i"
-  inline_sed -E 's#registry.gitlab.com/gitlab-com/gl-infra/common-ci-tasks/([[:alpha:]]+):v[[:digit:]]+\.[[:digit:]]+(\.[[:digit:]]+)?#registry.gitlab.com/gitlab-com/gl-infra/common-ci-tasks/\1:v'"$next_version"'#' "$i"
+  inline_sed -E 's#(registry\.gitlab\.com|\$\{?CI_REGISTRY\}?)/gitlab-com/gl-infra/common-ci-tasks/([[:alpha:]]+):v[[:digit:]]+\.[[:digit:]]+(\.[[:digit:]]+)?#\1/gitlab-com/gl-infra/common-ci-tasks/\2:v'"$next_version"'#' "$i"
 done
 # Update pre-commit config

semantic-release.yml

@@ -16,7 +16,7 @@ spec:
 .semantic_release_base:
   stage: $[[ inputs.stage ]]
   image:
-    name: registry.gitlab.com/gitlab-com/gl-infra/common-ci-tasks-images/semantic-release:latest
+    name: ${CI_REGISTRY}/gitlab-com/gl-infra/common-ci-tasks-images/semantic-release:latest
     entrypoint: [""]
   variables:
     GITLAB_URL: $CI_SERVER_URL
@@ -80,7 +80,7 @@ semantic_release_check:
   stage: $[[ inputs.validate_stage ]]
   needs: []
   image:
-    name: registry.gitlab.com/gitlab-com/gl-infra/common-ci-tasks-images/semantic-release:latest
+    name: ${CI_REGISTRY}/gitlab-com/gl-infra/common-ci-tasks-images/semantic-release:latest
     entrypoint: [""]
   variables:
     GITLAB_URL: $CI_SERVER_URL

shellcheck.yml

@@ -7,7 +7,7 @@ spec:
 shellcheck:
   stage: $[[ inputs.stage ]]
   needs: []
-  image: registry.gitlab.com/gitlab-com/gl-infra/common-ci-tasks-images/shellcheck:${GL_ASDF_SHELLCHECK_VERSION}
+  image: ${CI_REGISTRY}/gitlab-com/gl-infra/common-ci-tasks-images/shellcheck:${GL_ASDF_SHELLCHECK_VERSION}
   script:
     - shfmt --find . |
       xargs -I {} echo "./{}" |

shfmt.yml

@@ -8,7 +8,7 @@ shfmt:
   stage: $[[ inputs.stage ]]
   needs: []
   image:
-    name: registry.gitlab.com/gitlab-com/gl-infra/common-ci-tasks-images/shfmt:${GL_ASDF_SHFMT_VERSION}
+    name: ${CI_REGISTRY}/gitlab-com/gl-infra/common-ci-tasks-images/shfmt:${GL_ASDF_SHFMT_VERSION}
     entrypoint: [""]
   script:
     # Find all *.sh files, and any executable script files

terraform-module-publish.yml

@@ -26,7 +26,7 @@ spec:
 ---
 publish-terraform-module:
-  image: registry.gitlab.com/gitlab-com/gl-infra/common-ci-tasks-images/terraform-module-publish:latest
+  image: ${CI_REGISTRY}/gitlab-com/gl-infra/common-ci-tasks-images/terraform-module-publish:latest
   stage: release
   variables:
     TERRAFORM_MODULE_DIR: $[[ inputs.module_dir | expand_vars ]]

tflint.yml

@@ -8,7 +8,7 @@ tflint:
   stage: $[[ inputs.stage ]]
   needs: []
   image:
-    name: registry.gitlab.com/gitlab-com/gl-infra/common-ci-tasks-images/tflint:${GL_ASDF_TFLINT_VERSION}
+    name: ${CI_REGISTRY}/gitlab-com/gl-infra/common-ci-tasks-images/tflint:${GL_ASDF_TFLINT_VERSION}
     entrypoint: [""]
   script:
     - rm -rf "tflint-reports/"

vendir.yml

@@ -12,7 +12,7 @@ vendir_validate:
   stage: $[[ inputs.stage ]]
   needs: []
   image:
-    name: registry.gitlab.com/gitlab-com/gl-infra/common-ci-tasks-images/vendir:latest
+    name: ${CI_REGISTRY}/gitlab-com/gl-infra/common-ci-tasks-images/vendir:latest
     entrypoint: [""]
   script:
     - |

yamlfmt.yml

@@ -8,7 +8,7 @@ yamlfmt:
   stage: $[[ inputs.stage ]]
   needs: []
   image:
-    name: registry.gitlab.com/gitlab-com/gl-infra/common-ci-tasks-images/yamlfmt:${GL_ASDF_YAMLFMT_VERSION}
+    name: ${CI_REGISTRY}/gitlab-com/gl-infra/common-ci-tasks-images/yamlfmt:${GL_ASDF_YAMLFMT_VERSION}
     entrypoint: [""]
   script:
     - |