switch GCR -> Artifact-Registry

.ci/pipeline_definitions

@@ -21,7 +21,7 @@ glci:
           - '../ls-manifests'
           - '--print'
           - 'versions-and-commits'
-          image: 'eu.gcr.io/gardener-project/glci/job-image:0.1.0'
+          image: europe-docker.pkg.dev/gardener-project/releases/cicd/glci-job-image:0.1.0
     manual-release:
       repo:
         trigger: false
@@ -40,15 +40,15 @@ glci:
           - '../run_publish_release_set.sh'
           - '--version-name'
           - 'default'
-          image: 'eu.gcr.io/gardener-project/glci/job-image:0.1.0'
+          image: europe-docker.pkg.dev/gardener-project/releases/cicd/glci-job-image:0.1.0
     update-job-image:
       repo:
         trigger: false
       traits:
         publish:
           dockerimages:
             job-image:
-              image: 'eu.gcr.io/gardener-project/glci/job-image'
+              image: europe-docker.pkg.dev/gardener-project/releases/cicd/glci-job-image
               dockerfile: 'Dockerfile'
               tag_as_latest: true
         version:
@@ -58,3 +58,4 @@ glci:
           release_on_github: false
         component_descriptor:
           component_name: 'github.com/gardenlinux/glci/utils'
+          ocm_repository: europe-docker.pkg.dev/gardener-project/releases

.cicd-cli.py

@@ -975,8 +975,7 @@ def cleanup_release_set():
     cfg_factory = ctx.cfg_factory()
 
     if not parsed.ocm_repo:
-        ocm_cfg = cfg_factory.ctx_repository(cfg.ocm.component_repository_cfg_name)
-        ocm_repo_base_url = ocm_cfg.base_url()
+        ocm_repo_base_url = cfg_factory.ctx_repository(cfg.ocm.ocm_repository)
     else:
         ocm_repo_base_url = parsed.ocm_repo
 

Dockerfile

@@ -1,4 +1,4 @@
-FROM eu.gcr.io/gardener-project/cc/job-image:1.1914.0
+FROM europe-docker.pkg.dev/gardener-project/releases/cicd/job-image:1.2286.0
 
 RUN pip3 install --upgrade \
   'azure-common==1.1.28' \

component_descriptor.py

@@ -53,8 +53,7 @@ def component_descriptor(
     release_manifests: list[glci.model.OnlineReleaseManifest],
     cfg_factory,
 ) -> cm.ComponentDescriptor:
-    ocm_cfg = cfg_factory.ctx_repository(publishing_cfg.ocm.component_repository_cfg_name)
-    ocm_repo_base_url = ocm_cfg.base_url()
+    ocm_repository = cfg_factory.ctx_repository(publishing_cfg.ocm.ocm_repository)
 
     s3_session = ccc.aws.session(publishing_cfg.origin_buildresult_bucket.aws_cfg_name)
     s3_client = s3_session.client('s3')
@@ -66,7 +65,7 @@ def component_descriptor(
             version=version,
             repositoryContexts=[
                 cm.OciRepositoryContext(
-                    baseUrl=ocm_repo_base_url,
+                    baseUrl=ocm_repository,
                     type=cm.AccessType.OCI_REGISTRY,
                 )
             ],

glci/model.py

@@ -791,7 +791,7 @@ class ImageTagConfiguration:
 
 @dataclasses.dataclass
 class OcmCfg:
-    component_repository_cfg_name: str
+    ocm_repository: str
     overwrite_component_descriptor: typing.Optional[bool]
 
 @dataclasses.dataclass

publishing-cfg.yaml

@@ -15,7 +15,7 @@
       aws_cfg_name: 'gardenlinux-cn'
       platforms: ['aws']
   ocm:
-    component_repository_cfg_name: 'gardener-dev'
+    ocm_repository: europe-docker.pkg.dev/gardener-project/releases
   targets:
     - platform: 'ali'
       oss_bucket_name: 'gardenlinux-community'
@@ -76,7 +76,7 @@
       bucket_name: 'gardenlinux-github-releases'
       aws_cfg_name: 'gardenlinux-integration-test'
   ocm:
-    component_repository_cfg_name: 'gardenlinux-test'
+    ocm_repository: europe-docker.pkg.dev/sap-se-gcp-gardenlinux/tests
     overwrite_component_descriptor: true
   targets:
     - platform: 'aws'