From e57b24432ef7fb25881da30049596466bec10421 Mon Sep 17 00:00:00 2001 From: Andrey Lebedev Date: Wed, 21 Dec 2022 19:19:49 +0100 Subject: [PATCH] albo: mirror all tags using wildcard --- ci-operator/jobs/infra-image-mirroring.yaml | 10 ---------- .../mapping_aws_load_balancer_operator | 2 +- .../mapping_aws_load_balancer_operator_0_2 | 1 - 3 files changed, 1 insertion(+), 12 deletions(-) delete mode 100644 core-services/image-mirroring/aws-load-balancer-operator/mapping_aws_load_balancer_operator_0_2 diff --git a/ci-operator/jobs/infra-image-mirroring.yaml b/ci-operator/jobs/infra-image-mirroring.yaml index 9c3064976746..4230aebac320 100644 --- 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 index b4fb2664f97f..d06e1c225984 100644 --- 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/core-services/image-mirroring/aws-load-balancer-operator/mapping_aws_load_balancer_operator_0_2 b/core-services/image-mirroring/aws-load-balancer-operator/mapping_aws_load_balancer_operator_0_2 deleted file mode 100644 index f763e5f72afb..000000000000 --- a/core-services/image-mirroring/aws-load-balancer-operator/mapping_aws_load_balancer_operator_0_2 +++ /dev/null @@ -1 +0,0 @@ -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