From 9d8d8fcec1c28fb4b0c64441c7396b971fba672b Mon Sep 17 00:00:00 2001 From: Andrea Ceccanti Date: Mon, 29 Nov 2021 17:30:17 +0100 Subject: [PATCH] Restructure jenkins build To remove docker build (we rely on the GH actions build for that). --- Jenkinsfile | 156 +--------------------------------------------------- 1 file changed, 1 insertion(+), 155 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index f5aa44ab5..ded9ba8f7 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -104,123 +104,7 @@ pipeline { } } - stage('PR analysis'){ - when{ - allOf{ - anyOf { - expression { return params.RUN_SONAR } - } - expression{ env.CHANGE_URL } - not { - expression { return params.SKIP_TESTS } - } - } - } - steps { - script{ - def tokens = "${env.CHANGE_URL}".tokenize('/') - def organization = tokens[tokens.size()-4] - def repo = tokens[tokens.size()-3] - - withCredentials([string(credentialsId: '630f8e6c-0d31-4f96-8d82-a1ef536ef059', variable: 'GITHUB_ACCESS_TOKEN')]) { - withSonarQubeEnv('sonarcloud.io'){ - sh """ - mvn -B -U install sonar:sonar \\ - -Dsonar.github.pullRequest=${env.CHANGE_ID} \\ - -Dsonar.github.repository=${organization}/${repo} \\ - -Dsonar.github.oauth=${GITHUB_ACCESS_TOKEN} \\ - -Dsonar.host.url=${SONAR_HOST_URL} \\ - -Dsonar.login=${SONAR_AUTH_TOKEN} \\ - -Dsonar.branch.name=${BRANCH_NAME} \\ - -Dsonar.branch.target=develop \\ - -Dsonar.projectKey=indigo-iam_iam \\ - -Dsonar.organization=indigo-iam - """ - } - } - } - } - - post { - always { - script { - maybeArchiveJUnitReportsWithJacoco() - } - } - unsuccessful { - archiveArtifacts artifacts:'**/**/*.dump' - archiveArtifacts artifacts:'**/**/*.dumpstream' - } - } - } - - stage('analysis'){ - - when{ - allOf{ - anyOf { - expression { return params.RUN_SONAR } - } - expression{ !env.CHANGE_URL } - not { - expression { return params.SKIP_TESTS } - } - } - } - - - steps { - script{ - def checkstyle_opts = 'checkstyle:check -Dcheckstyle.config.location=google_checks.xml' - - withSonarQubeEnv('sonarcloud.io'){ - sh """ - mvn -B -U ${checkstyle_opts} \\ - install sonar:sonar \\ - -Dsonar.host.url=${SONAR_HOST_URL} \\ - -Dsonar.login=${SONAR_AUTH_TOKEN} \\ - -Dsonar.branch.name=${BRANCH_NAME} \\ - -Dsonar.projectKey=indigo-iam_iam \\ - -Dsonar.organization=indigo-iam - """ - } - } - } - post { - always { - script { - sh 'echo post analysis' - maybeArchiveJUnitReports() - } - } - unsuccessful { - archiveArtifacts artifacts:'**/**/*.dump' - archiveArtifacts artifacts:'**/**/*.dumpstream' - } - } - } - - stage('quality-gate') { - - when{ - allOf{ - anyOf { - expression { return params.RUN_SONAR } - } - not { - expression { return params.SKIP_TESTS } - } - } - } - - steps { - timeout(time: 5, unit: 'MINUTES') { - waitForQualityGate abortPipeline: true - } - } - } - - stage('package') { + stage('deploy & package') { steps { sh 'mvn -B -DskipTests=true clean deploy package' archiveArtifacts 'iam-login-service/target/iam-login-service.war' @@ -231,44 +115,6 @@ pipeline { } } } - - stage('docker-images') { - when{ - expression { return params.BUILD_DOCKER_IMAGES } - } - - agent { - label "docker" - } - - steps { - deleteDir() - unstash 'code' - unstash 'iam-artifacts' - sh ''' - sed -i -e 's#iam\\.version#IAM_VERSION#' iam-login-service/target/classes/iam.version.properties - source iam-login-service/target/classes/iam.version.properties - export IAM_LOGIN_SERVICE_VERSION="v${IAM_VERSION}" - - /bin/bash iam-login-service/docker/build-prod-image.sh - /bin/bash iam-login-service/docker/push-prod-image.sh - /bin/bash iam-test-client/docker/build-prod-image.sh - /bin/bash iam-test-client/docker/push-prod-image.sh - ''' - script { - if (env.BRANCH_NAME == 'master' || params.PUSH_TO_DOCKERHUB ) { - sh ''' - sed -i -e 's#iam\\.version#IAM_VERSION#' iam-login-service/target/classes/iam.version.properties - source iam-login-service/target/classes/iam.version.properties - export IAM_LOGIN_SERVICE_VERSION="v${IAM_VERSION}" - unset DOCKER_REGISTRY_HOST - /bin/bash iam-login-service/docker/push-prod-image.sh - /bin/bash iam-test-client/docker/push-prod-image.sh - ''' - } - } - } - } } post {