npm run lint

src/org/qg/docker_new/StageBucketTke2.groovy

@@ -678,47 +678,53 @@ def send_req(body,pipesCallback){
 def get_sonar_check(systemName,branchName,pipesCallback,sonarCallback,dingRobotAddr,branchHashCode) {
   def projectAttr = project_attr(systemName)
   if(projectAttr["sonar"]){
-    _utils().beautyEcho("sonar check +++", "info")
-    def sonarJob
-    def pipelineJob = pipeline_job()
-    if(!pipelineJob){
-      echo "手动触发的job"
-      sonarJob = sonar_job(branchHashCode)
-      if(!sonarJob || sonarJob["buildResult"] == 'error'){
-        // 手动触发一次sonar
-        def data=[:]
-        data["branchHash"] = branchHashCode
-        data = _sonarStage().sonar_check(systemName,branchName,'false',data)
-        _sonarStage().call_back(data,sonarCallback,dingRobotAddr,'','noMail')
+    if(projectAttr["type"] == 'java'){
+      _utils().beautyEcho("sonar check +++", "info")
+      def sonarJob
+      def pipelineJob = pipeline_job()
+      if(!pipelineJob){
+        echo "手动触发的job"
+        sonarJob = sonar_job(branchHashCode)
+        if(!sonarJob || sonarJob["buildResult"] == 'error'){
+          // 手动触发一次sonar
+          def data=[:]
+          data["branchHash"] = branchHashCode
+          data = _sonarStage().sonar_check(systemName,branchName,'false',data)
+          _sonarStage().call_back(data,sonarCallback,dingRobotAddr,'','noMail')
+        }
       }
-    }
 
-    // 等待200s，cash-loan-flow的sonar需要三分半
-    for (int i=0; i<40; i++){
-      sonarJob = sonar_job(branchHashCode)
-      echo "sonarJob : ${sonarJob}"
-      if(sonarJob && sonarJob["sonarResult"]){
-        if (sonarJob["sonarResult"] != 'OK'){
-          echo ">>>>>>> sonar check fail : ${sonarJob["sonarResult"]}"
-          _utils().beautyEcho("没有通过Sonar质量阀，退出Jenkins build", "fail")
-          ding_talk_error(pipesCallback,"notOK",dingRobotAddr,systemName,branchName,"没有通过Sonar质量阀，退出流水线",sonarJob)
-          sh 'exit 111'
-        } else {
-          echo ">>>>>>> sonar check pass"
-          break
+      // 等待200s，cash-loan-flow的sonar需要三分半
+      for (int i=0; i<40; i++){
+        sonarJob = sonar_job(branchHashCode)
+        echo "sonarJob : ${sonarJob}"
+        if(sonarJob && sonarJob["sonarResult"]){
+          if (sonarJob["sonarResult"] != 'OK'){
+            echo ">>>>>>> sonar check fail : ${sonarJob["sonarResult"]}"
+            _utils().beautyEcho("没有通过Sonar质量阀，退出Jenkins build", "fail")
+            ding_talk_error(pipesCallback,"notOK",dingRobotAddr,systemName,branchName,"没有通过Sonar质量阀，退出流水线",sonarJob)
+            sh 'exit 111'
+          } else {
+            echo ">>>>>>> sonar check pass"
+            break
+          }
         }
+        echo "等待sonar扫描执行结果，一般服务在1分钟内，个别大服务需要等待3分钟左右，比如cash-loan-flow、clotho等"
+        sleep 5
+      }
+      if(!sonarJob["sonarResult"]){
+        echo ">>>>>>> sonar check fail : ${sonarJob}"
+        _utils().beautyEcho("获取sonar分析结果超时，退出Jenkins build", "fail")
+        ding_talk_error(pipesCallback,"timeout",dingRobotAddr,systemName,branchName,"获取sonar分析结果超时，退出流水线",sonarJob)
+        sh 'exit 111'
       }
-      echo "等待sonar扫描执行结果，一般服务在1分钟内，个别大服务需要等待3分钟左右，比如cash-loan-flow、clotho等"
-      sleep 5
     }
-    if(!sonarJob["sonarResult"]){
-      echo ">>>>>>> sonar check fail : ${sonarJob}"
-      _utils().beautyEcho("获取sonar分析结果超时，退出Jenkins build", "fail")
-      ding_talk_error(pipesCallback,"timeout",dingRobotAddr,systemName,branchName,"获取sonar分析结果超时，退出流水线",sonarJob)
-      sh 'exit 111'
+    if(projectAttr["type"] == 'node' || projectAttr["type"] == 'ui'){
+      _utils().beautyEcho("lint check +++", "info")
+      sh "npm run lint"
     }
   }else{
-    echo "不执行sonar，跳过扫描"
+    echo "不执行代码扫描"
   }
 }