change: git

.gitlab-ci.yml

@@ -3,34 +3,34 @@ variables:
   ARTIFACT_NAME: '$SERVICE_CODE.zip'
 
 stages:
-  - inspection
-  - unitTest
+  #   - inspection
+  #   - unitTest
   - package
   - upload
   - upload-bee
 
-# 前置检查
-include:
-  - project: tech/ci-operator
-    file: /submodels/precheck.gitlab-ci.yml
-    ref: master
+# # 前置检查
+# include:
+#   - project: tech/ci-operator
+#     file: /submodels/precheck.gitlab-ci.yml
+#     ref: master
 
-# 代码审查
-inspection-job:
-  stage: inspection
-  script:
-    - ci_tools inspection $SERVICE_CODE
-  tags:
-    - ci-backend
+# # 代码审查
+# inspection-job:
+#   stage: inspection
+#   script:
+#     - ci_tools inspection $SERVICE_CODE
+#   tags:
+#     - ci-backend
 
-# 单元测试
-unitTest-job:
-  stage: unitTest
-  script:
-    - mvn clean org.jacoco:jacoco-maven-plugin:0.8.2:prepare-agent test org.jacoco:jacoco-maven-plugin:0.8.2:report -Dmaven.test.failure.ignore=true
-    - ci_tools report_unit_test_result $TARGET_FILE_PATH/site/jacoco/jacoco.xml $SERVICE_CODE $CI_COMMIT_REF_NAME $CI_PIPELINE_ID
-  tags:
-    - ci-backend
+# # 单元测试
+# unitTest-job:
+#   stage: unitTest
+#   script:
+#     - mvn clean org.jacoco:jacoco-maven-plugin:0.8.2:prepare-agent test org.jacoco:jacoco-maven-plugin:0.8.2:report -Dmaven.test.failure.ignore=true
+#     - ci_tools report_unit_test_result $TARGET_FILE_PATH/site/jacoco/jacoco.xml $SERVICE_CODE $CI_COMMIT_REF_NAME $CI_PIPELINE_ID
+#   tags:
+#     - ci-backend
 
 # 编译打包
 common_package:
@@ -65,56 +65,34 @@ test_upload:
     - ci-backend
   only:
     - dev
+    - /^release.*$/
     - /^feature.*$/
+    - /^hotfix.*$/
   dependencies:
     - common_package
 
-common_upload:
+online_upload:
   stage: upload
   script:
     - version_tools time && CURRENT_TIMESTAMP=$(version_tools result)
     - version_tools version && PROJECT_VERSION=$(version_tools result)
     - ARTIFACT_VERSION="${PROJECT_VERSION}-${CI_COMMIT_REF_NAME##*/}-${CURRENT_TIMESTAMP}-${CI_PIPELINE_ID}"
-    - eval opera truck $OPERA_ARGS --env=all --artifactPath=$ARTIFACT_NAME --artifactVersion=$ARTIFACT_VERSION
+    - eval opera truck $OPERA_ARGS --env=online --artifactPath=$ARTIFACT_NAME --artifactVersion=$ARTIFACT_VERSION
   tags:
     - ci-backend
   only:
-    - master
     - /^release.*$/
     - /^hotfix.*$/
   dependencies:
     - common_package
 
-
-# 镜像制品上传（制品标识为全环境通用）
-test_image_upload:
-  stage: upload
-  script:
-    - version_tools time && CURRENT_TIMESTAMP=$(version_tools result)
-    - version_tools version && PROJECT_VERSION=$(version_tools result)
-    - IMAGE_TAG="${PROJECT_VERSION}-${CI_COMMIT_REF_NAME##*/}-${CURRENT_TIMESTAMP}-${CI_PIPELINE_ID}"
-    - IMAGE_NAME="${HARBOR_URL}/${HARBOR_APP_DIRECTOR}/${SERVICE_CODE}:${IMAGE_TAG}"
-    - unzip -o -q $ARTIFACT_NAME -d .
-    - docker build --pull -t ${IMAGE_NAME} .
-    - eval opera docker $OPERA_ARGS --env=test --imageName=${IMAGE_NAME} --imageTag=${IMAGE_TAG}
-  tags:
-    - ci-backend
-  only:
-    - dev
-    - /^feature.*$/
-  dependencies:
-    - common_package
-
-common_image_upload:
+common_upload:
   stage: upload
   script:
     - version_tools time && CURRENT_TIMESTAMP=$(version_tools result)
     - version_tools version && PROJECT_VERSION=$(version_tools result)
-    - IMAGE_TAG="${PROJECT_VERSION}-${CI_COMMIT_REF_NAME##*/}-${CURRENT_TIMESTAMP}-${CI_PIPELINE_ID}"
-    - IMAGE_NAME="${HARBOR_URL}/${HARBOR_APP_DIRECTOR}/${SERVICE_CODE}:${IMAGE_TAG}"
-    - unzip -o -q $ARTIFACT_NAME -d .
-    - docker build --pull -t ${IMAGE_NAME} .
-    - eval opera docker $OPERA_ARGS --env=all --imageName=${IMAGE_NAME} --imageTag=${IMAGE_TAG}
+    - ARTIFACT_VERSION="${PROJECT_VERSION}-${CI_COMMIT_REF_NAME##*/}-${CURRENT_TIMESTAMP}-${CI_PIPELINE_ID}"
+    - eval opera truck $OPERA_ARGS --env=all --artifactPath=$ARTIFACT_NAME --artifactVersion=$ARTIFACT_VERSION
   tags:
     - ci-backend
   only:
@@ -124,6 +102,7 @@ common_image_upload:
   dependencies:
     - common_package
 
+
 # 接口文件上传
 common_upload_bee:
   stage: upload-bee
@@ -138,4 +117,4 @@ common_upload_bee:
     - /^release.*$/
     - /^feature.*$/
   dependencies:
-    - common_package
\ No newline at end of file
+    - common_package