gitlab

.gitlab-ci.yml

@@ -4,7 +4,6 @@ stages:
   - deploy
   - push
 
-
 variables:
   REGION_id: cn-shenzhen
   REGISTRY: mmc-registry.cn-shenzhen.cr.aliyuncs.com
@@ -21,11 +20,16 @@ variables:
   ACR_EE_TAG: $CI_COMMIT_SHA
   JAVA_VERSION: '8'
   GITLAB_URL: https://oauth2:6wsXz1Kq2biuG9P1NQ6G@git.mmcuav.cn/dzl/cms-ci-test.git
-
+  GITLAB_REGISTRY: http://git.mmcuav.cn/dzl/cms-ci-test.git
 
 
 mvn_clean:
   stage: clean
+  before_script:
+    - git remote add origin "$GITLAB_REGISTRY"
+    - git config --global user.name "bax" #配置本地仓库用户名信息
+    - git config --global user.email "bax@example.com" #配置本地仓库邮箱信息
+    - git pull origin master
   script:
     - echo "清理中ing.........."
     - mvn clean -B -Dmaven.test.skip=true --settings /usr/local/maven/conf/settings.xml
@@ -43,10 +47,7 @@ docker_build:
 
 cms-argocd-deploy:
   stage: deploy
-  before_script:
-    - git remote set-url origin "$GITLAB_URL"
-    - git config --global user.name "Administrator" #配置本地仓库用户名信息
-    - git config --global user.email "admin@example.com" #配置本地仓库邮箱信息
+
   script:
     - cd kustomization/overlays/dev
     - kustomize edit set image REGISTRY/NAMESPACE/IMAGE:TAG=$REGISTRY/$NAMESPACE/$IMAGE:$TAG