diff --git a/Jenkinsfile b/Jenkinsfile index 0980d51..2272fbd 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -118,60 +118,8 @@ pipeline { } stage('SonarQube Analysis') { - agent { - docker { - image 'gradle:9.4.1-jdk21-jammy' - args '--network=host' - } - } - when { - anyOf { - changeRequest() - branch 'main' - any - when { - anyOf { - changeRequest() - branch 'main' - branch 'master' - branch 'develop' - } - } - steps { - script { - echo "Running SonarQube analysis..." - } - withSonarQubeEnv('SonarQube') { - sh ''' - chmod +x ./gradlew - ./gradlew sonar - ''{ - agent { - docker { - image 'docker:latest' - args '-v /var/run/docker.sock:/var/run/docker.sock' - } - } - when { - anyOf { - branch 'main' - branch 'develop' - branch 'master' - buildingTag() - } - } - steps { - script { - echo "Building Docker image..." - } - sh ''' - docker login -u ${REGISTRY_USER} -p ${REGISTRY_PASSWORD} ${REGISTRY} - docker build -t ${DOCKER_IMAGE} . - docker push ${DOCKER_IMAGE} - docker tag ${DOCKER_IMAGE} ${DOCKER_IMAGE_LATEST} - docker push ${DOCKER_IMAGE_LATEST} - docker logout ${REGISTRY} - ''' + withSonarQubeEnv() { + sh "./gradlew sonar -Dsonar.projectKey=MTGSearch -Dsonar.projectName='MTGSearch' -Dsonar.host.url=https://sonarqube.moustos.net -Dsonar.token=sqp_452a7bbe843fafe78b1a45efaf7ffb86ab6ba881" } }