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

fix running ITs 

Signed-off-by: Olivier Lamy <olamy@apache.org>
This commit is contained in:
Olivier Lamy 2022-04-11 15:38:49 +10:00
parent 5bd980a7d5
commit 865dd8751b
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Jenkinsfile-itest
View File

@ -70,6 +70,7 @@ pipeline {
withMaven(maven: buildMvn, jdk: buildJdk, withMaven(maven: buildMvn, jdk: buildJdk,
mavenSettingsConfig: deploySettings, mavenSettingsConfig: deploySettings,
mavenLocalRepo: localRepository, mavenLocalRepo: localRepository,
publisherStrategy: 'EXPLICIT',
options: [concordionPublisher(disabled: true), dependenciesFingerprintPublisher(disabled: true), options: [concordionPublisher(disabled: true), dependenciesFingerprintPublisher(disabled: true),
findbugsPublisher(disabled: true), artifactsPublisher(disabled: true), findbugsPublisher(disabled: true), artifactsPublisher(disabled: true),
invokerPublisher(disabled: true), jgivenPublisher(disabled: true), invokerPublisher(disabled: true), jgivenPublisher(disabled: true),
@ -91,7 +92,7 @@ pipeline {
// -Dmaven.compiler.fork=true: Compile in a separate forked process // -Dmaven.compiler.fork=true: Compile in a separate forked process
// -Pci-server: Profile for CI-Server // -Pci-server: Profile for CI-Server
// -Pit-js: Run the selenium test // -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 { steps {
timeout(120) { timeout(120) {
withCredentials([[$class : 'UsernamePasswordMultiBinding', credentialsId: DOCKERHUB_CREDS, withCredentials([[$class : 'UsernamePasswordMultiBinding', credentialsId: DOCKERHUB_CREDS,
usernameVariable: 'DOCKER_HUB_USER', passwordVariable: 'DOCKER_HUB_PW']]) { usernameVariable: 'DOCKER_HUB_USER', passwordVariable: 'DOCKER_HUB_PW']]) {
withMaven(maven: buildMvn, jdk: buildJdk, withMaven(maven: buildMvn, jdk: buildJdk,
mavenSettingsConfig: deploySettings, mavenSettingsConfig: deploySettings,
mavenLocalRepo: localRepository, mavenLocalRepo: localRepository,
publisherStrategy: 'EXPLICIT',
options: [concordionPublisher(disabled: true), dependenciesFingerprintPublisher(disabled: true), options: [concordionPublisher(disabled: true), dependenciesFingerprintPublisher(disabled: true),
findbugsPublisher(disabled: true), artifactsPublisher(disabled: true), findbugsPublisher(disabled: true), artifactsPublisher(disabled: true),
invokerPublisher(disabled: true), jgivenPublisher(disabled: true), invokerPublisher(disabled: true), jgivenPublisher(disabled: true),

6
archiva-modules/archiva-web/archiva-webapp-test/pom.xml
View File

@ -396,7 +396,7 @@
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId> <artifactId>maven-failsafe-plugin</artifactId>
<version>2.20</version> <version>2.22.2</version>
<configuration> <configuration>
<redirectTestOutputToFile>false</redirectTestOutputToFile> <redirectTestOutputToFile>false</redirectTestOutputToFile>
<runOrder>alphabetical</runOrder> <runOrder>alphabetical</runOrder>
@ -483,7 +483,7 @@
<goal>run</goal> <goal>run</goal>
</goals> </goals>
<configuration> <configuration>
<tasks> <target>
<copy overwrite="true" todir="${webappDirectory}/WEB-INF/classes"> <copy overwrite="true" todir="${webappDirectory}/WEB-INF/classes">
<fileset dir="src/test/resources/logging"/> <fileset dir="src/test/resources/logging"/>
</copy> </copy>
@ -517,7 +517,7 @@
<copy todir="${project.build.directory}/errorshtmlsnap/images"> <copy todir="${project.build.directory}/errorshtmlsnap/images">
<fileset dir="${webappDirectory}/images"/> <fileset dir="${webappDirectory}/images"/>
</copy> </copy>
</tasks> </target>
</configuration> </configuration>
</execution> </execution>
</executions> </executions>