* improve increase downgrade actions

misc/ci/Jenkinsfile

@@ -128,18 +128,6 @@ pipeline {
         stage("Build") {
           when { expression { return params.publish_open || params.publish_biz } }
           stages {
-            stage("增量降级") {
-              steps {
-                echo "GIT_BRANCH in jenkinsfile is ${env.GIT_BRANCH}"
-                script { downgrade.increase() }
-              }
-              post {
-                failure {
-                  script { downgrade.increaseErrReport() }
-                }
-              }
-            }
-
             stage("make ciCommon") {
               steps {
                 withCredentials([gitUsernamePassword(credentialsId: 'git-jenkins-bot-http',gitToolName: 'git-tool')]) {
@@ -154,6 +142,19 @@ pipeline {
               }
             }
 
+            stage("增量降级") {
+              steps {
+                echo "GIT_BRANCH in jenkinsfile is ${env.GIT_BRANCH}"
+                sh '${ZENTAO_BUILD_PATH}/script/downgrade/diffDowngrade.sh -c $PWD/misc -r $PWD/zentaopms -d downRepo -i -s -o "$ZENTAO_RELEASE_PATH" -p "$DOWNGRADE_VERSIONS" extension framework lib module/*'
+                sh 'test ! -f ${ZENTAO_RELEASE_PATH}/downgradeReport.html'
+              }
+              post {
+                failure {
+                  script { downgrade.increaseErrReport() }
+                }
+              }
+            }
+
             stage("zentaoext") {
               when { expression { return params.publish_biz } }
               steps {

misc/ci/Jenkinsfile.downgrade

@@ -73,10 +73,10 @@ pipeline {
 
                 container('package') {
                   sh 'echo ${GIT_BRANCH}'
-                  sh '''find module -type d -name 'test' -maxdepth 2 -exec rm -rf {} +'''
-                  
+                  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.sh -r $PWD -d downRepo -i -s -o "$ZENTAO_RELEASE_PATH" -p "$DOWNGRADE_VERSIONS" extension framework lib module/*'
+                    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" extension framework lib module/*'
                   }
                   sh 'ls -l $ZENTAO_RELEASE_PATH'
                   sh 'test ! -f ${ZENTAO_RELEASE_PATH}/downgradeReport.html'
@@ -99,7 +99,7 @@ pipeline {
                     reportName: 'DowngradeReport'
                   ])
 
-                  ximNotify(title: "禅道全量降级失败", content: "[PHP语法错误报告]($BUILD_URL/DowngradeReport/)", contentHeaderFile: job.headerFileName())
+                  ximNotify(title: "禅道全量降级失败", content: "[PHP语法错误报告]($BUILD_URL/DowngradeReport/)")
                 }
               }