From da6df3b4d67e4827fd0591d47e2d8a74ba661ed6 Mon Sep 17 00:00:00 2001 From: Yury Kulazhenkov Date: Fri, 19 Apr 2024 13:48:43 +0300 Subject: [PATCH] Explicitly set REGISTRY env in ovs-cni jobs This change is required because default registry in the Makefile in the ovs-cni repo was to ghcr.io/k8snetworkplumbingwg. Signed-off-by: Yury Kulazhenkov --- .../k8snetworkplumbingwg/ovs-cni/ovs-cni-postsubmits.yaml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/github/ci/prow-deploy/files/jobs/k8snetworkplumbingwg/ovs-cni/ovs-cni-postsubmits.yaml b/github/ci/prow-deploy/files/jobs/k8snetworkplumbingwg/ovs-cni/ovs-cni-postsubmits.yaml index bdae6be5d2..4dfdd6551a 100644 --- a/github/ci/prow-deploy/files/jobs/k8snetworkplumbingwg/ovs-cni/ovs-cni-postsubmits.yaml +++ b/github/ci/prow-deploy/files/jobs/k8snetworkplumbingwg/ovs-cni/ovs-cni-postsubmits.yaml @@ -18,8 +18,10 @@ postsubmits: command: - "/usr/local/bin/runner.sh" - "/bin/bash" - - "-c" - - "cat $QUAY_PASSWORD | docker login --username $(cat $QUAY_USER) --password-stdin=true quay.io && make docker-build docker-push" + - "-ce" + - | + cat $QUAY_PASSWORD | docker login --username $(cat $QUAY_USER) --password-stdin=true quay.io + make REGISTRY=quay.io/kubevirt docker-build docker-push # docker-in-docker needs privileged mode securityContext: privileged: true @@ -46,7 +48,7 @@ postsubmits: cat $QUAY_PASSWORD | docker login --username $(cat $QUAY_USER) --password-stdin=true quay.io # Only push images on tags COMMIT_TAG=$(git tag --points-at HEAD | head -1) - [ -z "$COMMIT_TAG" ] || make docker-build docker-push IMAGE_TAG=$COMMIT_TAG + [ -z "$COMMIT_TAG" ] || make REGISTRY=quay.io/kubevirt IMAGE_TAG=$COMMIT_TAG docker-build docker-push # docker-in-docker needs privileged mode securityContext: privileged: true