Commit 4c9d06bd authored by Laurent Pinsivy's avatar Laurent Pinsivy Committed by Thomas Untoja
Browse files

fixed conflict on enabled el8 Jenkinsfile

parent 6a441413
......@@ -277,17 +277,17 @@ try {
stash name: "rpms-centos7", includes: 'output/noarch/*.rpm'
sh 'rm -rf output'
}
},
'rpm packaging alma8': {
node {
checkoutCentreonBuild()
unstash 'tar-sources'
sh "./centreon-build/jobs/web/${serie}/mon-web-package.sh alma8"
archiveArtifacts artifacts: "rpms-alma8.tar.gz"
stash name: "rpms-alma8", includes: 'output/noarch/*.rpm'
sh 'rm -rf output'
}
}
// 'rpm packaging centos8': {
// node {
// checkoutCentreonBuild()
// unstash 'tar-sources'
// sh "./centreon-build/jobs/web/${serie}/mon-web-package.sh centos8"
// archiveArtifacts artifacts: "rpms-centos8.tar.gz"
// stash name: "rpms-centos8", includes: 'output/noarch/*.rpm'
// sh 'rm -rf output'
// }
// }
if ((currentBuild.result ?: 'SUCCESS') != 'SUCCESS') {
error('Unit tests // RPM Packaging Failure');
}
......@@ -333,7 +333,7 @@ try {
sh 'rm -rf output'
unstash 'tar-sources'
unstash 'api-doc'
// unstash 'rpms-centos8'
unstash 'rpms-alma8'
unstash 'rpms-centos7'
sh "./centreon-build/jobs/web/${serie}/mon-web-delivery.sh"
}
......@@ -344,8 +344,7 @@ try {
stage("$DOCKER_STAGE") {
def parallelSteps = [:]
// def osBuilds = isStableBuild() ? ['centos7', 'centos8'] : ['centos7']
def osBuilds = ['centos7']
def osBuilds = isStableBuild() ? ['centos7', 'alma8'] : ['centos7']
for (x in osBuilds) {
def osBuild = x
parallelSteps[osBuild] = {
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment