diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index dceb7c709e93ddd892f7b37bfc7020ae2969406e_LmdpdGxhYi1jaS55bWw=..41e78a1df096857c80bd2c28c84f0f4d3598e727_LmdpdGxhYi1jaS55bWw= 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -187,7 +187,7 @@ issue-bot: stage: notification_fail - image: registry.gitlab.com/gitlab-org/distribution/issue-bot:latest + image: "${CI_REGISTRY}/${GITLAB_NAMESPACE}/distribution/issue-bot:latest" script: /issue-bot rules: # Not needed in non-protected (feature) branches diff --git a/doc/development/ci-variables.md b/doc/development/ci-variables.md index dceb7c709e93ddd892f7b37bfc7020ae2969406e_ZG9jL2RldmVsb3BtZW50L2NpLXZhcmlhYmxlcy5tZA==..41e78a1df096857c80bd2c28c84f0f4d3598e727_ZG9jL2RldmVsb3BtZW50L2NpLXZhcmlhYmxlcy5tZA== 100644 --- a/doc/development/ci-variables.md +++ b/doc/development/ci-variables.md @@ -108,6 +108,7 @@ | `GITLAB_COM_PKGS_RELEASE_BUCKET` | GCS bucket where release packages are pushed. | | `GITLAB_COM_PKGS_BUILDS_BUCKET` | GCS bucket where regular branch packages are pushed. | | `GITLAB_COM_PKGS_SA_FILE` | Service account key used for pushing release packages for SaaS deployments, it must have write access to the pkgs bucket. | +| `GITLAB_NAMESPACE` | Used to override image URLs in the Dev instance, since the top-level name there diverges from `gitlab-org` to `gitlab`. | ## Unknown/outdated variables diff --git a/gitlab-ci-config/variables.yml b/gitlab-ci-config/variables.yml index dceb7c709e93ddd892f7b37bfc7020ae2969406e_Z2l0bGFiLWNpLWNvbmZpZy92YXJpYWJsZXMueW1s..41e78a1df096857c80bd2c28c84f0f4d3598e727_Z2l0bGFiLWNpLWNvbmZpZy92YXJpYWJsZXMueW1s 100644 --- a/gitlab-ci-config/variables.yml +++ b/gitlab-ci-config/variables.yml @@ -30,6 +30,7 @@ ISSUE_BOT_LABELS_EXTRA: "group::distribution" BUNDLER_VERSION: "2.6.5" GET_GEO_TAG: "0.7.4" + GITLAB_NAMESPACE: "gitlab-org" CANONICAL_PROJECT_PATH: 'gitlab-org/omnibus-gitlab' SECURITY_PROJECT_PATH: 'gitlab-org/security/omnibus-gitlab' DEV_PROJECT_PATH: 'gitlab/omnibus-gitlab'