update

apache · May 11, 2023 · 47ab79b · 47ab79b
1 parent 8c0e4c4
commit 47ab79b
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 2 deletions.
diff --git a/.ci/environments/quarkus-3/before.sh b/.ci/environments/quarkus-3/before.sh
@@ -13,7 +13,9 @@ patch_file="${script_dir_path}"/patches/0001_before_sh.patch
 
 if [ "${ci}" = "true" ]; then
     # In CI we need the main branch snapshot artifacts deployed locally
+    set -x
     ${mvn_cmd} clean install -Dquickly
+    set +x
 fi
 
 rewrite=${1:-'none'}

diff --git a/.ci/jenkins/Jenkinsfile.quarkus-3.rewrite.pr b/.ci/jenkins/Jenkinsfile.quarkus-3.rewrite.pr
@@ -38,7 +38,12 @@ pipeline {
             steps {
                 script {
                     dir(getRepoName()) {
-                        sh '.ci/environments/quarkus-3/before.sh rewrite'
+                        configFileProvider([configFile(fileId: env.MAVEN_SETTINGS_CONFIG_FILE_ID, variable: 'MAVEN_SETTINGS_FILE')]) {
+                            env.BUILD_MVN_OPTS = "${env.BUILD_MVN_OPTS ?: ''} -s ${MAVEN_SETTINGS_FILE} -Dmaven.wagon.http.ssl.insecure=true -Dmaven.test.failure.ignore=true"
+                            echo "BUILD_MVN_OPTS = ${BUILD_MVN_OPTS}"
+
+                            sh '.ci/environments/quarkus-3/before.sh rewrite'
+                        }
                     }
                 }
             }

diff --git a/.ci/jenkins/Jenkinsfile.quarkus-3.rewrite.standalone b/.ci/jenkins/Jenkinsfile.quarkus-3.rewrite.standalone
@@ -58,7 +58,12 @@ pipeline {
             steps {
                 script {
                     dir(getRepoName()) {
-                        sh '.ci/environments/quarkus-3/before.sh rewrite'
+                        configFileProvider([configFile(fileId: env.MAVEN_SETTINGS_CONFIG_FILE_ID, variable: 'MAVEN_SETTINGS_FILE')]) {
+                            env.BUILD_MVN_OPTS = "${env.BUILD_MVN_OPTS ?: ''} -s ${MAVEN_SETTINGS_FILE} -Dmaven.wagon.http.ssl.insecure=true -Dmaven.test.failure.ignore=true"
+                            echo "BUILD_MVN_OPTS = ${BUILD_MVN_OPTS}"
+
+                            sh '.ci/environments/quarkus-3/before.sh rewrite'
+                        }
                     }
                 }
             }

diff --git a/.ci/jenkins/dsl/jobs.groovy b/.ci/jenkins/dsl/jobs.groovy
@@ -329,6 +329,7 @@ void setupPrQuarkus3RewriteJob() {
 void setupStandaloneQuarkus3RewriteJob() {
     def jobParams = JobParamsUtils.getBasicJobParams(this, 'drools.quarkus-3.rewrite', JobType.TOOLS, "${jenkins_path}/Jenkinsfile.quarkus-3.rewrite.standalone", 'Drools Quarkus 3 rewrite patch regeneration')
     JobParamsUtils.setupJobParamsDefaultMavenConfiguration(this, jobParams)
+    jobParams.env.putAll(EnvUtils.getEnvironmentEnvVars(this, 'quarkus-3'))
     jobParams.env.putAll([
         AUTHOR_CREDS_ID: "${GIT_AUTHOR_CREDENTIALS_ID}",
         JENKINS_EMAIL_CREDS_ID: "${JENKINS_EMAIL_CREDS_ID}",