From 99aaab995fa8c83ee7e7e6fd965b3e6d8784b17a Mon Sep 17 00:00:00 2001 From: Zakaria GUENNOUNE Date: Fri, 17 Jun 2022 12:15:51 +0200 Subject: [PATCH] sorry guys --- Jenkinsfile | 32 ++++++++------------------------ 1 file changed, 8 insertions(+), 24 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 8e5ce9a66ec..e7a8baea1cd 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -33,7 +33,9 @@ def backendFiles = [ 'Jenkinsfile', 'sonar-project.properties', '**/*.php', - 'www/**/*.js', + 'www/include/**/*.js', + 'www/class/**/*.js', + 'www/lib/**/*.js', '**/*.sh', 'composer.*', 'symfony.lock', @@ -306,7 +308,7 @@ try { checkout scm } sh 'rm -rf *.deb' - sh 'docker run -i --entrypoint /src/centreon/ci/scripts/centreon-deb-package.sh -w "/src" -v "$PWD:/src" -e DISTRIB="bullseye" -e VERSION=$VERSION -e RELEASE=$RELEASE registry.centreon.com/centreon-debian11-dependencies:22.04' + sh 'docker run -i --entrypoint /src/centreon/ci/scripts/centreon-deb-package.sh -w "/src" -v "$PWD:/src" -e DISTRIB="bullseye" -e VERSION=$VERSION -e RELEASE=$RELEASE registry.centreon.com/centreon-debian11-dependencies:22.10' stash name: 'Debian11', includes: '*.deb' archiveArtifacts artifacts: "*" sh 'rm -rf *.deb' @@ -345,27 +347,9 @@ try { ]) } - stage("$DELIVERY_STAGE") { - node { - checkoutCentreonBuild() - sh 'rm -rf output' - unstash 'tar-sources' - unstash 'api-doc' - unstash 'rpms-alma8' - unstash 'rpms-centos7' - sh "./centreon-build/jobs/web/${serie}/mon-web-delivery.sh" - withCredentials([usernamePassword(credentialsId: 'nexus-credentials', passwordVariable: 'NEXUS_PASSWORD', usernameVariable: 'NEXUS_USERNAME')]) { - checkout scm - unstash "Debian11" - sh '''for i in $(echo *.deb) - do - curl -u $NEXUS_USERNAME:$NEXUS_PASSWORD -H "Content-Type: multipart/form-data" --data-binary "@./$i" https://apt.centreon.com/repository/22.04-$REPO/ - done - ''' - } - } - if ((currentBuild.result ?: 'SUCCESS') != 'SUCCESS') { - error('Delivery stage failure'); + if ((currentBuild.result ?: 'SUCCESS') != 'SUCCESS') { + error("Reports stage failure"); + } } } @@ -464,7 +448,7 @@ try { } stage('Acceptance tests') { - if (hasBackendChanges || hasFrontendChanges) { + if (hasBackendChanges) { def atparallelSteps = [:] for (x in featureFiles) { def feature = x