diff --git a/jenkins/jobs/capm3-e2e-tests.groovy b/jenkins/jobs/capm3-e2e-tests.groovy index fe06cf93d..bdcf5c99d 100644 --- a/jenkins/jobs/capm3-e2e-tests.groovy +++ b/jenkins/jobs/capm3-e2e-tests.groovy @@ -33,6 +33,9 @@ script { } else if ( "${GINKGO_FOCUS}" == 'k8s-upgrade' ) { agent_label = "metal3ci-8c24gb-${IMAGE_OS}" TIMEOUT = 14400 // 4h + } else if ( "${GINKGO_FOCUS}" == 'k8s-upgrade-n3' ) { + agent_label = "metal3ci-8c24gb-${IMAGE_OS}" + TIMEOUT = 18000 // 5h } else if ( "${GINKGO_FOCUS}" == 'k8s-conformance' ) { TIMEOUT = 7200 // 2h agent_label = "metal3ci-8c32gb-${IMAGE_OS}" @@ -67,6 +70,10 @@ pipeline { CAPM3_VERSION = "${CAPM3_VERSION}" KUBERNETES_VERSION_UPGRADE_FROM = "${KUBERNETES_VERSION_UPGRADE_FROM}" KUBERNETES_VERSION_UPGRADE_TO = "${KUBERNETES_VERSION_UPGRADE_TO}" + KUBERNETES_N0_VERSION= "${KUBERNETES_N0_VERSION}" + KUBERNETES_N1_VERSION= "${KUBERNETES_N1_VERSION}" + KUBERNETES_N2_VERSION= "${KUBERNETES_N2_VERSION}" + KUBERNETES_N3_VERSION= "${KUBERNETES_N3_VERSION}" CNI_NAME = "${CNI_NAME}" } diff --git a/jenkins/scripts/dynamic_worker_workflow/e2e_tests.sh b/jenkins/scripts/dynamic_worker_workflow/e2e_tests.sh index f00be1b1a..b04dd52c6 100755 --- a/jenkins/scripts/dynamic_worker_workflow/e2e_tests.sh +++ b/jenkins/scripts/dynamic_worker_workflow/e2e_tests.sh @@ -36,6 +36,14 @@ if [[ "${GINKGO_FOCUS}" == "k8s-upgrade" ]]; then export FROM_K8S_VERSION="${KUBERNETES_VERSION_UPGRADE_FROM}" fi +# Set KUBERNETES_VERSION and related variables for k8s-upgrade-n3 tests +if [[ "${GINKGO_FOCUS}" == "k8s-upgrade-n3" ]]; then + export KUBERNETES_N0_VERSION=${KUBERNETES_N0_VERSION:-"v1.31.13"} + export KUBERNETES_N1_VERSION=${KUBERNETES_N1_VERSION:-"v1.32.9"} + export KUBERNETES_N2_VERSION=${KUBERNETES_N2_VERSION:-"v1.33.5"} + export KUBERNETES_N3_VERSION=${KUBERNETES_N3_VERSION:-"v1.34.1"} +fi + # Unset empty and null variables if [[ -z "${NUM_NODES:-}" ]] || [[ "${NUM_NODES}" == "null" ]]; then @@ -58,6 +66,22 @@ if [[ -z "${KUBERNETES_VERSION_UPGRADE_TO:-}" ]] || [[ "${KUBERNETES_VERSION_UPG unset KUBERNETES_VERSION_UPGRADE_TO fi +if [[ -z "${KUBERNETES_N0_VERSION:-}" ]] || [[ "${KUBERNETES_N0_VERSION}" == "null" ]]; then + unset KUBERNETES_N0_VERSION +fi + +if [[ -z "${KUBERNETES_N1_VERSION:-}" ]] || [[ "${KUBERNETES_N1_VERSION}" == "null" ]]; then + unset KUBERNETES_N1_VERSION +fi + +if [[ -z "${KUBERNETES_N2_VERSION:-}" ]] || [[ "${KUBERNETES_N2_VERSION}" == "null" ]]; then + unset KUBERNETES_N2_VERSION +fi + +if [[ -z "${KUBERNETES_N3_VERSION:-}" ]] || [[ "${KUBERNETES_N3_VERSION}" == "null" ]]; then + unset KUBERNETES_N3_VERSION +fi + # Since we take care of the repo tested here (to merge the PR), do not update # the repo in metal3-dev-env 03_launch_mgmt_cluster.sh export FORCE_REPO_UPDATE=false