test

devK8s.Jenkinsfile

@@ -26,7 +26,6 @@ pipeline {
     CHART_PATH=''
     HELM_DIR=''
     IMAGE_TO_PUSH=''
-    VALUES_FILE=''
   }
   parameters {
     string(
@@ -44,35 +43,35 @@ pipeline {
     stage("Prepare to Build") {
       steps {
         script {
+          echo "GIT clone ${HELM_GIT_URL}"
           gitOps.clone(HELM_GIT_URL)
+          echo "Defining variables"
           HELM_DIR = dirOps.calculateDir(HELM_GIT_URL)
           CHART_PATH = "${HELM_DIR}/${CHART_SUBPATH}"
           PROJECT = DOCKER_IMAGE.split("/")[1]
           NAMESPACE = CHART_SUBPATH.split("/")[1]
           VALUES_FILE = "${CHART_PATH}/dev.yaml"
+          IMAGE_TO_PUSH = "${DOCKER_REGISTRY}/${DOCKER_IMAGE}:${repo}-${BUILD_NUMBER}"
         }
       }
     }
     stage("Build Image") {
       steps {
         script {
-          echo "Build Image with Kaniko"
-          REGISTRY = "${DOCKER_REGISTRY}/${DOCKER_IMAGE}"
+          echo "Building ${IMAGE_TO_PUSH} with Kaniko"
           ARGS = [ "repo=${repo}" ]
-          IMAGE_TO_PUSH = "${DOCKER_REGISTRY}/${DOCKER_IMAGE}:${repo}-${BUILD_NUMBER}"
           k8sBuildImage.kaniko(IMAGE_TO_PUSH, ARGS)
         }
       }
     }
-    stage("Update Helm Chart dev.yaml") {
+    stage("Update Helm Chart") {
       steps {
         script {
-          echo "Update Helm Chart"
-          def data = readYaml file: "${CHART_PATH}/dev.yaml"
+          echo "Update ${TAG_PATH} to ${IMAGE_TO_PUSH} in ${VALUES_FILE}"
+          def data = readYaml file: "${VALUES_FILE}"
           TAG_PATH = "images.${PROJECT}"
           yamlOps.updateBuilder(TAG_PATH, data, IMAGE_TO_PUSH)
-          writeYaml file: "${CHART_PATH}/dev.yaml", data: data, overwrite: true
-          echo "Updated ${CHART_PATH}/dev.yaml in ${TAG_PATH} to ${IMAGE_TO_PUSH}"
+          writeYaml file: "${VALUES_FILE}", data: data, overwrite: true
         }
       }
     }