From 6376ec33c68759957645eaab3a875665bba348a4 Mon Sep 17 00:00:00 2001
From: Arvid Jakobsson <arvid.jakobsson@nomadic-labs.com>
Date: Thu, 25 Apr 2024 15:34:22 +0200
Subject: [PATCH] CI: use [GCP_PUBLIC_REGISTRY] to locate the opam-repo images

---
 .gitlab-ci.yml | 2 +-
 ci/bin/main.ml | 9 ++++++++-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 25db8bb9beac..ffa10c40a34a 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -64,7 +64,7 @@ default:
 
 variables:
   build_deps_image_version: 07a7c6694aeb8355724a9fad11c3729143523cd9
-  build_deps_image_name: ${GCP_REGISTRY}/tezos/opam-repository
+  build_deps_image_name: ${GCP_PUBLIC_REGISTRY}/tezos/opam-repository
   rust_toolchain_image_name: ${GCP_REGISTRY}/${CI_PROJECT_PATH}/rust-toolchain
   client_libs_dependencies_image_name: ${GCP_REGISTRY}/${CI_PROJECT_PATH}/client-libs-dependencies
   GIT_STRATEGY: fetch
diff --git a/ci/bin/main.ml b/ci/bin/main.ml
index 892a2016ae30..3358867c8fea 100644
--- a/ci/bin/main.ml
+++ b/ci/bin/main.ml
@@ -25,13 +25,20 @@ let variables : variables =
   [
     (* /!\ This value MUST be the same as `opam_repository_tag` in `scripts/version.sh` *)
     ("build_deps_image_version", Common.build_deps_image_version);
+    (* /!\ [GCP_PUBLIC_REGISTRY] contains the name of the PUBLIC
+       registry to and from which Docker images are produced and
+       consumed. This variable is defined at the tezos-group level and
+       always contains the path to the unprotected Docker registry
+       (unlike [GCP_REGISTRY], see below). This is used to locate the
+       [tezos/opam-repository] images, which are always pushed to the
+       public repository. *)
+    ("build_deps_image_name", "${GCP_PUBLIC_REGISTRY}/tezos/opam-repository");
     (* /!\ GCP_REGISTRY is the variable containing the name of the registry to and from
        which docker images are produced and consumed. This variable is defined at tezos
        level with the value unprotected registry and at tezos/tezos level in its protected
        version. This mechanism allows pipelines from a protected tezos/tezos branch to
        read the protected variable from tezos/tezos and for others to not have access to
        the variable tezos/tezos but tezos. *)
-    ("build_deps_image_name", "${GCP_REGISTRY}/tezos/opam-repository");
     ( "rust_toolchain_image_name",
       "${GCP_REGISTRY}/${CI_PROJECT_PATH}/rust-toolchain" );
     ( "client_libs_dependencies_image_name",
-- 
GitLab