Skip to content

HotFix: kubeconfig in Jenkinsfile #987

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

Merged
ebattat merged 1 commit into from
Feb 22, 2025
+13 −12
Merged

HotFix: kubeconfig in Jenkinsfile #987

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
2 changes: 1 addition & 1 deletion jenkins/PerfCI/02_PerfCI_Operators_Deployment/Jenkinsfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ END
-e ODF_VERSION='${ODF_VERSION}' \
-e NUM_ODF_DISK='${NUM_ODF_DISK}' \
-e KUBEADMIN_PASSWORD='${KUBEADMIN_PASSWORD}' \
-e KUBECONFIG_PATH="${KUBECONFIG_PATH}" \
-e KUBECONFIG_PATH='${KUBECONFIG_PATH}' \
-e PROVISION_IP='${PROVISION_IP}' \
-e CONTAINER_PRIVATE_KEY_PATH='${CONTAINER_PRIVATE_KEY_PATH}' \
-e PROVISION_USER='${PROVISION_USER}' \
Expand Down
9 changes: 5 additions & 4 deletions jenkins/PerfCI/03_PerfCI_Workloads_Deployment/Jenkinsfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ END
// bootstorm_vm_scale: no need redis for synchronization but need SCALE and THREADS_LIMIT
if (workload == "bootstorm_vm_scale") {
// Warm-up: Pull the Fedora image from quay.io for each node
sh """ sudo podman run --rm -t -e WORKLOAD='${WORKLOAD}' -e KUBEADMIN_PASSWORD='${KUBEADMIN_PASSWORD}' -e KUBECONFIG_PATH="${KUBECONFIG_PATH}" -e RUN_TYPE='${RUN_TYPE}' -e SCALE='1' -e SCALE_NODES='${SCALE_NODES}' -e TIMEOUT='${TIMEOUT}' -e log_level='INFO' -v '${KUBECONFIG_PATH}:${KUBECONFIG_PATH}' --privileged '${QUAY_BENCHMARK_RUNNER_REPOSITORY}' """
sh """ sudo podman run --rm -t -e WORKLOAD='${WORKLOAD}' -e KUBEADMIN_PASSWORD='${KUBEADMIN_PASSWORD}' -e KUBECONFIG_PATH='${KUBECONFIG_PATH}' -e RUN_TYPE='${RUN_TYPE}' -e SCALE='1' -e SCALE_NODES='${SCALE_NODES}' -e TIMEOUT='${TIMEOUT}' -e log_level='INFO' -v '${KUBECONFIG_PATH}:${KUBECONFIG_PATH}' --privileged '${QUAY_BENCHMARK_RUNNER_REPOSITORY}' """
SCALE = BOOTSTORM_SCALE
}

Expand All @@ -150,7 +150,7 @@ END
error "Unknown Windows scale workload ${workload}"
}

