gitlab-ci

.gitlab-ci.yml

@@ -14,8 +14,7 @@ variables:
   ACR_EE_INSTANCE_ID: cri-yhk5zgfc2v1sia6l
   ACR_EE_IMAGE: cms
   ACR_EE_TAG: $CI_COMMIT_SHA
-  NAMESPACE: sharefly-dev
-  ACR_EE_NAMESPACE: sharefly-dev
+
   JAVA_VERSION: '8'
   GITLAB_URL: https://oauth2:sbs5WNE7dj4MKoKhh5u_@git.mmcuav.cn/test-ci/cms-ci-test.git
   GITLAB_REGISTRY: https://git.mmcuav.cn/test-ci/cms-ci-test.git
@@ -24,22 +23,25 @@ mvn_clean:
   stage: clean
   script:
     - echo "情理中..."
-#    - mvn clean -B -Dmaven.test.skip=true --settings /usr/local/maven/conf/settings.xml
+    - mvn clean -B -Dmaven.test.skip=true --settings /usr/local/maven/conf/settings.xml
 
 docker_build:
   stage: dockerbuild
   script:
     - echo $ACR_EE_USERNAME
     - echo $ACR_EE_REGISTRY
-#    - mvn package -Dmaven.test.skip=true --settings /usr/local/maven/conf/settings.xml
-#    - docker login -u $ACR_EE_USERNAME -p 'MMC@2023&ACR' $ACR_EE_REGISTRY
-#    - docker build -t ${ACR_EE_REGISTRY}/${ACR_EE_NAMESPACE}/${ACR_EE_IMAGE}:${TAG} .
-#    - docker push "${ACR_EE_REGISTRY}/${ACR_EE_NAMESPACE}/${ACR_EE_IMAGE}:${TAG}"
-#    - docker logout
+    - mvn package -Dmaven.test.skip=true --settings /usr/local/maven/conf/settings.xml
+    - docker login -u $ACR_EE_USERNAME -p 'MMC@2023&ACR' $ACR_EE_REGISTRY
+    - docker build -t ${ACR_EE_REGISTRY}/${ACR_EE_NAMESPACE}/${ACR_EE_IMAGE}:${TAG} .
+    - docker push "${ACR_EE_REGISTRY}/${ACR_EE_NAMESPACE}/${ACR_EE_IMAGE}:${TAG}"
+    - docker logouts
 
 
 kustomize_set_image_dev:
   stage: kustomize_tag_push
+  variables:
+    NAMESPACE: sharefly-dev
+    ACR_EE_NAMESPACE: sharefly-dev
   only:
     - develop
   before_script:
@@ -60,8 +62,12 @@ kustomize_set_image_dev:
 
 kustomize_set_image_prod:
   stage: kustomize_tag_push
+  variables:
+    NAMESPACE: sharefly
+    ACR_EE_NAMESPACE: sharefly
   only:
     - master
+    - merge
   before_script:
     - echo "master"
     - git config --global user.name "bax" #配置本地仓库用户名信息