Update .gitlab-ci.yml

.gitlab-ci.yml

@@ -11,18 +11,21 @@ workflow:
     - if: $CI_MERGE_REQUEST_IID
 
 variables:
-  HUB_LOGIN_NAME: "gujinli"  # 登录名
-  HUB_PASSWORD: "1234qwer"  # 密码
-  HUB_URL: "http://192.168.68.153:9521/"  # 平台URLwww.ustchcs.com/p3-v17/hub-backend-test
+
   MERGE_REQUEST_PARAM: "{mergeRequestId:$CI_MERGE_REQUEST_IID,projectId:$CI_PROJECT_ID,jobId:$CI_JOB_ID}"
   JAVA_MAIN_SOURCE: "src/main/java"  #  检索差异文件脚本变量，表示只检查main文件，不检查test文件
-  CAFEHUNTER_CLI_SCRIPT: "/root/analysis-tool/bin/scanner"  #  套件命令执行文件
-  CAFEHUNTER_CLI_LICENSE_PATH: "/root/analysis-tool/Hub-ci.txt"  #  授权文件
-  CAFEHUNTER_CLI_CONFIG_PATH: "/root/analysis-tool/config.yml"  #  规则配置文件
+  SCANNER_SCRIPT: "/root/analysis-tool/bin/scanner"  #  套件命令执行文件
+  SCANNER_JAVA_LICENSE_PATH: "/root/analysis-tool/Hub-ci-java.txt"  #  JAVA授权文件
+  SCANNER_C_LICENSE_PATH: "/root/analysis-tool/Hub-ci-c.txt"  #  C授权文件
   # 根据项目进行配置
+  HUB_LOGIN_NAME: "gujinli"  # 登录名
+  HUB_PASSWORD: "1234qwer"  # 密码
+  HUB_URL: "http://192.168.68.153:9521/"  # 平台URLwww.ustchcs.com/p3-v17/hub-backend-test										  
+																											
   HUB_PROJECT_ID: "10"  # 对应平台项目Id
   REPOSITORY_FULL_PATH: "/builds/hub-gitlab/gujinli/jsherp-java-test"  #  项目绝对路径，供套件分析
   REPOSITORY_NAME: "jsherp-java-test"  #  项目名称
+  JAVA_SUFFIX: ".java"					  
 
 
 upload-job:
@@ -41,8 +44,8 @@ upload-job:
     - export LANG=zh_CN.UTF-8
     - export LC_ALL=zh_CN.UTF-8
     - export LANGUAGE=zh_CN.UTF-8
-    # - $CAFEHUNTER_CLI_SCRIPT version -i
-    - $CAFEHUNTER_CLI_SCRIPT authorize -n cafehunter $CAFEHUNTER_CLI_LICENSE_PATH
+    - $SCANNER_SCRIPT authorize -n cafehunter $SCANNER_JAVA_LICENSE_PATH
+    - $SCANNER_SCRIPT authorize -n seahunter $SCANNER_C_LICENSE_PATH
     # 将游离分支转换为正常分支 以供套件分析 
     - cd $REPOSITORY_FULL_PATH
     - git fetch
@@ -50,12 +53,12 @@ upload-job:
     - git checkout -b $CI_COMMIT_REF_NAME
     - git merge tmp-$CI_JOB_ID-$CI_JOB_NAME
     # 获取分析文件
-    - chmod 777 $REPOSITORY_FULL_PATH/getCommittedMainFilesForCafehunterCli.sh
-    - export COMMITTED_FILES=$($REPOSITORY_FULL_PATH/getCommittedMainFilesForCafehunterCli.sh)
+    - chmod 777 $REPOSITORY_FULL_PATH/getCommittedFiles.sh
+    - export COMMITTED_FILES=$($REPOSITORY_FULL_PATH/getCommittedFiles.sh)
   script:
     #  分析
-    - echo "$CAFEHUNTER_CLI_SCRIPT scan $COMMITTED_FILES -umr $REPOSITORY_NAME $HUB_LOGIN_NAME $HUB_PASSWORD $HUB_URL $HUB_PROJECT_ID $MERGE_REQUEST_PARAM"
-    - $CAFEHUNTER_CLI_SCRIPT scan $COMMITTED_FILES -umr $REPOSITORY_NAME $HUB_LOGIN_NAME $HUB_PASSWORD $HUB_URL $HUB_PROJECT_ID $MERGE_REQUEST_PARAM
+    - echo "SCANNER_SCRIPT scan $COMMITTED_FILES -umr $REPOSITORY_NAME $HUB_LOGIN_NAME $HUB_PASSWORD $HUB_URL $HUB_PROJECT_ID $MERGE_REQUEST_PARAM"
+    - $SCANNER_SCRIPT scan $COMMITTED_FILES -umr $REPOSITORY_NAME $HUB_LOGIN_NAME $HUB_PASSWORD $HUB_URL $HUB_PROJECT_ID $MERGE_REQUEST_PARAM
     # 删除过程中用到的分支
     - "git branch -d tmp-$CI_JOB_ID-$CI_JOB_NAME"
     - "git checkout $CI_COMMIT_SHA"