diff --git a/Jenkinsfile b/Jenkinsfile index bc2fc761c1..f27f382daa 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -62,7 +62,8 @@ pipeline { // in parallel with check? stage('Integration Tests') { steps { - gradle 'integrationTest' + // TODO remove obligatory rerun flag when flappy tests have been fixed + gradle '-PrerunIntegrationTests integrationTest' junit allowEmptyResults: true, testResults: 'scm-it/build/test-results/javaIntegrationTests/*.xml,scm-ui/build/reports/e2e/*.xml' archiveArtifacts allowEmptyArchive: true, artifacts: 'scm-ui/e2e-tests/cypress/videos/*.mp4' archiveArtifacts allowEmptyArchive: true, artifacts: 'scm-ui/e2e-tests/cypress/screenshots/**/*.png' diff --git a/scm-it/build.gradle b/scm-it/build.gradle index 83d2c6167e..2ff3db4dee 100644 --- a/scm-it/build.gradle +++ b/scm-it/build.gradle @@ -78,6 +78,7 @@ task javaIntegrationTests(type: Test) { include '**/*ITCase.class' exclude '**/*Test.class' ignoreFailures = project.isCI + outputs.upToDateWhen { !project.hasProperty('rerunIntegrationTests') } finalizedBy = ['stopScmServer'] dependsOn 'test', 'startScmServer'