diff options
| author | Martin Stockhammer <martin_s@apache.org> | 2018-11-01 19:08:44 +0100 |
|---|---|---|
| committer | Martin Stockhammer <martin_s@apache.org> | 2018-11-03 15:54:31 +0100 |
| commit | d8b6d1ce007971e3a3674fd4ce423ae5855881ec (patch) | |
| tree | 03219e1c1ac7223ffcff4e98a0f4b49bbfa47a51 /Jenkinsfile-itest | |
| parent | 88c991837adf37905c031ef75187f345f9998245 (diff) | |
| download | archiva-d8b6d1ce007971e3a3674fd4ce423ae5855881ec.tar.gz archiva-d8b6d1ce007971e3a3674fd4ce423ae5855881ec.zip | |
Changing ci pipeline settings
Better isolation of workspaces and repositories
Diffstat (limited to 'Jenkinsfile-itest')
| -rw-r--r-- | Jenkinsfile-itest | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/Jenkinsfile-itest b/Jenkinsfile-itest index 075741432..9a45ea47a 100644 --- a/Jenkinsfile-itest +++ b/Jenkinsfile-itest @@ -29,6 +29,7 @@ buildJdk = 'JDK 1.8 (latest)' buildMvn = 'Maven 3.5.2' deploySettings = 'archiva-uid-jenkins' DOCKERHUB_CREDS = '10a5f89e-504b-11e8-945d-7fd7b29cc41c' +localRepository = "../.archiva-master-repository" pipeline { agent { @@ -57,7 +58,7 @@ pipeline { timeout(120) { withMaven(maven: buildMvn, jdk: buildJdk, mavenSettingsConfig: deploySettings, - mavenLocalRepo: ".repository", + mavenLocalRepo: localRepository, options: [concordionPublisher(disabled: true), dependenciesFingerprintPublisher(disabled: true), findbugsPublisher(disabled: true), artifactsPublisher(disabled: true), invokerPublisher(disabled: true), jgivenPublisher(disabled: true), @@ -79,8 +80,7 @@ pipeline { // -Dmaven.compiler.fork=true: Compile in a separate forked process // -Pci-server: Profile for CI-Server // -Pit-js: Run the selenium test - sh "mvn clean install -B -U -Dmaven.test.skip=true -T2" - sh "mvn clean install -B -V -U -e -fae -Dmaven.compiler.fork=true -DmaxWaitTimeInMs=2000 -Pci-server -Pit-js -DtrimStackTrace=false -Djava.io.tmpdir=.tmp -pl :archiva-webapp-test" + sh "mvn clean verify -B -V -U -e -fae -Dmaven.compiler.fork=true -DmaxWaitTimeInMs=2000 -Pci-server -Pit-js -DtrimStackTrace=false -Djava.io.tmpdir=.tmp -pl :archiva-webapp-test" } } @@ -104,7 +104,7 @@ pipeline { usernameVariable: 'DOCKER_HUB_USER', passwordVariable: 'DOCKER_HUB_PW']]) { withMaven(maven: buildMvn, jdk: buildJdk, mavenSettingsConfig: deploySettings, - mavenLocalRepo: ".repository", + mavenLocalRepo: localRepository, options: [concordionPublisher(disabled: true), dependenciesFingerprintPublisher(disabled: true), findbugsPublisher(disabled: true), artifactsPublisher(disabled: true), invokerPublisher(disabled: true), jgivenPublisher(disabled: true), @@ -128,7 +128,7 @@ pipeline { // -Pci-server: Profile for CI Server // -Pit-js: Runs the Selenium tests // -Pchrome: Activates the Selenium Chrome Test Agent - sh "mvn clean install -B -V -U -e -fae -Dmaven.compiler.fork=true -DmaxWaitTimeInMs=2000 -DseleniumRemote=true -Pci-server -Pit-js -Pchrome -pl :archiva-webapp-test -DtrimStackTrace=false" + sh "mvn verify -B -V -e -fae -Dmaven.compiler.fork=true -DmaxWaitTimeInMs=2000 -DseleniumRemote=true -Pci-server -Pit-js -Pchrome -pl :archiva-webapp-test -DtrimStackTrace=false" } } } |