Tomishinets Vladimir il y a 4 ans
Parent
commit
1123aaaae1
1 fichiers modifiés avec 4 ajouts et 10 suppressions
  1. 4 10
      devK8s.Jenkinsfile

+ 4 - 10
devK8s.Jenkinsfile

@@ -50,12 +50,14 @@ pipeline {
               DOCKER_IMAGE=PROMO_SDK.image
               SERVICE_NAME=PROMO_SDK.service_name
               DOCKER_FILE=PROMO_SDK.dockerfile
+              BUILD_IMAGE_DIR=dirOps.calculateDir(SOURCE_GIT_URL)
               break
             case 'promo-seo':
               SOURCE_GIT_URL=PROMO_SEO.repo
               DOCKER_IMAGE=PROMO_SEO.image
               SERVICE_NAME=PROMO_SEO.service_name
               DOCKER_FILE=PROMO_SEO.dockerfile
+              BUILD_IMAGE_DIR=dirOps.calculateDir(SOURCE_GIT_URL) + "/promo/build/libs/"
               break
           }
           echo SOURCE_GIT_URL
@@ -101,23 +103,15 @@ pipeline {
         }
       }
     }
-    stage("Build Image PROMO-SEO") {
-      when {
-        expression { params.APP_NAME == 'promo-seo' }
-      }
+    stage("Build Image") {
       steps {
         script {
-          // sh "cp ${SOURCE_DIR}/promo/build/libs/promo-0.0.1-SNAPSHOT.war ."
-          // sh "cp ${SOURCE_DIR}/version ."
-          // COMMIT = sh(script: "cat version 2> /dev/null", returnStdout: true).trim()
-          // IMAGE_TO_PUSH = "${DOCKER_REGISTRY}/${DOCKER_IMAGE}:${COMMIT}-${BUILD_NUMBER}"
-          echo "Build ${IMAGE_TO_PUSH} with Kaniko"
           dir('${SOURCE_DIR}/promo/build/libs/') {
             COMMIT = sh(script: "cat version 2> /dev/null", returnStdout: true).trim()
             IMAGE_TO_PUSH = "${DOCKER_REGISTRY}/${DOCKER_IMAGE}:${COMMIT}-${BUILD_NUMBER}"
+            echo "Build ${IMAGE_TO_PUSH} with Kaniko"
             k8sBuildImage.kaniko(IMAGE_TO_PUSH,,DOCKER_FILE)
           }
-          // k8sBuildImage.kaniko(IMAGE_TO_PUSH,,DOCKER_FILE)
         }
       }
     }