From ce77562a4edec7a0e9cce3e958f35a4648d8f710 Mon Sep 17 00:00:00 2001 From: Marija Stopa Date: Fri, 17 Jan 2025 12:09:58 +0100 Subject: [PATCH] Update Jenkinsfile --- Jenkinsfile | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 9c38defcb..ea2016b2a 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,10 +1,13 @@ pipeline { agent any + tools { + maven 'Maven 3' // Global Tool Configuration + } environment { DOCKERHUB_USERNAME = credentials('dockerhub') DOCKERHUB_PASSWORD = credentials('dockerhub') - DOCKER_IMAGE_MR = "marijastopa/mr-jenkins" - DOCKER_IMAGE_MAIN = "marijastopa/main-jenkins" + DOCKER_IMAGE_MR = "marijastopa/mr-jenkins" + DOCKER_IMAGE_MAIN = "marijastopa/main-jenkins" } stages { stage('Checkstyle') { @@ -28,7 +31,7 @@ pipeline { } stage('Build and Push Docker Image (Merge Request)') { when { - branch 'develop' + branch 'develop' } steps { script { @@ -42,7 +45,7 @@ pipeline { } stage('Build and Push Docker Image (Main)') { when { - branch 'main' + branch 'main' } steps { script {