Skip to content
This repository was archived by the owner on Apr 25, 2024. It is now read-only.

Commit 865dd87

Browse files
committed
fix running ITs
Signed-off-by: Olivier Lamy <olamy@apache.org>
1 parent 5bd980a commit 865dd87

2 files changed

Lines changed: 7 additions & 5 deletions

File tree

Jenkinsfile-itest

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,7 @@ pipeline {
7070
withMaven(maven: buildMvn, jdk: buildJdk,
7171
mavenSettingsConfig: deploySettings,
7272
mavenLocalRepo: localRepository,
73+
publisherStrategy: 'EXPLICIT',
7374
options: [concordionPublisher(disabled: true), dependenciesFingerprintPublisher(disabled: true),
7475
findbugsPublisher(disabled: true), artifactsPublisher(disabled: true),
7576
invokerPublisher(disabled: true), jgivenPublisher(disabled: true),
@@ -91,7 +92,7 @@ pipeline {
9192
// -Dmaven.compiler.fork=true: Compile in a separate forked process
9293
// -Pci-server: Profile for CI-Server
9394
// -Pit-js: Run the selenium test
94-
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"
95+
sh "mvn clean verify -B -V -U -e -fae -DmaxWaitTimeInMs=2000 -Pci-server -Pit-js -DtrimStackTrace=false -Djava.io.tmpdir=.tmp -pl :archiva-webapp-test"
9596

9697
}
9798
}
@@ -116,11 +117,12 @@ pipeline {
116117
}
117118
steps {
118119
timeout(120) {
119-
withCredentials([[$class : 'UsernamePasswordMultiBinding', credentialsId: DOCKERHUB_CREDS,
120+
withCredentials([[$class : 'UsernamePasswordMultiBinding', credentialsId: DOCKERHUB_CREDS,
120121
usernameVariable: 'DOCKER_HUB_USER', passwordVariable: 'DOCKER_HUB_PW']]) {
121122
withMaven(maven: buildMvn, jdk: buildJdk,
122123
mavenSettingsConfig: deploySettings,
123124
mavenLocalRepo: localRepository,
125+
publisherStrategy: 'EXPLICIT',
124126
options: [concordionPublisher(disabled: true), dependenciesFingerprintPublisher(disabled: true),
125127
findbugsPublisher(disabled: true), artifactsPublisher(disabled: true),
126128
invokerPublisher(disabled: true), jgivenPublisher(disabled: true),

archiva-modules/archiva-web/archiva-webapp-test/pom.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -396,7 +396,7 @@
396396
<plugin>
397397
<groupId>org.apache.maven.plugins</groupId>
398398
<artifactId>maven-failsafe-plugin</artifactId>
399-
<version>2.20</version>
399+
<version>2.22.2</version>
400400
<configuration>
401401
<redirectTestOutputToFile>false</redirectTestOutputToFile>
402402
<runOrder>alphabetical</runOrder>
@@ -483,7 +483,7 @@
483483
<goal>run</goal>
484484
</goals>
485485
<configuration>
486-
<tasks>
486+
<target>
487487
<copy overwrite="true" todir="${webappDirectory}/WEB-INF/classes">
488488
<fileset dir="src/test/resources/logging"/>
489489
</copy>
@@ -517,7 +517,7 @@
517517
<copy todir="${project.build.directory}/errorshtmlsnap/images">
518518
<fileset dir="${webappDirectory}/images"/>
519519
</copy>
520-
</tasks>
520+
</target>
521521
</configuration>
522522
</execution>
523523
</executions>

0 commit comments

Comments
 (0)