From 704eef20ddc2eae41ea4e492e66ee79cff789c97 Mon Sep 17 00:00:00 2001 From: radtriste Date: Fri, 28 Jul 2023 09:31:38 +0200 Subject: [PATCH] Updated Jenkinsfiles --- .ci/jenkins/Jenkinsfile.quarkus-3.rewrite.pr | 6 +++--- .ci/jenkins/Jenkinsfile.quarkus-3.rewrite.standalone | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.ci/jenkins/Jenkinsfile.quarkus-3.rewrite.pr b/.ci/jenkins/Jenkinsfile.quarkus-3.rewrite.pr index d1198d18f10..4c106b5660b 100644 --- a/.ci/jenkins/Jenkinsfile.quarkus-3.rewrite.pr +++ b/.ci/jenkins/Jenkinsfile.quarkus-3.rewrite.pr @@ -40,8 +40,8 @@ pipeline { script { dir('drools') { githubscm.checkoutIfExists('drools', changeAuthor, changeBranch, 'kiegroup', changeTarget, true) - sh '.ci/environments/update.sh quarkus-3' - getMavenCommand().withProperty('quickly').run('clean install') + util.runWithPythonVirtualEnv('.ci/environments/update.sh quarkus-3', 'swf') + util.runWithPythonVirtualEnv(getMavenCommand().withProperty('quickly').getFullRunCommand('clean install'), 'swf') } } } @@ -54,7 +54,7 @@ pipeline { 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' + util.runWithPythonVirtualEnv('.ci/environments/quarkus-3/before.sh rewrite', 'swf') } } } diff --git a/.ci/jenkins/Jenkinsfile.quarkus-3.rewrite.standalone b/.ci/jenkins/Jenkinsfile.quarkus-3.rewrite.standalone index 679b6b29ca0..ba3a900627e 100644 --- a/.ci/jenkins/Jenkinsfile.quarkus-3.rewrite.standalone +++ b/.ci/jenkins/Jenkinsfile.quarkus-3.rewrite.standalone @@ -59,8 +59,8 @@ pipeline { script { dir('drools') { githubscm.checkoutIfExists('drools', getGitAuthor(), getBuildBranch(), getBaseAuthor(), getBaseBranch(), true) - sh '.ci/environments/update.sh quarkus-3' - getMavenCommand().withProperty('quickly').run('clean install') + util.runWithPythonVirtualEnv('.ci/environments/update.sh quarkus-3', 'swf') + util.runWithPythonVirtualEnv(getMavenCommand().withProperty('quickly').getFullRunCommand('clean install'), 'swf') } } } @@ -73,7 +73,7 @@ pipeline { 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' + util.runWithPythonVirtualEnv('.ci/environments/quarkus-3/before.sh rewrite', 'swf') } } }