Apache
/
archiva
mirror of https://github.com/apache/archiva.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixing JDK and maven labels for build

This commit is contained in:
Martin Stockhammer 2020-10-23 17:06:07 +02:00
parent 61a94c93a5
commit 06671e010e
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Jenkinsfile vendored
View File

@ -28,11 +28,11 @@
* Only the war and zip artifacts are archived in the jenkins build archive. * Only the war and zip artifacts are archived in the jenkins build archive.
*/ */
LABEL = 'ubuntu && !H23' LABEL = 'ubuntu && !H23'
buildJdk = 'JDK 1.8 (latest)' buildJdk = 'jdk_1.8_latest'
buildJdk9 = 'JDK 1.9 (latest)' buildJdk9 = 'jdk_1.9_latest'
buildJdk10 = 'JDK 10 (latest)' buildJdk10 = 'jdk_10_latest'
buildJdk11 = 'JDK 11 (latest)' buildJdk11 = 'jdk_11_latest'
buildMvn = 'Maven 3.5.4' buildMvn = 'maven_3.5.4'
//localRepository = ".repository" //localRepository = ".repository"
//localRepository = "../.maven_repositories/${env.EXECUTOR_NUMBER}" //localRepository = "../.maven_repositories/${env.EXECUTOR_NUMBER}"
mavenOpts = '-Xms1g -Xmx2g -Djava.awt.headless=true' mavenOpts = '-Xms1g -Xmx2g -Djava.awt.headless=true'

4
Jenkinsfile-itest
View File

@ -25,8 +25,8 @@
*/ */
LABEL = 'ubuntu' LABEL = 'ubuntu'
buildJdk = 'JDK 1.8 (latest)' buildJdk = 'jdk_1.8_latest'
buildMvn = 'Maven 3.5.4' buildMvn = 'maven_3.5.4'
deploySettings = 'archiva-uid-jenkins' deploySettings = 'archiva-uid-jenkins'
DOCKERHUB_CREDS = 'c725478f-9125-460a-900f-1da562e51026' DOCKERHUB_CREDS = 'c725478f-9125-460a-900f-1da562e51026'
//localRepository = ".repository" //localRepository = ".repository"