Albo revert tag by commit (#34997)

* Revert "albo: mirror all tags using wildcard" This reverts commit e57b244. * aws-load-balancer-controller: remove tag_by_commit as not used
openshift · Dec 22, 2022 · 0a87351 · 0a87351
1 parent 830fe50
commit 0a87351
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 3 deletions.
diff --git a/...g/openshift/aws-load-balancer-controller/openshift-aws-load-balancer-controller-main.yaml b/...g/openshift/aws-load-balancer-controller/openshift-aws-load-balancer-controller-main.yaml
@@ -22,7 +22,6 @@ images:
 promotion:
   name: aws-load-balancer-controller
   namespace: aws-load-balancer-operator
-  tag_by_commit: true
 releases:
   initial:
     integration:

diff --git a/...oad-balancer-controller/openshift-aws-load-balancer-controller-openshift-release-0.2.yaml b/...oad-balancer-controller/openshift-aws-load-balancer-controller-openshift-release-0.2.yaml
@@ -22,7 +22,6 @@ images:
 promotion:
   namespace: aws-load-balancer-operator
   tag: "0.2"
-  tag_by_commit: true
 releases:
   initial:
     integration:

diff --git a/ci-operator/jobs/infra-image-mirroring.yaml b/ci-operator/jobs/infra-image-mirroring.yaml
@@ -1379,6 +1379,16 @@ periodics:
         set -o errexit
         failures=0
         for mapping in /etc/imagemirror/mapping_aws_load_balancer_operator*; do
+          ciimage=$(cat ${mapping} | cut -d ' ' -f1)
+          quayimage=$(cat ${mapping} | cut -d ' ' -f2)
+          digest=$(oc image info ${ciimage} | grep 'Digest:' | tr -d ' ' | cut -d ':' -f2-)
+          shorttag=$(echo ${digest} | cut -d: -f2 | grep -oP '^.{12}')
+          quayimageshort=${quayimage/:*/:${shorttag}}
+          echo "Running: oc image mirror --keep-manifest-list ${ciimage}=${quayimageshort} --skip-multiple-scopes"
+          if ! oc image mirror --keep-manifest-list ${ciimage}=${quayimageshort} --skip-multiple-scopes; then
+            echo "ERROR: Failed to mirror images from $mapping to ${quayimageshort}"
+            failures=$((failures+1))
+          fi
           echo "Running: oc image mirror --keep-manifest-list -f=$mapping --skip-multiple-scopes"
           if ! oc image mirror --keep-manifest-list -f="$mapping" --skip-multiple-scopes; then
             echo "ERROR: Failed to mirror images from $mapping"

diff --git a/core-services/image-mirroring/aws-load-balancer-operator/mapping_aws_load_balancer_operator b/core-services/image-mirroring/aws-load-balancer-operator/mapping_aws_load_balancer_operator
@@ -1 +1 @@
-registry.ci.openshift.org/aws-load-balancer-operator/aws-load-balancer-controller:* quay.io/aws-load-balancer-operator/aws-load-balancer-controller
+registry.ci.openshift.org/aws-load-balancer-operator/aws-load-balancer-controller:aws-load-balancer-controller quay.io/aws-load-balancer-operator/aws-load-balancer-controller:latest
diff --git a/...ervices/image-mirroring/aws-load-balancer-operator/mapping_aws_load_balancer_operator_0_2 b/...ervices/image-mirroring/aws-load-balancer-operator/mapping_aws_load_balancer_operator_0_2
@@ -0,0 +1 @@
+registry.ci.openshift.org/aws-load-balancer-operator/aws-load-balancer-controller:0.2 quay.io/aws-load-balancer-operator/aws-load-balancer-controller:0.2
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		registry.ci.openshift.org/aws-load-balancer-operator/aws-load-balancer-controller:* quay.io/aws-load-balancer-operator/aws-load-balancer-controller
		registry.ci.openshift.org/aws-load-balancer-operator/aws-load-balancer-controller:aws-load-balancer-controller quay.io/aws-load-balancer-operator/aws-load-balancer-controller:latest
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		registry.ci.openshift.org/aws-load-balancer-operator/aws-load-balancer-controller:0.2 quay.io/aws-load-balancer-operator/aws-load-balancer-controller:0.2