From 6b63f06cfe92cf7663985e3080c05482f8ba5ea5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christoph=20St=C3=A4bler?= Date: Wed, 9 Feb 2022 15:14:20 +0100 Subject: [PATCH] UPSTREAM: : Do not ignore parameters for ocp tests MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 (cherry picked from commit 322cf1f587f66b89cefa24a8c8b6738b5375aac1) (cherry picked from commit 4b330efd221433a0a6f066b79dcf283d9e992274) (cherry picked from commit bcb43a63d587051fbfd9bdaa5e3e1ff072b8582c) (cherry picked from commit 8b9e18cfea98c8d50c5e8aa9e9fe03b2e555f095) (cherry picked from commit 2f127099bf5d05bfae228510d02cef60040ca670) (cherry picked from commit ea1dff509fd8870845646144b31dad4e16d407b0) (cherry picked from commit f53e9ceabb989fa4cca1901df35567083d994f13) Signed-off-by: Douglas Schilling Landgraf (cherry picked from commit 5d4b8bb87b8f48e342b294d08538b7d81e58e46d) Signed-off-by: Douglas Schilling Landgraf --- hack/ocp-e2e-tests-handler.sh | 6 +++--- hack/ocp-e2e-tests-operator.sh | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/hack/ocp-e2e-tests-handler.sh b/hack/ocp-e2e-tests-handler.sh index c84b09df7..79ba31aea 100755 --- 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 index ff82b4b38..faeaa3900 100755 --- 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