Skip to content

Commit 8e7a45b

Browse files
committed
Merge branch 'owls115742' into 'main'
Changes for jenkins job with multiple kubernetes versions See merge request weblogic-cloud/weblogic-kubernetes-operator!4572
2 parents 1413318 + 63ac84c commit 8e7a45b

File tree

1 file changed

+8
-0
lines changed

1 file changed

+8
-0
lines changed

Jenkinsfile.podman

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -240,7 +240,13 @@ pipeline {
240240
error('KIND_VERSION or KUBE_VERSION were null')
241241
}
242242
echo "Kind Image = ${_kind_image}"
243+
if (env.JOB_NAME == 'wko-kind-k8sversion') {
244+
currentBuild.description = "${GIT_BRANCH} ${KUBE_VERSION}"
245+
} else {
246+
currentBuild.description = "${GIT_BRANCH} ${MAVEN_PROFILE_NAME}"
247+
}
243248
}
249+
244250
}
245251
}
246252

@@ -432,6 +438,7 @@ EOF
432438
}
433439
steps {
434440
script {
441+
435442
def res = 0
436443
res = sh(script: '''
437444
if [ -z "${IT_TEST}" ] && [ "${MAVEN_PROFILE_NAME}" = "integration-tests" ]; then
@@ -557,6 +564,7 @@ EOF
557564
if ! kind delete cluster --name ${kind_name} --kubeconfig "${kubeconfig_file}"; then
558565
echo "Failed to delete kind cluster ${kind_name}"
559566
fi
567+
sudo chown -R $(whoami) ${WORKSPACE}
560568
'''
561569
}
562570
}

0 commit comments

Comments
 (0)