Skip to content

Commit 56a45a8

Browse files
ebattatebattat
authored
Fix kubeconfig in Jenkinfile (#987)
1 parent a476f6c commit 56a45a8

File tree

6 files changed

+13
-12
lines changed

6 files changed

+13
-12
lines changed

‎jenkins/PerfCI/02_PerfCI_Operators_Deployment/Jenkinsfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ END
127127
-e ODF_VERSION='${ODF_VERSION}' \
128128
-e NUM_ODF_DISK='${NUM_ODF_DISK}' \
129129
-e KUBEADMIN_PASSWORD='${KUBEADMIN_PASSWORD}' \
130-
-e KUBECONFIG_PATH="${KUBECONFIG_PATH}" \
130+
-e KUBECONFIG_PATH='${KUBECONFIG_PATH}' \
131131
-e PROVISION_IP='${PROVISION_IP}' \
132132
-e CONTAINER_PRIVATE_KEY_PATH='${CONTAINER_PRIVATE_KEY_PATH}' \
133133
-e PROVISION_USER='${PROVISION_USER}' \

‎jenkins/PerfCI/03_PerfCI_Workloads_Deployment/Jenkinsfile‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ END
128128
// bootstorm_vm_scale: no need redis for synchronization but need SCALE and THREADS_LIMIT
129129
if (workload == "bootstorm_vm_scale") {
130130
// Warm-up: Pull the Fedora image from quay.io for each node
131-
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}' """
131+
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}' """
132132
SCALE = BOOTSTORM_SCALE
133133
}
134134

@@ -150,7 +150,7 @@ END
150150
error "Unknown Windows scale workload ${workload}"
151151
}
152152

153-
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}' """
153+
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}' """
154154
SCALE = WINDOWS_SCALE
155155
}
156156
workload = WORKLOAD
@@ -164,6 +164,7 @@ END
164164
sudo podman run --rm -t \
165165
-e WORKLOAD='${workload}' \
166166
-e KUBEADMIN_PASSWORD='${KUBEADMIN_PASSWORD}' \
167+
-e KUBECONFIG_PATH='${KUBECONFIG_PATH}' \
167168
-e PIN_NODE_BENCHMARK_OPERATOR='${PIN_NODE_BENCHMARK_OPERATOR}' \
168169
-e PIN_NODE1='${PIN_NODE1}' \
169170
-e PIN_NODE2='${PIN_NODE2}' \
@@ -223,7 +224,7 @@ END
223224
}
224225
failure {
225226
script {
226-
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}' """
227+
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}' """
227228
msg = "Build error for ${env.JOB_NAME} ${env.BUILD_NUMBER} (${env.BUILD_URL})"
228229
emailext body: """\
229230
Jenkins job: ${env.BUILD_URL}\nSee the console output for more details: ${env.BUILD_URL}consoleFull\n\n
@@ -232,7 +233,7 @@ END
232233
}
233234
success {
234235
script {
235-
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}' """
236+
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}' """
236237
echo '04-PerfCI-Grafana-Deployment pipeline'
237238
build job: '04-PerfCI-Grafana-Deployment', wait: false
238239
}

‎jenkins/PerfCI_Chaos/02_PerfCI_Chaos_Operators_Deployment/Jenkinsfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ END
111111
-e ODF_VERSION='${ODF_VERSION}' \
112112
-e NUM_ODF_DISK='${NUM_ODF_DISK}' \
113113
-e KUBEADMIN_PASSWORD='${KUBEADMIN_PASSWORD}' \
114-
-e KUBECONFIG_PATH="${KUBECONFIG_PATH}" \
114+
-e KUBECONFIG_PATH='${KUBECONFIG_PATH}' \
115115
-e PROVISION_IP='${PROVISION_IP}' \
116116
-e CONTAINER_PRIVATE_KEY_PATH='${CONTAINER_PRIVATE_KEY_PATH}' \
117117
-e PROVISION_USER='${PROVISION_USER}' \

