test

.gitlab-ci.yml

@@ -5,6 +5,7 @@ default:
 
 stages:
   - upload-mr-analysis
+  - upload-mr-analysis1
 
 # workflow:
 #   rules:
@@ -66,3 +67,43 @@ upload-job:
   #   - "git branch -d tmp-$CI_JOB_ID-$CI_JOB_NAME"
   #   - "git checkout $CI_COMMIT_SHA"
   #   - "git branch -D $CI_COMMIT_REF_NAME"
+
+upload-job1:
+  stage: upload-mr-analysis1
+  # 包含分析工具运行所需环境 
+  # 需要设置 runner config: pull_policy = "if-not-present"
+  # 使用本地镜像，本地需要有这个镜像
+  # 需要设置 runner config：mac_address（固定IP 工具授权需要）
+  image: docker.ustchcs.com/ubuntu-javacli-quality:v3.0
+  allow_failure: false
+  # rules:
+  #   - if: $CI_PIPELINE_SOURCE == "merge_request_event"
+  # before_script:
+  #   # 授权
+  #   - locale-gen zh_CN
+  #   - 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
+  #   # 将游离分支转换为正常分支 以供套件分析 
+  #   - cd $REPOSITORY_FULL_PATH
+  #   - git fetch
+  #   - git branch tmp-$CI_JOB_ID-$CI_JOB_NAME $CI_COMMIT_SHA
+  #   - 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)
+  script:
+    #  分析
+    - echo "hello1"
+  #   - $CAFEHUNTER_CLI_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"
+  #   - "git branch -D $CI_COMMIT_REF_NAME"
+  # after_script:
+  #   - "git branch -d tmp-$CI_JOB_ID-$CI_JOB_NAME"
+  #   - "git checkout $CI_COMMIT_SHA"
+  #   - "git branch -D $CI_COMMIT_REF_NAME"
\ No newline at end of file