albo: mirror all tags using wildcard

openshift · Dec 21, 2022 · e57b244 · e57b244
1 parent 2f8cdfa
commit e57b244
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 12 deletions.
diff --git a/ci-operator/jobs/infra-image-mirroring.yaml b/ci-operator/jobs/infra-image-mirroring.yaml
@@ -1379,16 +1379,6 @@ 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:aws-load-balancer-controller quay.io/aws-load-balancer-operator/aws-load-balancer-controller:latest
+registry.ci.openshift.org/aws-load-balancer-operator/aws-load-balancer-controller:* quay.io/aws-load-balancer-operator/aws-load-balancer-controller
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
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		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
		registry.ci.openshift.org/aws-load-balancer-operator/aws-load-balancer-controller:* quay.io/aws-load-balancer-operator/aws-load-balancer-controller