gitlab-ci

.gitlab-ci.yml

@@ -2,6 +2,7 @@ stages:
   - clean
   - dockerbuild
   - deploy
+  - push
 
 
 variables:
@@ -19,7 +20,8 @@ variables:
   ACR_EE_IMAGE: cms-test
   ACR_EE_TAG: $CI_COMMIT_SHA
   JAVA_VERSION: '8'
-  GITLAB_URL: https://oauth2:MjVJKxB7m4tCy7symBzn@git.mmcuav.cn/iuav/cms.git
+  GITLAB_URL: https://oauth2:6wsXz1Kq2biuG9P1NQ6G@git.mmcuav.cn/dzl/cms-ci-test.git
+
 
 
 mvn_clean:
@@ -37,9 +39,19 @@ docker_build:
     - 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
 
 cms-argocd-deploy:
   stage: deploy
   script:
   - cd kustomization/overlays/dev
-  - kustomize edit set image REGISTRY/NAMESPACE/IMAGE:TAG=$REGISTRY/$NAMESPACE/$IMAGE:$TAG
+  - kustomize edit set image REGISTRY/NAMESPACE/IMAGE:TAG=$REGISTRY/$NAMESPACE/$IMAGE:$TAG
\ No newline at end of file
+
+cms-commit-push:
+  stage: push
+  script:
+    - git config user.name "bax"
+    - git config user.email "baoaixin1999@163.com"
+    - git remote set-url cms-ci "$GITLAB_URL"
+    - git tag -a $TAG -m "日常迭代"
+    - git push cms-ci master --tag
\ No newline at end of file

kustomization/overlays/dev/kustomization.yaml

@@ -17,5 +17,5 @@ patches:
 #    name: cms-svc
 images:
 - name: REGISTRY/NAMESPACE/IMAGE:TAG
-  newName: mmc-registry.cn-shenzhen.cr.aliyuncs.com/sharefly-dev/cms
+  newName: mmc-registry.cn-shenzhen.cr.aliyuncs.com/sharefly-dev/cms-test
   newTag: 2419eaf6f5b03b29f5e861246d60dd58f30cd7ef