From fa9183c21aed1dcdb6ea995d006106130c239293 Mon Sep 17 00:00:00 2001 From: Felix Matouschek Date: Wed, 28 Feb 2024 16:42:23 +0100 Subject: [PATCH] hack: Bump e2e-setup.sh version Bump the software versions defined in hack/e2e-setup.sh to the latest ones and sync version installed of kind in github integration tests with e2e-setup.sh. Update the CentOS 9 Stream preference name used in the tests to the new name in common-instancetypes v0.4.0. Signed-off-by: Felix Matouschek --- .github/workflows/integration.yml | 1 + hack/e2e-setup.sh | 12 ++++++------ .../targets/kubevirt_vm_info/playbook.yml | 2 +- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml index aaef3e7..4142f5a 100644 --- a/.github/workflows/integration.yml +++ b/.github/workflows/integration.yml @@ -98,6 +98,7 @@ jobs: - name: install kind / kubectl uses: helm/kind-action@v1.9.0 with: + version: v0.22.0 install_only: true if: inputs.ansible_test_targets != '' diff --git a/hack/e2e-setup.sh b/hack/e2e-setup.sh index 3df0f1c..7510d4a 100755 --- a/hack/e2e-setup.sh +++ b/hack/e2e-setup.sh @@ -23,17 +23,17 @@ set_default_params() { BIN_DIR=${BIN_DIR:-$DIR/../bin} KIND=${KIND:-$BIN_DIR/kind} - KIND_VERSION=${KIND_VERSION:-v0.20.0} + KIND_VERSION=${KIND_VERSION:-v0.22.0} KUBECTL=${KUBECTL:-$BIN_DIR/kubectl} - KUBECTL_VERSION=${KUBECTL_VERSION:-v1.28.1} + KUBECTL_VERSION=${KUBECTL_VERSION:-v1.29.2} - KUBEVIRT_VERSION=${KUBEVIRT_VERSION:-v1.0.0} - KUBEVIRT_CDI_VERSION=${KUBEVIRT_CDI_VERSION:-v1.57.0} - KUBEVIRT_COMMON_INSTANCETYPES_VERSION=${KUBEVIRT_COMMON_INSTANCETYPES_VERSION:-v0.3.2} + KUBEVIRT_VERSION=${KUBEVIRT_VERSION:-v1.1.0} + KUBEVIRT_CDI_VERSION=${KUBEVIRT_CDI_VERSION:-v1.58.1} + KUBEVIRT_COMMON_INSTANCETYPES_VERSION=${KUBEVIRT_COMMON_INSTANCETYPES_VERSION:-v0.4.0} KUBEVIRT_USE_EMULATION=${KUBEVIRT_USE_EMULATION:-"false"} - CNAO_VERSION=${CNAO_VERSION:-v0.89.0} + CNAO_VERSION=${CNAO_VERSION:-v0.91.0} CLUSTER_NAME=${CLUSTER_NAME:-kind} SECONDARY_NETWORK_NAME=${NETWORK_NAME:-kindexgw} diff --git a/tests/integration/targets/kubevirt_vm_info/playbook.yml b/tests/integration/targets/kubevirt_vm_info/playbook.yml index 823196a..5fba036 100644 --- a/tests/integration/targets/kubevirt_vm_info/playbook.yml +++ b/tests/integration/targets/kubevirt_vm_info/playbook.yml @@ -11,7 +11,7 @@ instancetype: name: u1.small preference: - name: centos.9.stream + name: centos.stream9 spec: domain: devices: {}