‎jenkins/PerfCI_Chaos/03_PerfCI_Choas_Windows_VMs_Deployment/Jenkinsfile‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@ END
162162
// bootstorm_vm_scale: no need redis for synchronization but need SCALE and THREADS_LIMIT
163163
if (workload == "bootstorm_vm_scale") {
164164
// Warm-up: Pull the Fedora image from quay.io for each node
165-
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}' """
165+
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}' """
166166
SCALE = BOOTSTORM_SCALE
167167
}
168168

@@ -188,7 +188,7 @@ END
188188
sudo podman run --rm -t \
189189
-e WORKLOAD='${WORKLOAD}' \
190190
-e KUBEADMIN_PASSWORD='${KUBEADMIN_PASSWORD}' \
191-
-e KUBECONFIG_PATH="${KUBECONFIG_PATH}" \
191+
-e KUBECONFIG_PATH='${KUBECONFIG_PATH}' \
192192
-e RUN_TYPE='${RUN_TYPE}' \
193193
-e SCALE='1' \
194194
-e SCALE_NODES='${SCALE_NODES}' \
@@ -212,7 +212,7 @@ END
212212
sudo podman run --rm -t \
213213
-e WORKLOAD='${workload}' \
214214
-e KUBEADMIN_PASSWORD='${KUBEADMIN_PASSWORD}' \
215-
-e KUBECONFIG_PATH="${KUBECONFIG_PATH}" \
215+
-e KUBECONFIG_PATH='${KUBECONFIG_PATH}' \
216216
-e PIN_NODE_BENCHMARK_OPERATOR='${PIN_NODE_BENCHMARK_OPERATOR}' \
217217
-e PIN_NODE1='${PIN_NODE1}' \
218218
-e PIN_NODE2='${PIN_NODE2}' \
@@ -288,7 +288,7 @@ END
288288
}
289289
failure {
290290
script {
291-
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}' """
291+
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}' """
292292
msg = "Build error for ${env.JOB_NAME} ${env.BUILD_NUMBER} (${env.BUILD_URL})"
293293
emailext body: """\
294294
Jenkins job: ${env.BUILD_URL}\nSee the console output for more details: ${env.BUILD_URL}consoleFull\n\n

‎jenkins/PerfCI_Chaos/04_PerfCI_Chaos_Upgrade_OpenShift_Deployment/Jenkinsfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -224,7 +224,7 @@ END
224224
-e CNV_VERSION="${CNV_VERSION}" \
225225
-e WAIT_FOR_UPGRADE_VERSION='${WAIT_FOR_UPGRADE_VERSION}' \
226226
-e KUBEADMIN_PASSWORD='${KUBEADMIN_PASSWORD}' \
227-
-e KUBECONFIG_PATH="${KUBECONFIG_PATH}" \
227+
-e KUBECONFIG_PATH='${KUBECONFIG_PATH}' \
228228
-e PIN_NODE_BENCHMARK_OPERATOR='${PIN_NODE_BENCHMARK_OPERATOR}' \
229229
-e PIN_NODE1='${PIN_NODE1}' \
230230
-e PIN_NODE2='${PIN_NODE2}' \

‎jenkins/PerfCI_Chaos/05_PerfCI_Chaos_Verify_Windows_VMs_Deployment/Jenkinsfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,7 @@ END
187187
sudo podman run --rm -t \
188188
-e WORKLOAD='${workload}' \
189189
-e KUBEADMIN_PASSWORD='${KUBEADMIN_PASSWORD}' \
190-
-e KUBECONFIG_PATH="${KUBECONFIG_PATH}" \
190+
-e KUBECONFIG_PATH='${KUBECONFIG_PATH}' \
191191
-e PIN_NODE_BENCHMARK_OPERATOR='${PIN_NODE_BENCHMARK_OPERATOR}' \
192192
-e PIN_NODE1='${PIN_NODE1}' \
193193
-e PIN_NODE2='${PIN_NODE2}' \

0 commit comments

Comments
 (0)