From b4498a59f66b501ee70446f5ab6c4f969452976b Mon Sep 17 00:00:00 2001
From: Nicolas Arenas <nicolas.arenas@gmail.com>
Date: Thu, 24 Oct 2024 19:09:39 +0200
Subject: [PATCH] Fixing some typos

---
 ogWebconsole/Jenkinsfile | 36 +++++++++++++++++-------------------
 1 file changed, 17 insertions(+), 19 deletions(-)

diff --git a/ogWebconsole/Jenkinsfile b/ogWebconsole/Jenkinsfile
index 0c4317e..1f33ec7 100644
--- a/ogWebconsole/Jenkinsfile
+++ b/ogWebconsole/Jenkinsfile
@@ -3,9 +3,7 @@ pipeline {
     environment {
         DOCKER_REPO = "opengnsys"
         DOCKER_CREDENTIALS = credentials('docker-hub-credentials') 
-        DOCKER_TAG = "${env.BUILD_NUMBER}"
         DOCKER_IMAGE_NAME = "oggui"
-        BRANCH_NAME = "${GIT_BRANCH.split("/")[1]}"
     }
     stages {
         stage ('Checkout') {
@@ -17,15 +15,15 @@ pipeline {
             steps {
                 echo 'Building....'
                 script {
+                    def DOCKER_TAG = "${env.BUILD_NUMBER}"
+                    def BRANCH_NAME = "${env.GIT_BRANCH.split('/')[1]}"
+                    
                     dir('ogWebconsole') {
-                        IMAGE_ID = "${DOCKER_REPO}/${DOCKER_IMAGE_NAME}:${BRANCH_NAME}-${DOCKER_TAG}"
-                        if (BRANCH_NAME == 'main') {
-                            LATEST_ID = 'latest'
-                        }  else {
-                            LATEST_ID = "${DOCKER_REPO}/${DOCKER_IMAGE_NAME}:${BRANCH_NAME}-latest"
-                        }
-                        docker.build("${IMAGE_ID}", "-f Dockerfile .")
-                        docker.build("${LATEST_ID}", "-f Dockerfile .")
+                        def IMAGE_ID = "${DOCKER_REPO}/${DOCKER_IMAGE_NAME}:${BRANCH_NAME}-${DOCKER_TAG}"
+                        def LATEST_ID = (BRANCH_NAME == 'main') ? 'latest' : "${DOCKER_REPO}/${DOCKER_IMAGE_NAME}:${BRANCH_NAME}-latest"
+                        
+                        docker.build(IMAGE_ID, "-f Dockerfile .")
+                        docker.image(IMAGE_ID).tag(LATEST_ID)
                     }
                 }
             }
@@ -33,23 +31,23 @@ pipeline {
         stage('Testing') {
             steps {
                 echo 'Running Tests....'
-                sh """
+                sh '''
                     mkdir -p test-results
-                    docker run -p 4200:4200 --name oggui-testing -e CHROME_BIN=/usr/bin/chromium -v $(pwd)/karma.conf.js:/app/karma.conf.js   -v $(pwd)/.env:/app/.env -d ${IMAGE_ID}"
+                    docker run -p 4200:4200 --name oggui-testing -e CHROME_BIN=/usr/bin/chromium -v $(pwd)/karma.conf.js:/app/karma.conf.js -v $(pwd)/.env:/app/.env -d ${IMAGE_ID}
                     docker exec oggui-testing ng test --watch=false --browsers=ChromeHeadless
                     docker cp oggui-testing:/app/test-results/ogGui-junit-report.xml ./test-results/ogGui-junit-report.xml
                     docker stop oggui-testing
                     docker rm oggui-testing
-                """
+                '''
             }
         }
         stage('Push') {
             steps {
                 echo 'Pushing....'
                 script {
-                    docker.withRegistry('https://index.docker.io/v1/', 'docker-hub-credentials' ) {
-                            docker.image("${IMAGE_ID}").push()
-                            docker.image("${LATEST_ID}").push()
+                    docker.withRegistry('https://index.docker.io/v1/', 'docker-hub-credentials') {
+                        docker.image("${IMAGE_ID}").push()
+                        docker.image("${LATEST_ID}").push()
                     }
                 }
             }
@@ -59,12 +57,12 @@ pipeline {
         always {
             echo 'Get test results....'
             xunit (
-                thresholds: [ skipped(failureThreshold: '0') , failed(failureThreshold: '0') ], 
+                thresholds: [ skipped(failureThreshold: '0'), failed(failureThreshold: '0') ],
                 tools: [ Junit(pattern: './test-results/ogGui-junit-report.xml') ]
             )
             echo 'Cleaning up....'
-            sh "docker rmi ${IMAGE_ID}"
-            sh "docker rmi ${LATEST_ID}"
+            sh "docker rmi ${IMAGE_ID} || true"
+            sh "docker rmi ${LATEST_ID} || true"
         }
     }
 }