Tomishinets Vladimir 4 tahun lalu
induk
melakukan
1783ba3b58
1 mengubah file dengan 25 tambahan dan 20 penghapusan
  1. 25 20
      devK8s.Jenkinsfile

+ 25 - 20
devK8s.Jenkinsfile

@@ -107,12 +107,17 @@ pipeline {
       }
       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}"
+          // 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"
-          k8sBuildImage.kaniko(IMAGE_TO_PUSH,,DOCKER_FILE)
+          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}"
+            k8sBuildImage.kaniko(IMAGE_TO_PUSH,,DOCKER_FILE)
+          }
+          // k8sBuildImage.kaniko(IMAGE_TO_PUSH,,DOCKER_FILE)
         }
       }
     }
@@ -129,21 +134,21 @@ pipeline {
         }
       }
     }
-    // stage("Build Image PROMO-SDK") {
-    //   when {
-    //     expression { params.APP_NAME == 'promo-sdk' }
-    //   }
-    //   steps {
-    //     script {
-    //       IMAGE_TO_PUSH = "${DOCKER_REGISTRY}/${DOCKER_IMAGE}:${COMMIT}-${BUILD_NUMBER}"
-    //       echo "Build ${IMAGE_TO_PUSH} with Kaniko"
-    //       dir("${SOURCE_DIR}") {
-    //         COMMIT = sh(script: "cat version 2> /dev/null", returnStdout: true).trim()
-    //         k8sBuildImage.kaniko(IMAGE_TO_PUSH,,DOCKER_FILE)
-    //       }
-    //     }
-    //   }
-    // }
+    stage("Build Image PROMO-SDK") {
+      when {
+        expression { params.APP_NAME == 'promo-sdk' }
+      }
+      steps {
+        script {
+          echo "Build ${IMAGE_TO_PUSH} with Kaniko"
+          dir("${SOURCE_DIR}") {
+            COMMIT = sh(script: "cat version 2> /dev/null", returnStdout: true).trim()
+            IMAGE_TO_PUSH = "${DOCKER_REGISTRY}/${DOCKER_IMAGE}:${COMMIT}-${BUILD_NUMBER}"
+            k8sBuildImage.kaniko(IMAGE_TO_PUSH,,DOCKER_FILE)
+          }
+        }
+      }
+    }
     // stage("Update Helm Chart dev.yaml") {
     //   steps {
     //     script {