UPSTREAM: <carry>: Do not ignore parameters for ocp tests

This commit fixes the issue that provided parameters for the ocp e2e test targets would have been ignored. For example in case the IMAGE_BUILDER was set to docker, this would have been ignored and is fixed now. Signed-off-by: Christoph Stäbler <cstabler@redhat.com> (cherry picked from commit 322cf1f) (cherry picked from commit 4b330ef) (cherry picked from commit bcb43a6) (cherry picked from commit 8b9e18c) (cherry picked from commit 2f12709) (cherry picked from commit ea1dff5) (cherry picked from commit f53e9ce) Signed-off-by: Douglas Schilling Landgraf <dougsland@redhat.com>
openshift-networking · Feb 9, 2023 · 5d4b8bb · 5d4b8bb
1 parent 5524650
commit 5d4b8bb
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/hack/ocp-e2e-tests-handler.sh b/hack/ocp-e2e-tests-handler.sh
@@ -11,9 +11,9 @@
 set -ex
 
 export KUBEVIRT_PROVIDER=external
-export IMAGE_BUILDER=podman
-export DEV_IMAGE_REGISTRY=quay.io
-export KUBEVIRTCI_RUNTIME=podman
+export IMAGE_BUILDER="${IMAGE_BUILDER:-podman}"
+export DEV_IMAGE_REGISTRY="${DEV_IMAGE_REGISTRY:-quay.io}"
+export KUBEVIRTCI_RUNTIME="${KUBEVIRTCI_RUNTIME:-podman}"
 export PRIMARY_NIC=enp2s0
 export FIRST_SECONDARY_NIC=enp3s0
 export SECOND_SECONDARY_NIC=enp4s0

diff --git a/hack/ocp-e2e-tests-operator.sh b/hack/ocp-e2e-tests-operator.sh
@@ -11,9 +11,9 @@
 set -ex
 
 export KUBEVIRT_PROVIDER=external
-export IMAGE_BUILDER=podman
-export DEV_IMAGE_REGISTRY=quay.io
-export KUBEVIRTCI_RUNTIME=podman
+export IMAGE_BUILDER="${IMAGE_BUILDER:-podman}"
+export DEV_IMAGE_REGISTRY="${DEV_IMAGE_REGISTRY:-quay.io}"
+export KUBEVIRTCI_RUNTIME="${KUBEVIRTCI_RUNTIME:-podman}"
 
 make cluster-sync-operator
 make test-e2e-operator