Skip to content

Add Kubernetes N+3 e2e test for CAPM3 #1145

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Add Kubernetes N+3 e2e test for CAPM3 #1145

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions jenkins/jobs/capm3-e2e-tests.pipeline
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,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}"
Expand Down Expand Up @@ -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}"
}

Expand Down
6 changes: 6 additions & 0 deletions jenkins/jobs/pre_release_tests.pipeline
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@ script {
agent_label = "metal3ci-8c16gb-${IMAGE_OS}"
} else if ( "${GINKGO_FOCUS}" == 'k8s-upgrade' ) {
agent_label = "metal3ci-8c24gb-${IMAGE_OS}"
} else if ( "${GINKGO_FOCUS}" == 'k8s-upgrade-n3' ) {
agent_label = "metal3ci-8c24gb-${IMAGE_OS}"
}
}

Expand Down Expand Up @@ -46,6 +48,10 @@ pipeline {
NUM_NODES = "${NUM_NODES}"
TARGET_NODE_MEMORY = "${TARGET_NODE_MEMORY}"
KUBERNETES_VERSION_UPGRADE_FROM = "${KUBERNETES_VERSION_UPGRADE_FROM}"
KUBERNETES_N0_VERSION= "${KUBERNETES_N0_VERSION}"
KUBERNETES_N1_VERSION= "${KUBERNETES_N1_VERSION}"
KUBERNETES_N2_VERSION= "${KUBERNETES_N2_VERSION}"
KUBERNETES_N3_VERSION= "${KUBERNETES_N3_VERSION}"
}
stages {
stage("Checkout CI Repo") {
Expand Down
24 changes: 24 additions & 0 deletions jenkins/scripts/dynamic_worker_workflow/e2e_tests.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down