@@ -52,7 +52,7 @@ pipeline {
5252 alwaysPull true
5353 reuseNode true
5454 image "phx.ocir.io/devweblogic/wdt/jenkins-alias-test-slave:${params.wls_version}"
55- args "--group-add=oracle --group-add=${jenkins_group} -v /var/run/docker.sock:/var/run/docker.sock -v${jenkins_home_directory}/.m2:${jenkins_home_directory}/.m2 "
55+ args "--group-add=oracle --group-add=${jenkins_group} -v /var/run/docker.sock:/var/run/docker.sock"
5656 }
5757 }
5858 steps {
@@ -62,14 +62,15 @@ pipeline {
6262 sh "sed -e \"s:__jenkins_home__:${jenkins_home_directory}:g\" \"\$OCI_CONFIG_FILE\" > ${jenkins_home_directory}/.oci/config"
6363 sh "cp \"\$OCI_SIGNING_KEY\" ${jenkins_home_directory}/.oci/oci-signing-key.pem"
6464 }
65- configFileProvider([configFile(fileId: 'wkt-maven-settings-xml', targetLocation: "${jenkins_home_directory}/.m2/settings.xml")]) {
66- // In 2 JDK images, JAVA_HOME is set to JDK8 in /u01/maven-jdk and JDK7 is in /u01/jdk.
67- // In single JDK images, JAVA_HOME is set to /u01/jdk. That means that the
68- // -Dwls_java_home will point to JDK7 for early WLS versions where it is required.
69- // For all newer versions, it points to the JAVA_HOME location so it is a no-op.
70- //
71- sh 'pushd integration-tests/alias-test/generate && mvn -s ${jenkins_home_directory}/.m2/settings.xml -B install -Dalias-test-skip-generate=false -Dskip-wdt-install=true -Dalias_test_oci_profile=${oci_profile} -Dwls_java_home=/u01/jdk && popd'
65+ configFileProvider([configFile(fileId: 'wkt-maven-settings-xml', variable: 'MAVEN_SETTINGS')]) {
66+ sh "cp \"\$MAVEN_SETTINGS\" ${jenkins_home_directory}/.m2/settings.xml"
7267 }
68+ // In 2 JDK images, JAVA_HOME is set to JDK8 in /u01/maven-jdk and JDK7 is in /u01/jdk.
69+ // In single JDK images, JAVA_HOME is set to /u01/jdk. That means that the
70+ // -Dwls_java_home will point to JDK7 for early WLS versions where it is required.
71+ // For all newer versions, it points to the JAVA_HOME location so it is a no-op.
72+ //
73+ sh 'pushd integration-tests/alias-test/generate && mvn -s ${jenkins_home_directory}/.m2/settings.xml -B install -Dalias-test-skip-generate=false -Dskip-wdt-install=true -Dalias_test_oci_profile=${oci_profile} -Dwls_java_home=/u01/jdk && popd'
7374 }
7475 }
7576 }
0 commit comments