diff options
| author | Andreas Beeker <kiwiwings@apache.org> | 2019-11-13 00:00:26 +0000 |
|---|---|---|
| committer | Andreas Beeker <kiwiwings@apache.org> | 2019-11-13 00:00:26 +0000 |
| commit | 6dfb927936e28c62da08c42c9a0471436057db2b (patch) | |
| tree | 6c00e88e1e95283deb347706158833e726d3413a /jenkins | |
| parent | 435efd4d4e10380a9e7ce18f7fe287bc90beb839 (diff) | |
| download | poi-6dfb927936e28c62da08c42c9a0471436057db2b.tar.gz poi-6dfb927936e28c62da08c42c9a0471436057db2b.zip | |
replace withCredentials with credentialBindings
git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1869715 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'jenkins')
| -rw-r--r-- | jenkins/create_jobs.groovy | 63 |
1 files changed, 31 insertions, 32 deletions
diff --git a/jenkins/create_jobs.groovy b/jenkins/create_jobs.groovy index 05413d9a4e..fe906e5734 100644 --- a/jenkins/create_jobs.groovy +++ b/jenkins/create_jobs.groovy @@ -229,6 +229,9 @@ poijobs.each { poijob -> includePattern('**/ooxml-lib/ooxml*.jar') } if(poijob.sonar) { + credentialsBinding { + string('POI_SONAR_TOKEN', 'sonarcloud-poi') + } configure { project -> project / buildWrappers << 'hudson.plugins.sonar.SonarBuildWrapper' {} } @@ -286,31 +289,29 @@ poijobs.each { poijob -> // Create steps and publishers depending on the type of Job that is selected if(poijob.maven) { steps { - withCredentials(bindings: [string(credentialsId: 'sonarcloud-poi', variable: 'SONAR_TOKEN')]) { - shellEx(delegate, shellcmds, poijob) - maven { - goals('clean') - rootPOM('sonar/pom.xml') - localRepository(LocalRepositoryLocation.LOCAL_TO_WORKSPACE) - mavenInstallation(defaultMaven) - } - /* Currently not done, let's see if it is still necessary: - # Maven-Download fails for strange reasons, try to workaround... - mkdir -p sonar/ooxml-schema-security/target/schemas && wget -O sonar/ooxml-schema-security/target/schemas/xmldsig-core-schema.xsd http://www.w3.org/TR/2002/REC-xmldsig-core-20020212/xmldsig-core-schema.xsd - */ - maven { - if (poijob.sonar) { - goals('compile sonar:sonar -Dsonar.login=${SONAR_TOKEN} ' + sonarOptions) - } else { - goals('package') - } - rootPOM('sonar/pom.xml') - mavenOpts('-Xmx2g') - mavenOpts('-Xms256m') - mavenOpts('-XX:-OmitStackTraceInFastThrow') - localRepository(LocalRepositoryLocation.LOCAL_TO_WORKSPACE) - mavenInstallation(defaultMaven) + shellEx(delegate, shellcmds, poijob) + maven { + goals('clean') + rootPOM('sonar/pom.xml') + localRepository(LocalRepositoryLocation.LOCAL_TO_WORKSPACE) + mavenInstallation(defaultMaven) + } + /* Currently not done, let's see if it is still necessary: + # Maven-Download fails for strange reasons, try to workaround... + mkdir -p sonar/ooxml-schema-security/target/schemas && wget -O sonar/ooxml-schema-security/target/schemas/xmldsig-core-schema.xsd http://www.w3.org/TR/2002/REC-xmldsig-core-20020212/xmldsig-core-schema.xsd + */ + maven { + if (poijob.sonar) { + goals('compile sonar:sonar -Dsonar.login=${POI_SONAR_TOKEN} ' + sonarOptions) + } else { + goals('package') } + rootPOM('sonar/pom.xml') + mavenOpts('-Xmx2g') + mavenOpts('-Xms256m') + mavenOpts('-XX:-OmitStackTraceInFastThrow') + localRepository(LocalRepositoryLocation.LOCAL_TO_WORKSPACE) + mavenInstallation(defaultMaven) } } publishers { @@ -367,15 +368,13 @@ poijobs.each { poijob -> } } else if(poijob.sonar) { steps { - withCredentials(bindings: [string(credentialsId: 'sonarcloud-poi', variable: 'SONAR_TOKEN')]) { - shellEx(delegate, shellcmds, poijob) + shellEx(delegate, shellcmds, poijob) - gradle { - switches('-PenableSonar') - switches('-Dsonar.login=${SONAR_TOKEN} ' + sonarOptions) - tasks('sonarqube') - useWrapper(false) - } + gradle { + switches('-PenableSonar') + switches('-Dsonar.login=${POI_SONAR_TOKEN} ' + sonarOptions) + tasks('sonarqube') + useWrapper(false) } } publishers { |