Merge branch 'weeklyjob' into 'main'

Set build description for weekly job

See merge request weblogic-cloud/weblogic-kubernetes-operator!4248

Author: mriccell

Jenkinsfile.kindnightly

@@ -108,10 +108,10 @@ pipeline {
                defaultValue: 'main'
         )
         choice(name: 'MAVEN_PROFILE_NAME',
-                description: 'Profile to use in mvn command to run the tests.  Possible values are kind-sequential (the default), kind-parallel and integration-tests.  Refer to weblogic-kubernetes-operator/integration-tests/pom.xml on the branch.',
+                description: 'Profile to use in mvn command to run the tests.  Possible values are kind-parallel (the default), kind-sequential and integration-tests.  Refer to weblogic-kubernetes-operator/integration-tests/pom.xml on the branch.',
                 choices: [
-                        'kind-sequential',
                         'kind-parallel',
+                        'kind-sequential',
                         'integration-tests',
                         'toolkits-srg',
                         'wls-srg'
@@ -250,7 +250,7 @@ pipeline {
         )
         string(name: 'PROMETHEUS_CHART_VERSION',
                description: '',
-               defaultValue: '15.2.0'
+               defaultValue: '17.0.0'
         )
         string(name: 'GRAFANA_CHART_VERSION',
                description: '',
@@ -486,7 +486,11 @@ EOF
                     }
                     steps {
                         script {
-                            currentBuild.description = "${GIT_BRANCH} ${MAVEN_PROFILE_NAME}"
+                            if (env.JOB_NAME == 'wko-kind-weekly') {
+                                currentBuild.description = "${WEBLOGIC_IMAGE_NAME}:${WEBLOGIC_IMAGE_TAG}"
+                            } else {
+                                currentBuild.description = "${GIT_BRANCH} ${MAVEN_PROFILE_NAME}"
+                            }
                             def res = 0
                             res = sh(script: '''
                                     if [ -z "${IT_TEST}" ] && [ "${MAVEN_PROFILE_NAME}" = "integration-tests" ]; then
@@ -520,8 +524,6 @@ EOF
                                     PARALLEL_RUN='false'
                                 fi
                                 if [ -n "${IT_TEST}" ]; then
-                                    echo 'Overriding MAVEN_PROFILE_NAME to integration-test when running individual test(s)'
-                                    MAVEN_PROFILE_NAME="integration-tests"
                                     echo "-Dit.test=\"${IT_TEST}\"" > ${WORKSPACE}/.mvn/maven.config
                                 fi
                                 echo "-Dwko.it.wle.download.url=\"${wle_download_url}\""                                     >> ${WORKSPACE}/.mvn/maven.config
@@ -568,6 +570,10 @@ EOF
                                     export TEST_IMAGES_REPO_USERNAME="${OCIR_USER}"
                                     export TEST_IMAGES_REPO_PASSWORD="${OCIR_PASS}"
                                     export TEST_IMAGES_REPO_EMAIL="[email protected]"
+                                    if [ -n "${IT_TEST}" ]; then
+                                        echo 'Overriding MAVEN_PROFILE_NAME to integration-test when running individual test(s)'
+                                        export MAVEN_PROFILE_NAME="integration-tests"
+                                    fi
                                     if ! time mvn -pl integration-tests -P ${MAVEN_PROFILE_NAME} verify 2>&1 | tee "${result_root}/kindtest.log"; then
                                         echo "integration-tests failed"
                                         exit 1