diff options
| author | Olivier Lamy <olamy@apache.org> | 2022-04-11 15:38:49 +1000 |
|---|---|---|
| committer | Olivier Lamy <olamy@apache.org> | 2022-04-11 15:38:49 +1000 |
| commit | 865dd8751b7b11dc4d3a022a30f650dd646006ea (patch) | |
| tree | e1cf1fe72d9a2a70be8ffea8ee7bc797304d0e22 | |
| parent | 5bd980a7d5e5488d115ef7826ac02479c27d5932 (diff) | |
| download | archiva-865dd8751b7b11dc4d3a022a30f650dd646006ea.tar.gz archiva-865dd8751b7b11dc4d3a022a30f650dd646006ea.zip | |
fix running ITs
Signed-off-by: Olivier Lamy <olamy@apache.org>
| -rw-r--r-- | Jenkinsfile-itest | 6 | ||||
| -rw-r--r-- | archiva-modules/archiva-web/archiva-webapp-test/pom.xml | 6 |
2 files changed, 7 insertions, 5 deletions
diff --git a/Jenkinsfile-itest b/Jenkinsfile-itest index 3edd96e27..240f3a916 100644 --- a/Jenkinsfile-itest +++ b/Jenkinsfile-itest @@ -70,6 +70,7 @@ pipeline { withMaven(maven: buildMvn, jdk: buildJdk, mavenSettingsConfig: deploySettings, mavenLocalRepo: localRepository, + publisherStrategy: 'EXPLICIT', options: [concordionPublisher(disabled: true), dependenciesFingerprintPublisher(disabled: true), findbugsPublisher(disabled: true), artifactsPublisher(disabled: true), invokerPublisher(disabled: true), jgivenPublisher(disabled: true), @@ -91,7 +92,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 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" + 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" } } @@ -116,11 +117,12 @@ pipeline { } steps { timeout(120) { - withCredentials([[$class : 'UsernamePasswordMultiBinding', credentialsId: DOCKERHUB_CREDS, + withCredentials([[$class : 'UsernamePasswordMultiBinding', credentialsId: DOCKERHUB_CREDS, usernameVariable: 'DOCKER_HUB_USER', passwordVariable: 'DOCKER_HUB_PW']]) { withMaven(maven: buildMvn, jdk: buildJdk, mavenSettingsConfig: deploySettings, mavenLocalRepo: localRepository, + publisherStrategy: 'EXPLICIT', options: [concordionPublisher(disabled: true), dependenciesFingerprintPublisher(disabled: true), findbugsPublisher(disabled: true), artifactsPublisher(disabled: true), invokerPublisher(disabled: true), jgivenPublisher(disabled: true), diff --git a/archiva-modules/archiva-web/archiva-webapp-test/pom.xml b/archiva-modules/archiva-web/archiva-webapp-test/pom.xml index cf471a304..342654369 100644 --- a/archiva-modules/archiva-web/archiva-webapp-test/pom.xml +++ b/archiva-modules/archiva-web/archiva-webapp-test/pom.xml @@ -396,7 +396,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-failsafe-plugin</artifactId> - <version>2.20</version> + <version>2.22.2</version> <configuration> <redirectTestOutputToFile>false</redirectTestOutputToFile> <runOrder>alphabetical</runOrder> @@ -483,7 +483,7 @@ <goal>run</goal> </goals> <configuration> - <tasks> + <target> <copy overwrite="true" todir="${webappDirectory}/WEB-INF/classes"> <fileset dir="src/test/resources/logging"/> </copy> @@ -517,7 +517,7 @@ <copy todir="${project.build.directory}/errorshtmlsnap/images"> <fileset dir="${webappDirectory}/images"/> </copy> - </tasks> + </target> </configuration> </execution> </executions> |