From 72f718ef86fa799126458a1929056df4a86a03e6 Mon Sep 17 00:00:00 2001 From: Or Shoval Date: Thu, 26 Sep 2024 09:14:09 +0300 Subject: [PATCH 1/2] cluster: Pin kubevirtci tag Pin tag until KUBVIRT_WITH_CNAO_SKIP_CONFIG is introduced again (it was dropped by mistake). Signed-off-by: Or Shoval --- cluster/cluster.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cluster/cluster.sh b/cluster/cluster.sh index 163182c1..cc26c05e 100755 --- a/cluster/cluster.sh +++ b/cluster/cluster.sh @@ -1,7 +1,7 @@ #!/usr/bin/env bash export KUBEVIRT_PROVIDER="${KUBEVIRT_PROVIDER:-k8s-1.28}" -export KUBEVIRTCI_TAG=$(curl -L -Ss https://storage.googleapis.com/kubevirt-prow/release/kubevirt/kubevirtci/latest) +export KUBEVIRTCI_TAG=2408151028-a0ad3359 export KUBEVIRTCI_RUNTIME=${OCI_BIN:-docker} KUBEVIRTCI_REPO='https://github.com/kubevirt/kubevirtci.git' From 833efc9a34b8bf8ee0d9f0c02363057e2df3a47c Mon Sep 17 00:00:00 2001 From: Or Shoval Date: Thu, 26 Sep 2024 09:33:31 +0300 Subject: [PATCH 2/2] cluster: Allow overriding kubevirtci params When running tests from other repos, the cluster that was created should be the one vendored, so the scripts will match. Otherwise it can cause errors (for example via CNAO). Set KUBEVIRTCI_TAG and KUBEVIRT_PROVIDER only if not set yet. It also allows overriding locally upon needs. Signed-off-by: Or Shoval --- automation/check-patch.e2e-k8s.sh | 2 +- cluster/cluster.sh | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/automation/check-patch.e2e-k8s.sh b/automation/check-patch.e2e-k8s.sh index 4a4e34b3..745c3fc5 100755 --- a/automation/check-patch.e2e-k8s.sh +++ b/automation/check-patch.e2e-k8s.sh @@ -14,7 +14,7 @@ teardown() { } main() { - export KUBEVIRT_PROVIDER='k8s-1.28' + export KUBEVIRT_PROVIDER=${KUBEVIRT_PROVIDER:-k8s-1.28} source automation/check-patch.setup.sh cd ${TMP_PROJECT_PATH} diff --git a/cluster/cluster.sh b/cluster/cluster.sh index cc26c05e..4cf3e098 100755 --- a/cluster/cluster.sh +++ b/cluster/cluster.sh @@ -1,7 +1,7 @@ #!/usr/bin/env bash -export KUBEVIRT_PROVIDER="${KUBEVIRT_PROVIDER:-k8s-1.28}" -export KUBEVIRTCI_TAG=2408151028-a0ad3359 +export KUBEVIRT_PROVIDER=${KUBEVIRT_PROVIDER:-k8s-1.28} +export KUBEVIRTCI_TAG=${KUBEVIRTCI_TAG:-2408151028-a0ad3359} export KUBEVIRTCI_RUNTIME=${OCI_BIN:-docker} KUBEVIRTCI_REPO='https://github.com/kubevirt/kubevirtci.git'