From dc20e8f619d844742dda1f23d110f192a70b1a74 Mon Sep 17 00:00:00 2001 From: Thomas Untoja Date: Mon, 13 Jun 2022 09:30:21 +0200 Subject: [PATCH 01/24] ci: update jenkinsfile --- Jenkinsfile | 34 ++++++++++++++++++++++++++-------- 1 file changed, 26 insertions(+), 8 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index c9a4619..ec1819e 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -8,6 +8,16 @@ def serie = '20.10' def maintenanceBranch = "${serie}.x" env.PROJECT='centreon-awie' +def checkoutCentreonBuild() { + dir('centreon-build') { + checkout resolveScm(source: [$class: 'GitSCMSource', + remote: 'https://github.com/centreon/centreon-build.git', + credentialsId: 'technique-ci', + traits: [[$class: 'jenkins.plugins.git.traits.BranchDiscoveryTrait']]], + targets: [env.BRANCH_NAME, 'master']) + } +} + if (env.BRANCH_NAME.startsWith('release-')) { env.BUILD = 'RELEASE' } else if ((env.BRANCH_NAME == 'master') || (env.BRANCH_NAME == maintenanceBranch)) { @@ -21,7 +31,8 @@ if (env.BRANCH_NAME.startsWith('release-')) { */ stage('Source') { node { - sh 'setup_centreon_build.sh' +# sh 'setup_centreon_build.sh' + checkoutCentreonBuild(buildBranch) dir('centreon-awie') { checkout scm } @@ -43,7 +54,8 @@ try { stage('Unit tests // RPM Packaging // Sonar analysis') { parallel 'unit tests centos7': { node { - sh 'setup_centreon_build.sh' +# sh 'setup_centreon_build.sh' + checkoutCentreonBuild(buildBranch) /* sh "./centreon-build/jobs/awie/${serie}/mon-awie-unittest.sh centos7" junit 'ut.xml' @@ -77,7 +89,8 @@ try { }, 'Packaging centos7': { node { - sh 'setup_centreon_build.sh' +# sh 'setup_centreon_build.sh' + checkoutCentreonBuild(buildBranch) sh "./centreon-build/jobs/awie/${serie}/mon-awie-package.sh centos7" archiveArtifacts artifacts: 'rpms-centos7.tar.gz' stash name: "rpms-centos7", includes: 'output/noarch/*.rpm' @@ -86,7 +99,8 @@ try { }, 'Packaging alma8': { node { - sh 'setup_centreon_build.sh' +# sh 'setup_centreon_build.sh' + checkoutCentreonBuild(buildBranch) sh "./centreon-build/jobs/awie/${serie}/mon-awie-package.sh alma8" archiveArtifacts artifacts: 'rpms-alma8.tar.gz' stash name: "rpms-alma8", includes: 'output/noarch/*.rpm' @@ -103,7 +117,8 @@ try { node { unstash 'rpms-alma8' unstash 'rpms-centos7' - sh 'setup_centreon_build.sh' +# sh 'setup_centreon_build.sh' + checkoutCentreonBuild(buildBranch) sh "./centreon-build/jobs/awie/${serie}/mon-awie-delivery.sh" } } @@ -115,7 +130,8 @@ try { stage('Docker creation') { parallel 'Docker centos7': { node { - sh 'setup_centreon_build.sh' +# sh 'setup_centreon_build.sh' + checkoutCentreonBuild(buildBranch) sh "./centreon-build/jobs/awie/${serie}/mon-awie-bundle.sh centos7" } } @@ -133,7 +149,8 @@ try { stage('Acceptance tests') { parallel 'centos7': { node { - sh 'setup_centreon_build.sh' +# sh 'setup_centreon_build.sh' + checkoutCentreonBuild(buildBranch) sh "./centreon-build/jobs/awie/${serie}/mon-awie-acceptance.sh centos7" junit 'xunit-reports/**/*.xml' if (currentBuild.result == 'UNSTABLE') @@ -159,7 +176,8 @@ try { if ((env.BUILD == 'RELEASE') || (env.BUILD == 'REFERENCE')) { stage('Delivery') { node { - sh 'setup_centreon_build.sh' +# sh 'setup_centreon_build.sh' + checkoutCentreonBuild(buildBranch) unstash 'rpms-centos7' // unstash 'rpms-centos8' sh "./centreon-build/jobs/awie/${serie}/mon-awie-delivery.sh" From 2ee51e73f43c0cec1aacef671594256197c8d09e Mon Sep 17 00:00:00 2001 From: Thomas Untoja Date: Mon, 13 Jun 2022 09:35:47 +0200 Subject: [PATCH 02/24] enable alma8 in Jenkinsfile --- Jenkinsfile | 38 ++++++++++++++++++++------------------ 1 file changed, 20 insertions(+), 18 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index ec1819e..8a86010 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -135,12 +135,13 @@ try { sh "./centreon-build/jobs/awie/${serie}/mon-awie-bundle.sh centos7" } } -// 'centos8': { -// node { -// sh 'setup_centreon_build.sh' -// sh "./centreon-build/jobs/awie/${serie}/mon-awie-bundle.sh centos8" -// } -// } + 'alma8': { + node { +# sh 'setup_centreon_build.sh' + checkoutCentreonBuild(buildBranch) + sh "./centreon-build/jobs/awie/${serie}/mon-awie-bundle.sh alma8" + } + } if ((currentBuild.result ?: 'SUCCESS') != 'SUCCESS') { error('Bundle stage failure.'); } @@ -158,16 +159,17 @@ try { archiveArtifacts allowEmptyArchive: true, artifacts: 'acceptance-logs/*.txt, acceptance-logs/*.png' } } -// 'centos8': { -// node { -// sh 'setup_centreon_build.sh' -// sh "./centreon-build/jobs/awie/${serie}/mon-awie-acceptance.sh centos8" -// junit 'xunit-reports/**/*.xml' -// if (currentBuild.result == 'UNSTABLE') -// currentBuild.result = 'FAILURE' -// archiveArtifacts allowEmptyArchive: true, artifacts: 'acceptance-logs/*.txt, acceptance-logs/*.png' -// } -// } + 'alma8': { + node { +# sh 'setup_centreon_build.sh' + checkoutCentreonBuild(buildBranch) + sh "./centreon-build/jobs/awie/${serie}/mon-awie-acceptance.sh alma8" + junit 'xunit-reports/**/*.xml' + if (currentBuild.result == 'UNSTABLE') + currentBuild.result = 'FAILURE' + archiveArtifacts allowEmptyArchive: true, artifacts: 'acceptance-logs/*.txt, acceptance-logs/*.png' + } + } if ((currentBuild.result ?: 'SUCCESS') != 'SUCCESS') { error('Acceptance tests stage failure.'); } @@ -179,7 +181,7 @@ try { # sh 'setup_centreon_build.sh' checkoutCentreonBuild(buildBranch) unstash 'rpms-centos7' -// unstash 'rpms-centos8' + unstash 'rpms-alma8' sh "./centreon-build/jobs/awie/${serie}/mon-awie-delivery.sh" } if ((currentBuild.result ?: 'SUCCESS') != 'SUCCESS') { @@ -192,4 +194,4 @@ try { slackSend channel: "#monitoring-metrology", color: "#F30031", message: "*FAILURE*: `CENTREON AWIE` <${env.BUILD_URL}|build #${env.BUILD_NUMBER}> on branch ${env.BRANCH_NAME}\n*COMMIT*: by ${source.COMMITTER}\n*INFO*: ${e}" } currentBuild.result = 'FAILURE' -} + From 9ffd701ccefafc2e84fc2631ca4e517abd9e550e Mon Sep 17 00:00:00 2001 From: tuntoja <58987095+tuntoja@users.noreply.github.com> Date: Mon, 13 Jun 2022 09:37:09 +0200 Subject: [PATCH 03/24] Update Jenkinsfile Co-authored-by: Kevin Duret --- Jenkinsfile | 1 - 1 file changed, 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 8a86010..45acd6c 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -31,7 +31,6 @@ if (env.BRANCH_NAME.startsWith('release-')) { */ stage('Source') { node { -# sh 'setup_centreon_build.sh' checkoutCentreonBuild(buildBranch) dir('centreon-awie') { checkout scm From 698a1cbfd93d944bc6e8dc45efe8f5eba23fbe18 Mon Sep 17 00:00:00 2001 From: tuntoja <58987095+tuntoja@users.noreply.github.com> Date: Mon, 13 Jun 2022 09:37:14 +0200 Subject: [PATCH 04/24] Update Jenkinsfile Co-authored-by: Kevin Duret --- Jenkinsfile | 1 - 1 file changed, 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 45acd6c..28bb0de 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -53,7 +53,6 @@ try { stage('Unit tests // RPM Packaging // Sonar analysis') { parallel 'unit tests centos7': { node { -# sh 'setup_centreon_build.sh' checkoutCentreonBuild(buildBranch) /* sh "./centreon-build/jobs/awie/${serie}/mon-awie-unittest.sh centos7" From aa9ef476d3b3182a4fcc553234fbb6e0db595ef1 Mon Sep 17 00:00:00 2001 From: tuntoja <58987095+tuntoja@users.noreply.github.com> Date: Mon, 13 Jun 2022 09:37:19 +0200 Subject: [PATCH 05/24] Update Jenkinsfile Co-authored-by: Kevin Duret --- Jenkinsfile | 1 - 1 file changed, 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 28bb0de..67436ff 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -87,7 +87,6 @@ try { }, 'Packaging centos7': { node { -# sh 'setup_centreon_build.sh' checkoutCentreonBuild(buildBranch) sh "./centreon-build/jobs/awie/${serie}/mon-awie-package.sh centos7" archiveArtifacts artifacts: 'rpms-centos7.tar.gz' From 65aa22fd8ddc2891eff2626075da938f8ddea141 Mon Sep 17 00:00:00 2001 From: tuntoja <58987095+tuntoja@users.noreply.github.com> Date: Mon, 13 Jun 2022 09:37:23 +0200 Subject: [PATCH 06/24] Update Jenkinsfile Co-authored-by: Kevin Duret --- Jenkinsfile | 1 - 1 file changed, 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 67436ff..fd79480 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -96,7 +96,6 @@ try { }, 'Packaging alma8': { node { -# sh 'setup_centreon_build.sh' checkoutCentreonBuild(buildBranch) sh "./centreon-build/jobs/awie/${serie}/mon-awie-package.sh alma8" archiveArtifacts artifacts: 'rpms-alma8.tar.gz' From 0d677eaf5bb187461d0463cc4be11e82bfa63031 Mon Sep 17 00:00:00 2001 From: tuntoja <58987095+tuntoja@users.noreply.github.com> Date: Mon, 13 Jun 2022 09:37:29 +0200 Subject: [PATCH 07/24] Update Jenkinsfile Co-authored-by: Kevin Duret --- Jenkinsfile | 1 - 1 file changed, 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index fd79480..974ab4a 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -113,7 +113,6 @@ try { node { unstash 'rpms-alma8' unstash 'rpms-centos7' -# sh 'setup_centreon_build.sh' checkoutCentreonBuild(buildBranch) sh "./centreon-build/jobs/awie/${serie}/mon-awie-delivery.sh" } From ec72fe5bf45350e69f41663a171bd930094e51f6 Mon Sep 17 00:00:00 2001 From: tuntoja <58987095+tuntoja@users.noreply.github.com> Date: Mon, 13 Jun 2022 09:37:37 +0200 Subject: [PATCH 08/24] Update Jenkinsfile Co-authored-by: Kevin Duret --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 974ab4a..0de24d1 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -96,7 +96,7 @@ try { }, 'Packaging alma8': { node { - checkoutCentreonBuild(buildBranch) + checkoutCentreonBuild() sh "./centreon-build/jobs/awie/${serie}/mon-awie-package.sh alma8" archiveArtifacts artifacts: 'rpms-alma8.tar.gz' stash name: "rpms-alma8", includes: 'output/noarch/*.rpm' From 244850ab88970bb32ad36208574ef93b47bb9f4a Mon Sep 17 00:00:00 2001 From: tuntoja <58987095+tuntoja@users.noreply.github.com> Date: Mon, 13 Jun 2022 09:37:41 +0200 Subject: [PATCH 09/24] Update Jenkinsfile Co-authored-by: Kevin Duret --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 0de24d1..a06aeb6 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -113,7 +113,7 @@ try { node { unstash 'rpms-alma8' unstash 'rpms-centos7' - checkoutCentreonBuild(buildBranch) + checkoutCentreonBuild() sh "./centreon-build/jobs/awie/${serie}/mon-awie-delivery.sh" } } From c7d1d37f99c4ba8448ad30c3a21c52d95fbdb0a1 Mon Sep 17 00:00:00 2001 From: tuntoja <58987095+tuntoja@users.noreply.github.com> Date: Mon, 13 Jun 2022 09:37:46 +0200 Subject: [PATCH 10/24] Update Jenkinsfile Co-authored-by: Kevin Duret --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index a06aeb6..ede6210 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -126,7 +126,7 @@ try { parallel 'Docker centos7': { node { # sh 'setup_centreon_build.sh' - checkoutCentreonBuild(buildBranch) + checkoutCentreonBuild() sh "./centreon-build/jobs/awie/${serie}/mon-awie-bundle.sh centos7" } } From 933383d4383d3582a5b6f9ad436d75a25f47a680 Mon Sep 17 00:00:00 2001 From: tuntoja <58987095+tuntoja@users.noreply.github.com> Date: Mon, 13 Jun 2022 09:37:50 +0200 Subject: [PATCH 11/24] Update Jenkinsfile Co-authored-by: Kevin Duret --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index ede6210..d6708cd 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -146,7 +146,7 @@ try { parallel 'centos7': { node { # sh 'setup_centreon_build.sh' - checkoutCentreonBuild(buildBranch) + checkoutCentreonBuild() sh "./centreon-build/jobs/awie/${serie}/mon-awie-acceptance.sh centos7" junit 'xunit-reports/**/*.xml' if (currentBuild.result == 'UNSTABLE') From 8aa4416d15e0253db56ad82714ad7d6767797681 Mon Sep 17 00:00:00 2001 From: tuntoja <58987095+tuntoja@users.noreply.github.com> Date: Mon, 13 Jun 2022 09:37:54 +0200 Subject: [PATCH 12/24] Update Jenkinsfile Co-authored-by: Kevin Duret --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index d6708cd..2913fea 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -174,7 +174,7 @@ try { stage('Delivery') { node { # sh 'setup_centreon_build.sh' - checkoutCentreonBuild(buildBranch) + checkoutCentreonBuild() unstash 'rpms-centos7' unstash 'rpms-alma8' sh "./centreon-build/jobs/awie/${serie}/mon-awie-delivery.sh" From 2bf72770940cadc17dcb2902641ece480966b205 Mon Sep 17 00:00:00 2001 From: tuntoja <58987095+tuntoja@users.noreply.github.com> Date: Mon, 13 Jun 2022 09:38:42 +0200 Subject: [PATCH 13/24] Update Jenkinsfile Co-authored-by: Charles Gautier <33026375+chgautier@users.noreply.github.com> --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 2913fea..5d613d0 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -157,7 +157,7 @@ try { 'alma8': { node { # sh 'setup_centreon_build.sh' - checkoutCentreonBuild(buildBranch) + checkoutCentreonBuild() sh "./centreon-build/jobs/awie/${serie}/mon-awie-acceptance.sh alma8" junit 'xunit-reports/**/*.xml' if (currentBuild.result == 'UNSTABLE') From e42925d954ca52fb70ae42264b43398fd8d92843 Mon Sep 17 00:00:00 2001 From: tuntoja <58987095+tuntoja@users.noreply.github.com> Date: Mon, 13 Jun 2022 09:39:41 +0200 Subject: [PATCH 14/24] Update Jenkinsfile Co-authored-by: Kevin Duret --- Jenkinsfile | 1 - 1 file changed, 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 5d613d0..25f336a 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -125,7 +125,6 @@ try { stage('Docker creation') { parallel 'Docker centos7': { node { -# sh 'setup_centreon_build.sh' checkoutCentreonBuild() sh "./centreon-build/jobs/awie/${serie}/mon-awie-bundle.sh centos7" } From cfb5ada4193c587d20f586a2dba9df8838f63e7f Mon Sep 17 00:00:00 2001 From: tuntoja <58987095+tuntoja@users.noreply.github.com> Date: Mon, 13 Jun 2022 09:39:48 +0200 Subject: [PATCH 15/24] Update Jenkinsfile Co-authored-by: Kevin Duret --- Jenkinsfile | 1 - 1 file changed, 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 25f336a..879551b 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -144,7 +144,6 @@ try { stage('Acceptance tests') { parallel 'centos7': { node { -# sh 'setup_centreon_build.sh' checkoutCentreonBuild() sh "./centreon-build/jobs/awie/${serie}/mon-awie-acceptance.sh centos7" junit 'xunit-reports/**/*.xml' From fa557dbcb885f5849f1cddf832bdc05717592e66 Mon Sep 17 00:00:00 2001 From: tuntoja <58987095+tuntoja@users.noreply.github.com> Date: Mon, 13 Jun 2022 09:39:54 +0200 Subject: [PATCH 16/24] Update Jenkinsfile Co-authored-by: Kevin Duret --- Jenkinsfile | 1 - 1 file changed, 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 879551b..f6929b0 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -171,7 +171,6 @@ try { if ((env.BUILD == 'RELEASE') || (env.BUILD == 'REFERENCE')) { stage('Delivery') { node { -# sh 'setup_centreon_build.sh' checkoutCentreonBuild() unstash 'rpms-centos7' unstash 'rpms-alma8' From 39633f5758abd5dfeddfde1e31b9aaf45045aca2 Mon Sep 17 00:00:00 2001 From: tuntoja <58987095+tuntoja@users.noreply.github.com> Date: Mon, 13 Jun 2022 09:40:02 +0200 Subject: [PATCH 17/24] Update Jenkinsfile Co-authored-by: Kevin Duret --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index f6929b0..ca548b0 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -31,7 +31,7 @@ if (env.BRANCH_NAME.startsWith('release-')) { */ stage('Source') { node { - checkoutCentreonBuild(buildBranch) + checkoutCentreonBuild() dir('centreon-awie') { checkout scm } From 920906a260ca57295ae74595e1136c3a357bd5c8 Mon Sep 17 00:00:00 2001 From: tuntoja <58987095+tuntoja@users.noreply.github.com> Date: Mon, 13 Jun 2022 09:40:08 +0200 Subject: [PATCH 18/24] Update Jenkinsfile Co-authored-by: Kevin Duret --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index ca548b0..7a9e84c 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -53,7 +53,7 @@ try { stage('Unit tests // RPM Packaging // Sonar analysis') { parallel 'unit tests centos7': { node { - checkoutCentreonBuild(buildBranch) + checkoutCentreonBuild() /* sh "./centreon-build/jobs/awie/${serie}/mon-awie-unittest.sh centos7" junit 'ut.xml' From 5dd37652de627f57ed3fdac372ea95a5c688f180 Mon Sep 17 00:00:00 2001 From: tuntoja <58987095+tuntoja@users.noreply.github.com> Date: Mon, 13 Jun 2022 09:40:16 +0200 Subject: [PATCH 19/24] Update Jenkinsfile Co-authored-by: Kevin Duret --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 7a9e84c..9244563 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -87,7 +87,7 @@ try { }, 'Packaging centos7': { node { - checkoutCentreonBuild(buildBranch) + checkoutCentreonBuild() sh "./centreon-build/jobs/awie/${serie}/mon-awie-package.sh centos7" archiveArtifacts artifacts: 'rpms-centos7.tar.gz' stash name: "rpms-centos7", includes: 'output/noarch/*.rpm' From e7164e55596b1c3df41e72f385097f90c86a5a73 Mon Sep 17 00:00:00 2001 From: tuntoja <58987095+tuntoja@users.noreply.github.com> Date: Mon, 13 Jun 2022 09:43:22 +0200 Subject: [PATCH 20/24] Update Jenkinsfile Co-authored-by: Kevin Duret --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 9244563..2635e75 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -186,4 +186,4 @@ try { slackSend channel: "#monitoring-metrology", color: "#F30031", message: "*FAILURE*: `CENTREON AWIE` <${env.BUILD_URL}|build #${env.BUILD_NUMBER}> on branch ${env.BRANCH_NAME}\n*COMMIT*: by ${source.COMMITTER}\n*INFO*: ${e}" } currentBuild.result = 'FAILURE' - +} From 548e5b2c9e4bd4eaaaf980119ff1146382139c89 Mon Sep 17 00:00:00 2001 From: tuntoja <58987095+tuntoja@users.noreply.github.com> Date: Mon, 13 Jun 2022 09:43:31 +0200 Subject: [PATCH 21/24] Update Jenkinsfile Co-authored-by: Kevin Duret --- Jenkinsfile | 1 - 1 file changed, 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 2635e75..0b28175 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -154,7 +154,6 @@ try { } 'alma8': { node { -# sh 'setup_centreon_build.sh' checkoutCentreonBuild() sh "./centreon-build/jobs/awie/${serie}/mon-awie-acceptance.sh alma8" junit 'xunit-reports/**/*.xml' From 6dc5564276048f66258e38bf4b9342d7d1f2d000 Mon Sep 17 00:00:00 2001 From: tuntoja <58987095+tuntoja@users.noreply.github.com> Date: Mon, 13 Jun 2022 09:43:36 +0200 Subject: [PATCH 22/24] Update Jenkinsfile Co-authored-by: Kevin Duret --- Jenkinsfile | 1 - 1 file changed, 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 0b28175..74a3f29 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -131,7 +131,6 @@ try { } 'alma8': { node { -# sh 'setup_centreon_build.sh' checkoutCentreonBuild(buildBranch) sh "./centreon-build/jobs/awie/${serie}/mon-awie-bundle.sh alma8" } From 28848f9fb21496d5a29124dc0094792837cf7b15 Mon Sep 17 00:00:00 2001 From: Thomas Untoja Date: Mon, 13 Jun 2022 09:45:23 +0200 Subject: [PATCH 23/24] remove remaining buildBranch --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 74a3f29..55fc9e7 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -131,7 +131,7 @@ try { } 'alma8': { node { - checkoutCentreonBuild(buildBranch) + checkoutCentreonBuild() sh "./centreon-build/jobs/awie/${serie}/mon-awie-bundle.sh alma8" } } From 0543efeb0705eb49eaeff1c4e73cf2b908657fb7 Mon Sep 17 00:00:00 2001 From: Thomas Untoja Date: Mon, 13 Jun 2022 09:55:16 +0200 Subject: [PATCH 24/24] fix jenkinsfile syntax --- Jenkinsfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 55fc9e7..d7e35e8 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -128,7 +128,7 @@ try { checkoutCentreonBuild() sh "./centreon-build/jobs/awie/${serie}/mon-awie-bundle.sh centos7" } - } + }, 'alma8': { node { checkoutCentreonBuild() @@ -150,7 +150,7 @@ try { currentBuild.result = 'FAILURE' archiveArtifacts allowEmptyArchive: true, artifacts: 'acceptance-logs/*.txt, acceptance-logs/*.png' } - } + }, 'alma8': { node { checkoutCentreonBuild()