This is an automated email from the ASF dual-hosted git repository. martin_s pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/archiva.git
The following commit(s) were added to refs/heads/master by this push: new 40bb3fd Fixing report handling and trigger from master build 40bb3fd is described below commit 40bb3fd7bea2828e63205e57c35bd5d90a32746e Author: Martin Stockhammer <marti...@apache.org> AuthorDate: Sat May 5 20:47:47 2018 +0200 Fixing report handling and trigger from master build --- Jenkinsfile | 9 ++++++++- Jenkinsfile-itest | 29 +++++++++++------------------ 2 files changed, 19 insertions(+), 19 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 29cf71f..e3ffc01 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -31,6 +31,7 @@ LABEL = 'ubuntu' buildJdk = 'JDK 1.8 (latest)' buildMvn = 'Maven 3.5.2' deploySettings = 'DefaultMavenSettingsProvider.1331204114925' +INTEGRATION_PIPELINE = "Archiva-IntegrationTests-Gitbox" pipeline { agent { @@ -54,7 +55,7 @@ pipeline { } } - stage('Build') { + stage('BuildAndDeploy') { steps { timeout(120) { withMaven(maven: buildMvn, jdk: buildJdk, @@ -105,6 +106,12 @@ pipeline { } } + + stage('IntegrationTest') { + steps { + build(job:"${INTEGRATION_PIPELINE}/archiva/${env.BRANCH_NAME}", propagate:false, quietPeriod:10) + } + } post { unstable { notifyBuild("Unstable Build (${currentBuild.currentResult})") diff --git a/Jenkinsfile-itest b/Jenkinsfile-itest index fcfef19..7512131 100644 --- a/Jenkinsfile-itest +++ b/Jenkinsfile-itest @@ -86,15 +86,7 @@ pipeline { } post { always { - junit testResults: '**/target/surefire-reports/TEST-*.xml' - } - success { - script { - def previousResult = currentBuild.previousBuild?.result - if (previousResult && !currentBuild.isWorseOrEqual(previousResult)) { - notifyBuild("Fixed: ${currentBuild.currentResult}") - } - } + junit testResults: '**/target/failsafe-reports/TEST-*.xml' } failure { notifyBuild("Build / Test failure (${currentBuild.currentResult})") @@ -144,15 +136,7 @@ pipeline { post { always { sh "src/ci/scripts/container_webtest.sh stop" - junit testResults: '**/target/surefire-reports/TEST-*.xml' - } - success { - script { - def previousResult = currentBuild.previousBuild?.result - if (previousResult && !currentBuild.isWorseOrEqual(previousResult)) { - notifyBuild("Fixed: ${currentBuild.currentResult}") - } - } + junit testResults: '**/target/failsafe-reports/TEST-*.xml' } failure { notifyBuild("Build / Test failure (${currentBuild.currentResult})") @@ -168,6 +152,15 @@ pipeline { always { cleanWs deleteDirs: true, notFailBuild: true, patterns: [[pattern: '.repository', type: 'EXCLUDE']] } + success { + script { + def previousResult = currentBuild.previousBuild?.result + if (previousResult && !currentBuild.isWorseOrEqual(previousResult)) { + notifyBuild("Fixed: ${currentBuild.currentResult}") + } + } + } + } } -- To stop receiving notification emails like this one, please contact marti...@apache.org.