sh """ sudo podman run --rm -t -e WORKLOAD='${WORKLOAD}' -e KUBEADMIN_PASSWORD='${KUBEADMIN_PASSWORD}' -e KUBECONFIG_PATH="${KUBECONFIG_PATH}" -e RUN_TYPE='${RUN_TYPE}' -e SCALE='1' -e SCALE_NODES='${SCALE_NODES}' -e WINDOWS_URL='${WINDOWS_URL}' -e TIMEOUT='${TIMEOUT}' -e log_level='INFO' -v '${KUBECONFIG_PATH}:${KUBECONFIG_PATH}' --privileged '${QUAY_BENCHMARK_RUNNER_REPOSITORY}' """
sh """ sudo podman run --rm -t -e WORKLOAD='${WORKLOAD}' -e KUBEADMIN_PASSWORD='${KUBEADMIN_PASSWORD}' -e KUBECONFIG_PATH='${KUBECONFIG_PATH}' -e RUN_TYPE='${RUN_TYPE}' -e SCALE='1' -e SCALE_NODES='${SCALE_NODES}' -e WINDOWS_URL='${WINDOWS_URL}' -e TIMEOUT='${TIMEOUT}' -e log_level='INFO' -v '${KUBECONFIG_PATH}:${KUBECONFIG_PATH}' --privileged '${QUAY_BENCHMARK_RUNNER_REPOSITORY}' """
SCALE = WINDOWS_SCALE
}
workload = WORKLOAD
Expand All @@ -164,6 +164,7 @@ END
sudo podman run --rm -t \
-e WORKLOAD='${workload}' \
-e KUBEADMIN_PASSWORD='${KUBEADMIN_PASSWORD}' \
-e KUBECONFIG_PATH='${KUBECONFIG_PATH}' \
-e PIN_NODE_BENCHMARK_OPERATOR='${PIN_NODE_BENCHMARK_OPERATOR}' \
-e PIN_NODE1='${PIN_NODE1}' \
-e PIN_NODE2='${PIN_NODE2}' \
Expand Down Expand Up @@ -223,7 +224,7 @@ END
}
failure {
script {
sh """ sudo podman run --rm -e KUBEADMIN_PASSWORD='${KUBEADMIN_PASSWORD}' -e KUBECONFIG_PATH="${KUBECONFIG_PATH}" -e ELASTICSEARCH='${ELASTICSEARCH}' -e ELASTICSEARCH_PORT='${ELASTICSEARCH_PORT}' -e CI_STATUS=''failed'' -e RUN_TYPE='${RUN_TYPE}' -e log_level='INFO' -v '${KUBECONFIG_PATH}:${KUBECONFIG_PATH}' --privileged '${QUAY_BENCHMARK_RUNNER_REPOSITORY}' """
sh """ sudo podman run --rm -e KUBEADMIN_PASSWORD='${KUBEADMIN_PASSWORD}' -e KUBECONFIG_PATH='${KUBECONFIG_PATH}' -e ELASTICSEARCH='${ELASTICSEARCH}' -e ELASTICSEARCH_PORT='${ELASTICSEARCH_PORT}' -e CI_STATUS=''failed'' -e RUN_TYPE='${RUN_TYPE}' -e log_level='INFO' -v '${KUBECONFIG_PATH}:${KUBECONFIG_PATH}' --privileged '${QUAY_BENCHMARK_RUNNER_REPOSITORY}' """
msg = "Build error for ${env.JOB_NAME} ${env.BUILD_NUMBER} (${env.BUILD_URL})"
emailext body: """\
Jenkins job: ${env.BUILD_URL}\nSee the console output for more details: ${env.BUILD_URL}consoleFull\n\n
Expand All @@ -232,7 +233,7 @@ END
}
success {
script {
sh """ sudo podman run --rm -e KUBEADMIN_PASSWORD='${KUBEADMIN_PASSWORD}' -e KUBECONFIG_PATH="${KUBECONFIG_PATH}" -e ELASTICSEARCH='${ELASTICSEARCH}' -e ELASTICSEARCH_PORT='${ELASTICSEARCH_PORT}' -e CI_STATUS='pass' -e RUN_TYPE='${RUN_TYPE}' -e log_level='INFO' -v '${KUBECONFIG_PATH}:${KUBECONFIG_PATH}' --privileged '${QUAY_BENCHMARK_RUNNER_REPOSITORY}' """
sh """ sudo podman run --rm -e KUBEADMIN_PASSWORD='${KUBEADMIN_PASSWORD}' -e KUBECONFIG_PATH='${KUBECONFIG_PATH}' -e ELASTICSEARCH='${ELASTICSEARCH}' -e ELASTICSEARCH_PORT='${ELASTICSEARCH_PORT}' -e CI_STATUS='pass' -e RUN_TYPE='${RUN_TYPE}' -e log_level='INFO' -v '${KUBECONFIG_PATH}:${KUBECONFIG_PATH}' --privileged '${QUAY_BENCHMARK_RUNNER_REPOSITORY}' """
echo '04-PerfCI-Grafana-Deployment pipeline'
build job: '04-PerfCI-Grafana-Deployment', wait: false
}
Expand Down
2 changes: 1 addition & 1 deletion jenkins/PerfCI_Chaos/02_PerfCI_Chaos_Operators_Deployment/Jenkinsfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ END
-e ODF_VERSION='${ODF_VERSION}' \
-e NUM_ODF_DISK='${NUM_ODF_DISK}' \
-e KUBEADMIN_PASSWORD='${KUBEADMIN_PASSWORD}' \
-e KUBECONFIG_PATH="${KUBECONFIG_PATH}" \
-e KUBECONFIG_PATH='${KUBECONFIG_PATH}' \
-e PROVISION_IP='${PROVISION_IP}' \
-e CONTAINER_PRIVATE_KEY_PATH='${CONTAINER_PRIVATE_KEY_PATH}' \
-e PROVISION_USER='${PROVISION_USER}' \
Expand Down
8 changes: 4 additions & 4 deletions jenkins/PerfCI_Chaos/03_PerfCI_Choas_Windows_VMs_Deployment/Jenkinsfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,7 @@ END
// bootstorm_vm_scale: no need redis for synchronization but need SCALE and THREADS_LIMIT
if (workload == "bootstorm_vm_scale") {
// Warm-up: Pull the Fedora image from quay.io for each node
sh """ sudo podman run --rm -t -e WORKLOAD='${WORKLOAD}' -e KUBEADMIN_PASSWORD='${KUBEADMIN_PASSWORD}' -e KUBECONFIG_PATH="${KUBECONFIG_PATH}" -e RUN_TYPE='${RUN_TYPE}' -e SCALE='1' -e SCALE_NODES='${SCALE_NODES}' -e TIMEOUT='${TIMEOUT}' -e log_level='INFO' -v '${KUBECONFIG_PATH}:${KUBECONFIG_PATH}' --privileged '${QUAY_BENCHMARK_RUNNER_REPOSITORY}' """
sh """ sudo podman run --rm -t -e WORKLOAD='${WORKLOAD}' -e KUBEADMIN_PASSWORD='${KUBEADMIN_PASSWORD}' -e KUBECONFIG_PATH='${KUBECONFIG_PATH}' -e RUN_TYPE='${RUN_TYPE}' -e SCALE='1' -e SCALE_NODES='${SCALE_NODES}' -e TIMEOUT='${TIMEOUT}' -e log_level='INFO' -v '${KUBECONFIG_PATH}:${KUBECONFIG_PATH}' --privileged '${QUAY_BENCHMARK_RUNNER_REPOSITORY}' """
SCALE = BOOTSTORM_SCALE
}

Expand All @@ -188,7 +188,7 @@ END
sudo podman run --rm -t \
-e WORKLOAD='${WORKLOAD}' \
-e KUBEADMIN_PASSWORD='${KUBEADMIN_PASSWORD}' \
-e KUBECONFIG_PATH="${KUBECONFIG_PATH}" \
-e KUBECONFIG_PATH='${KUBECONFIG_PATH}' \
-e RUN_TYPE='${RUN_TYPE}' \
-e SCALE='1' \
-e SCALE_NODES='${SCALE_NODES}' \
Expand All @@ -212,7 +212,7 @@ END
sudo podman run --rm -t \
-e WORKLOAD='${workload}' \
-e KUBEADMIN_PASSWORD='${KUBEADMIN_PASSWORD}' \
-e KUBECONFIG_PATH="${KUBECONFIG_PATH}" \
-e KUBECONFIG_PATH='${KUBECONFIG_PATH}' \
-e PIN_NODE_BENCHMARK_OPERATOR='${PIN_NODE_BENCHMARK_OPERATOR}' \
-e PIN_NODE1='${PIN_NODE1}' \
-e PIN_NODE2='${PIN_NODE2}' \
Expand Down Expand Up @@ -288,7 +288,7 @@ END
}
failure {
script {
sh """ sudo podman run --rm -e KUBEADMIN_PASSWORD='${KUBEADMIN_PASSWORD}' -e KUBECONFIG_PATH="${KUBECONFIG_PATH}" -e ELASTICSEARCH='${ELASTICSEARCH}' -e ELASTICSEARCH_PORT='${ELASTICSEARCH_PORT}' -e CI_STATUS=''failed'' -e RUN_TYPE='${RUN_TYPE}' -e log_level='INFO' -v '${KUBECONFIG_PATH}:${KUBECONFIG_PATH}' --privileged '${QUAY_BENCHMARK_RUNNER_REPOSITORY}' """
sh """ sudo podman run --rm -e KUBEADMIN_PASSWORD='${KUBEADMIN_PASSWORD}' -e KUBECONFIG_PATH='${KUBECONFIG_PATH}' -e ELASTICSEARCH='${ELASTICSEARCH}' -e ELASTICSEARCH_PORT='${ELASTICSEARCH_PORT}' -e CI_STATUS=''failed'' -e RUN_TYPE='${RUN_TYPE}' -e log_level='INFO' -v '${KUBECONFIG_PATH}:${KUBECONFIG_PATH}' --privileged '${QUAY_BENCHMARK_RUNNER_REPOSITORY}' """
msg = "Build error for ${env.JOB_NAME} ${env.BUILD_NUMBER} (${env.BUILD_URL})"
emailext body: """\
Jenkins job: ${env.BUILD_URL}\nSee the console output for more details: ${env.BUILD_URL}consoleFull\n\n
Expand Down
2 changes: 1 addition & 1 deletion jenkins/PerfCI_Chaos/04_PerfCI_Chaos_Upgrade_OpenShift_Deployment/Jenkinsfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -224,7 +224,7 @@ END
-e CNV_VERSION="${CNV_VERSION}" \
-e WAIT_FOR_UPGRADE_VERSION='${WAIT_FOR_UPGRADE_VERSION}' \
-e KUBEADMIN_PASSWORD='${KUBEADMIN_PASSWORD}' \
-e KUBECONFIG_PATH="${KUBECONFIG_PATH}" \
-e KUBECONFIG_PATH='${KUBECONFIG_PATH}' \
-e PIN_NODE_BENCHMARK_OPERATOR='${PIN_NODE_BENCHMARK_OPERATOR}' \
-e PIN_NODE1='${PIN_NODE1}' \
-e PIN_NODE2='${PIN_NODE2}' \
Expand Down
2 changes: 1 addition & 1 deletion jenkins/PerfCI_Chaos/05_PerfCI_Chaos_Verify_Windows_VMs_Deployment/Jenkinsfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,7 +187,7 @@ END
sudo podman run --rm -t \
-e WORKLOAD='${workload}' \
-e KUBEADMIN_PASSWORD='${KUBEADMIN_PASSWORD}' \
-e KUBECONFIG_PATH="${KUBECONFIG_PATH}" \
-e KUBECONFIG_PATH='${KUBECONFIG_PATH}' \
-e PIN_NODE_BENCHMARK_OPERATOR='${PIN_NODE_BENCHMARK_OPERATOR}' \
-e PIN_NODE1='${PIN_NODE1}' \
-e PIN_NODE2='${PIN_NODE2}' \
Expand Down