debug

devK8s.Jenkinsfile

@@ -1,5 +1,5 @@
 @Library('jenkins-library-iru@master') _
-def Label = "admin-iru-build-${UUID.randomUUID().toString()}"
+def Label = "web-registration-admin-build-${UUID.randomUUID().toString()}"
 pipeline {
   options {
     buildDiscarder logRotator(numToKeepStr: '10')
@@ -15,14 +15,10 @@ pipeline {
   environment {
     CONTEXT='provision@sdsys.office'
     DOCKER_IMAGE='web-registration/admin'
-    CHART_SUBPATH='helm/web-registration'
     HELM_GIT_URL='ssh://git@git.sdsys.ru:8022/iru/k8s.git'
     APP_GIT_URL='ssh://git@git.sdsys.ru:8022/iru/admin.git'
     JENKINS_MAIL='jenkins.dev@sdsys.ru'
     DOCKER_REGISTRY='images.sdsys.ru'
-    NAMESPACE=''
-    PROJECT=''
-    CHART_NAME=''
     CHART_PATH=''
     HELM_DIR=''
     IMAGE_TO_PUSH=''
@@ -47,9 +43,7 @@ pipeline {
           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]
+          CHART_PATH = HELM_DIR + "/helm/" + DOCKER_IMAGE.split("/")[0]
           VALUES_FILE = "${CHART_PATH}/dev.yaml"
           IMAGE_TO_PUSH = "${DOCKER_REGISTRY}/${DOCKER_IMAGE}:${repo}-${BUILD_NUMBER}"
         }
@@ -67,7 +61,7 @@ pipeline {
     stage("Update Helm Chart") {
       steps {
         script {
-          TAG_PATH = "images.${PROJECT}"
+          TAG_PATH = "images." + DOCKER_IMAGE.split("/")[1]
           echo "Update ${TAG_PATH} to ${IMAGE_TO_PUSH} in ${VALUES_FILE}"
           def data = readYaml file: "${VALUES_FILE}"
           yamlOps.updateBuilder(TAG_PATH, data, IMAGE_TO_PUSH)
@@ -78,7 +72,8 @@ pipeline {
     stage("Update APP") {
       steps {
         script {
-          RELEASENAME = CHART_SUBPATH.split("/")[1]
+          RELEASENAME = DOCKER_IMAGE.split("/")[0]
+          NAMESPACE = DOCKER_IMAGE.split("/")[0]
           try {
             echo "Update APP to ${IMAGE_TO_PUSH}"
             k8sHelmOps.upgrade(CONTEXT, NAMESPACE, RELEASENAME, CHART_PATH, VALUES_FILE)
@@ -96,6 +91,7 @@ pipeline {
       steps {
         script {
           echo "Push changes to Repo"
+          PROJECT = DOCKER_IMAGE.split("/")[1]
           COMMIT = "Version update ${PROJECT}"
           gitOps.push(HELM_DIR, COMMIT)
         }