Tomishinets Vladimir 4 jaren geleden
bovenliggende
commit
4d1a454f98
1 gewijzigde bestanden met toevoegingen van 7 en 5 verwijderingen
  1. 7 5
      devK8s.Jenkinsfile

+ 7 - 5
devK8s.Jenkinsfile

@@ -13,7 +13,7 @@ pipeline {
     }
     }
   }
   }
   environment {
   environment {
-    CLOUD='kubernetes-office'
+    CONTEXT='sdsys.office'
     DOCKER_IMAGE='iru/admin'
     DOCKER_IMAGE='iru/admin'
     CHART_SUBPATH='helm/web-registration'
     CHART_SUBPATH='helm/web-registration'
     HELM_GIT_URL='ssh://git@git.sdsys.ru:8022/iru/k8s.git'
     HELM_GIT_URL='ssh://git@git.sdsys.ru:8022/iru/k8s.git'
@@ -64,7 +64,7 @@ pipeline {
         }
         }
       }
       }
     }
     }
-    stage("Update Helm Chart values.yaml") {
+    stage("Update Helm Chart dev.yaml") {
       steps {
       steps {
         script {
         script {
           echo "Update Helm Chart"
           echo "Update Helm Chart"
@@ -72,6 +72,7 @@ pipeline {
           TAG_PATH = "images.${PROJECT}"
           TAG_PATH = "images.${PROJECT}"
           yamlOps.updateBuilder(TAG_PATH, data, IMAGE_TO_PUSH)
           yamlOps.updateBuilder(TAG_PATH, data, IMAGE_TO_PUSH)
           writeYaml file: "${CHART_PATH}/dev.yaml", data: data, overwrite: true
           writeYaml file: "${CHART_PATH}/dev.yaml", data: data, overwrite: true
+          echo "Updated ${CHART_PATH}/dev.yaml in ${TAG_PATH} to ${IMAGE_TO_PUSH}"
         }
         }
       }
       }
     }
     }
@@ -80,12 +81,13 @@ pipeline {
         script {
         script {
           RELEASENAME = CHART_SUBPATH.split("/")[1]
           RELEASENAME = CHART_SUBPATH.split("/")[1]
           try {
           try {
-            echo "Update APP"
-            k8sHelmOps.upgrade(CLOUD, NAMESPACE, RELEASENAME, VALUES_FILE)
+            echo "Update APP to ${IMAGE_TO_PUSH}"
+            k8sHelmOps.upgrade(CONTEXT, NAMESPACE, RELEASENAME, VALUES_FILE)
+            echo "Update success!!!"
           }
           }
           catch(err) {
           catch(err) {
             echo "Recovering APP"
             echo "Recovering APP"
-            k8sHelmOps.rollback(CLOUD, NAMESPACE, RELEASENAME)
+            k8sHelmOps.rollback(CONTEXT, NAMESPACE, RELEASENAME)
             throw err
             throw err
           }
           }
         }
         }