调整yml

.gitlab-ci.yml

@@ -9,7 +9,9 @@ variables:
 
 stages:
   - build
-  - test
+  - pveclear
+  - pvedeploy
+  - clear
   - deploy
 
 build:
@@ -26,21 +28,39 @@ build:
     - docker push ${IMAGE_NAME}
     - docker rmi ${IMAGE_NAME}
 
-test:
-  stage: test
+pveclear:
+  stage: pveclear
   tags:
     - dockerbase
-  only:
-    - master
   script:
     - docker stop ${APP_NAME}
     - docker rm ${APP_NAME}
+  allow_failure: true
+
+pvedeploy:
+  stage: pvedeploy
+  tags:
+    - dockerbase
+  script:
     - docker login --username=${DOCKER_USERNAME} --password=${DOCKER_PASSWORD} ${DOCKER_REGION}
     - docker pull ${IMAGE_NAME}
     - docker run -d --name ${APP_NAME} -p 6666:80 ${IMAGE_NAME}
   cache:
     policy: pull
 
+
+ali2clear:
+  stage: clear
+  tags:
+    - ali2
+  only:
+    - master
+  script:
+    - docker stop ${APP_NAME}
+    - docker rm ${APP_NAME}
+  allow_failure: true
+  when: manual
+
 ali2deploy:
   stage: deploy
   tags:
@@ -48,11 +68,9 @@ ali2deploy:
   only:
     - master
   script:
-    - docker stop ${APP_NAME}
-    - docker rm ${APP_NAME}
     - docker login --username=${DOCKER_USERNAME} --password=${DOCKER_PASSWORD} ${DOCKER_REGION}
     - docker pull ${IMAGE_NAME}
     - docker run -d --name ${APP_NAME} -p 127.0.0.1:5012:80 ${IMAGE_NAME}
   cache:
     policy: pull
-  when: manual
+  when: on_success