Tomishinets Vladimir 4 years ago
parent
commit
b78fc7c841
1 changed files with 21 additions and 37 deletions
  1. 21 37
      devK8s.Jenkinsfile

+ 21 - 37
devK8s.Jenkinsfile

@@ -84,36 +84,29 @@ pipeline {
         }
         }
       }
       }
     }
     }
-    stage("Build APP PROMO-SEO") {
-      when {
-        expression { params.APP_NAME == 'promo-seo' }
-      }
-      steps {
-        script {
-          echo "Build customer-api"
-          dir("${SOURCE_DIR}/customer-api") {
-            buildOps.maven()
-          }
-          echo "Build public"
-          dir("${SOURCE_DIR}/promo/src/public") {
-            buildOps.npm()
-          }
-          echo "Build Promo"
-          dir("${SOURCE_DIR}/promo") {
-            buildOps.gradle()
-          }
-        }
-      }
-    }
-    stage("Build APP PROMO-SDK") {
-      when {
-        expression { params.APP_NAME == 'promo-sdk' }
-      }
+    stage("Build APP") {
       steps {
       steps {
         script {
         script {
-          echo "Build APP PROMO-SDK"
-          dir("${SOURCE_DIR}") {
-            buildOps.npm()
+          switch (APP_NAME) {
+            case 'promo-sdk':
+              echo "Build APP PROMO-SDK"
+              dir("${SOURCE_DIR}") {
+                buildOps.npm()
+              }
+              break
+            case 'promo-seo':
+              echo "Build customer-api"
+              dir("${SOURCE_DIR}/customer-api") {
+                buildOps.maven()
+              }
+              echo "Build public"
+              dir("${SOURCE_DIR}/promo/src/public") {
+                buildOps.npm()
+              }
+              echo "Build Promo"
+              dir("${SOURCE_DIR}/promo") {
+                buildOps.gradle()
+              }
           }
           }
         }
         }
       }
       }
@@ -123,15 +116,6 @@ pipeline {
         script {
         script {
           IMAGE_TO_PUSH = "${DOCKER_REGISTRY}/${DOCKER_IMAGE}:${COMMIT}-${BUILD_NUMBER}"
           IMAGE_TO_PUSH = "${DOCKER_REGISTRY}/${DOCKER_IMAGE}:${COMMIT}-${BUILD_NUMBER}"
           k8sBuildImage.kaniko(IMAGE_TO_PUSH,[CONTENT_DIR: BUILD_IMAGE_DIR],DOCKER_FILE)
           k8sBuildImage.kaniko(IMAGE_TO_PUSH,[CONTENT_DIR: BUILD_IMAGE_DIR],DOCKER_FILE)
-          // switch (APP_NAME) {
-          //   case 'promo-seo':
-          //     sh "cp ${BUILD_IMAGE_DIR}/promo-0.0.1-SNAPSHOT.war ."
-          //     // COMMIT = sh(script: "cat ${SOURCE_DIR}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)
-          //     break
-          // }
         }
         }
       }
       }
     }
     }