From 0b6fe4a76378fca107b28ec13606f58bf644f6be Mon Sep 17 00:00:00 2001
From: qishiyao <qishiyao@easycorp.ltd>
Date: Fri, 26 Jan 2024 10:28:05 +0800
Subject: [PATCH] * Update pipeline disable zbox win

---
 misc/ci/Jenkinsfile           | 86 +++++++++++++++++------------------
 misc/ci/Jenkinsfile.downgrade |  2 +-
 2 files changed, 44 insertions(+), 44 deletions(-)

diff --git a/misc/ci/Jenkinsfile b/misc/ci/Jenkinsfile
index cc95815858..e881c7e3e4 100644
--- a/misc/ci/Jenkinsfile
+++ b/misc/ci/Jenkinsfile
@@ -365,53 +365,53 @@ pipeline {
           stages {
             stage("Package") {
               parallel {
-                stage("Zbox win") {
-                  agent {
-                    kubernetes {
-                      yamlFile 'misc/ci/publish-zbox.yaml'
-                    }
-                  }
+                // stage("Zbox win") {
+                //   agent {
+                //     kubernetes {
+                //       yamlFile 'misc/ci/publish-zbox.yaml'
+                //     }
+                //   }
 
-                  stages() {
-                    stage("Prepare") {
-                      steps {
-                        checkout scmGit(branches: [[name: "main"]],
-                          extensions: [cloneOption(depth: 2, noTags: false, reference: '', shallow: true)],
-                          userRemoteConfigs: [[credentialsId: 'git-jenkins-bot-http', url: "https://${env.GIT_HOST}/devops/zbox-builder.git"]]
-                        )
-                      }
-                    }
+                //   stages() {
+                //     stage("Prepare") {
+                //       steps {
+                //         checkout scmGit(branches: [[name: "main"]],
+                //           extensions: [cloneOption(depth: 2, noTags: false, reference: '', shallow: true)],
+                //           userRemoteConfigs: [[credentialsId: 'git-jenkins-bot-http', url: "https://${env.GIT_HOST}/devops/zbox-builder.git"]]
+                //         )
+                //       }
+                //     }
 
-                    stage("Build") {
-                      steps {
-                        script {
-                          buildZboxWin.doBuild()
-                          buildZboxWin.uploadInternal()
-                        }
-                      }
-                    }
+                //     stage("Build") {
+                //       steps {
+                //         script {
+                //           buildZboxWin.doBuild()
+                //           buildZboxWin.uploadInternal()
+                //         }
+                //       }
+                //     }
 
-                    stage("Upload Qiniu") {
-                      when {
-                        environment name: 'BUILD_KIND', value: 'release'
-                      }
+                //     stage("Upload Qiniu") {
+                //       when {
+                //         environment name: 'BUILD_KIND', value: 'release'
+                //       }
 
-                      steps {
-                        container('docker') {
-                          sh 'mkdir -pv ./release/upload && cd ./release/upload && mkdir $PMS_VERSION $BIZ_VERSION $MAX_VERSION $IPD_VERSION'
-                          sh "mv `find release/zh-cn/$PMS_VERSION release/en/$PMS_VERSION -type f -name 'ZenTao*.exe'` release/upload/$PMS_VERSION"
-                          sh "mv `find release/zh-cn/$BIZ_VERSION release/en/$BIZ_VERSION -type f -name 'ZenTao*.exe'` release/upload/$BIZ_VERSION"
-                          sh "mv `find release/zh-cn/$MAX_VERSION release/en/$MAX_VERSION -type f -name 'ZenTao*.exe'` release/upload/$MAX_VERSION"
-                          sh "mv `find release/zh-cn/$IPD_VERSION release/en/$IPD_VERSION -type f -name 'ZenTao*.exe'` release/upload/$IPD_VERSION"
-                        }
-                        container('jnlp') {
-                          sh 'qshell account $QINIU_ACCESS_KEY $QINIU_SECRET_KEY uploader'
-                          sh 'qshell qupload2 --bucket $QINIU_BUCKET --overwrite --src-dir ./release/upload --key-prefix $OBJECT_KEY_PREFIX'
-                        }
-                      }
-                    } // End Upload Qiniu
-                  }
-                } // End Zbox win
+                //       steps {
+                //         container('docker') {
+                //           sh 'mkdir -pv ./release/upload && cd ./release/upload && mkdir $PMS_VERSION $BIZ_VERSION $MAX_VERSION $IPD_VERSION'
+                //           sh "mv `find release/zh-cn/$PMS_VERSION release/en/$PMS_VERSION -type f -name 'ZenTao*.exe'` release/upload/$PMS_VERSION"
+                //           sh "mv `find release/zh-cn/$BIZ_VERSION release/en/$BIZ_VERSION -type f -name 'ZenTao*.exe'` release/upload/$BIZ_VERSION"
+                //           sh "mv `find release/zh-cn/$MAX_VERSION release/en/$MAX_VERSION -type f -name 'ZenTao*.exe'` release/upload/$MAX_VERSION"
+                //           sh "mv `find release/zh-cn/$IPD_VERSION release/en/$IPD_VERSION -type f -name 'ZenTao*.exe'` release/upload/$IPD_VERSION"
+                //         }
+                //         container('jnlp') {
+                //           sh 'qshell account $QINIU_ACCESS_KEY $QINIU_SECRET_KEY uploader'
+                //           sh 'qshell qupload2 --bucket $QINIU_BUCKET --overwrite --src-dir ./release/upload --key-prefix $OBJECT_KEY_PREFIX'
+                //         }
+                //       }
+                //     } // End Upload Qiniu
+                //   }
+                // } // End Zbox win
 
                 stage("Zbox linux") {
                   agent {
diff --git a/misc/ci/Jenkinsfile.downgrade b/misc/ci/Jenkinsfile.downgrade
index 2a189a1862..841813d29c 100755
--- a/misc/ci/Jenkinsfile.downgrade
+++ b/misc/ci/Jenkinsfile.downgrade
@@ -76,7 +76,7 @@ pipeline {
                   sh 'mkdir -pv ${ZENTAO_RELEASE_PATH} && chown 1000:1000 ${ZENTAO_RELEASE_PATH}'
                   sh 'make ciCommon'
                   withCredentials([gitUsernamePassword(credentialsId: 'git-zcorp-cc-jenkins-bot-http', gitToolName: 'Default')]) {
-                    sh '${ZENTAO_BUILD_PATH}/script/downgrade/fullDowngrade_v2.sh -c $PWD/misc -r $PWD/zentaopms -d downRepo -i -s -g $GIT_COMMIT -o "$ZENTAO_RELEASE_PATH" -p "$DOWNGRADE_VERSIONS" api extension framework lib module/*'
+                    sh '${ZENTAO_BUILD_PATH}/script/downgrade/fullDowngrade_v2.sh -c $PWD/misc -r $PWD/zentaopms -d downRepo -i -s -b $GIT_BRANCH -g $GIT_COMMIT -o "$ZENTAO_RELEASE_PATH" -p "$DOWNGRADE_VERSIONS" api extension framework lib module/*'
                   }
                   sh 'ls -l $ZENTAO_RELEASE_PATH'
                   sh 'test ! -f ${ZENTAO_RELEASE_PATH}/downgradeReport.html'