合并分支 'czq' 到 'master'

.gitlab-ci.yml

-#  stages:
-#    - build
-#    - test
-#    - deploy
-#
-#  job 1:
-#      stage: build
-#      script:
-#        - mvn clean package
-#
-#  job 2:
-#      stage: test
-#      script:
-#        - echo "开始测试"
-#      only:
-#        - master
-#      tags:
-#        - czq-Runner
-#  job 2:
-#      stage: build
-#      script:
-#        - echo "编译中。。。。"
-#      only:
-#        - master
-#      tags:
-#        - czq-Runner
-#  job 3:
-#      stage: deploy
-#      script:
-#        - echo "发布中...."
-#      only:
-#        - master
-#      tags:
-#        - czq-Runner
-
+  cache:
+    paths:
+      - /home/czq/
 
-variables:
-  MAVEN_OPTS: "-Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=WARN -Dorg.slf4j.simpleLogger.showDateTime=true -Djava.awt.headless=true"
-  MAVEN_CLI_OPTS: "--batch-mode --errors --fail-at-end --show-version -DinstallAtEnd=true -DdeployAtEnd=true"
+  stages:
+    - build
+    - test
+    - deploy
 
-#定义后续运行之间应缓存的文件列表
-cache:
-  paths:
-  - /data/tools/maven3/repo
+  job 1:
+      stage: build
+      script:
+        - 'mvn clean package'
+      only:
+        - master
+      tags:
+        - czq-Runner
+  job 2:
+      stage: test
+      script:
+        - echo "测试中。。。。"
+      only:
+        - master
+      tags:
+        - czq-Runner
 
-.validate: &validate
-  stage: build
-  script:
-  - 'mvn $MAVEN_CLI_OPTS test-compile'
+  job 3:
+      stage: deploy
+      script:
+        - 'java -jar adaptation-master-0.0.1-SNAPSHOT.jar'
+      only:
+        - master
+      tags:
+        - czq-Runner
 
-.verify: &verify
-  stage: test
-  script:
-  - 'mvn $MAVEN_CLI_OPTS verify'
-  only:
-  - master
 
-validate:jdk8:
-  <<: *validate
-  image: maven:3.5.2-jdk-8
 
-verify:jdk8:
-  <<: *verify
-  image: maven:3.5.2-jdk-8
-
-install:jdk8:
-  stage: test
-  script:
-  - '/data/tools/maven3/bin/mvn clean package -U install'
-  only:
-  - master
-  image: maven:3.5.2-jdk-8
-
-deploy:jdk8:
-  image: busybox:latest
-  stage: deploy
-  script:
-  - '/data/tools/maven3/bin/mvn deploy'
-  dependencies:
-  - install:jdk8
-  only:
-  - master
\ No newline at end of file
+#variables:
+#  MAVEN_OPTS: "-Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=WARN -Dorg.slf4j.simpleLogger.showDateTime=true -Djava.awt.headless=true"
+#  MAVEN_CLI_OPTS: "--batch-mode --errors --fail-at-end --show-version -DinstallAtEnd=true -DdeployAtEnd=true"
+#
+##定义后续运行之间应缓存的文件列表
+#cache:
+#  paths:
+#  - /data/tools/maven3/repo
+##验证
+#.validate: &validate
+#  stage: build
+#  script:
+#  - 'mvn $MAVEN_CLI_OPTS test-compile'
+#
+##核实
+#.verify: &verify
+#  stage: test
+#  script:
+#  - 'mvn $MAVEN_CLI_OPTS verify'
+#  only:
+#  - master
+#
+#validate:jdk8:
+#  <<: *validate
+#  image: maven:3.5.2-jdk-8
+#
+#verify:jdk8:
+#  <<: *verify
+#  image: maven:3.5.2-jdk-8
+#
+#install:jdk8:
+#  stage: test
+#  script:
+#  - '/data/tools/maven3/bin/mvn clean package -U install'
+#  only:
+#  - master
+#  image: maven:3.5.2-jdk-8
+#
+#deploy:jdk8:
+#  image: busybox:latest
+#  stage: deploy
+#  script:
+#  - '/data/tools/maven3/bin/mvn deploy'
+#  dependencies:
+#  - install:jdk8
+#  only:
+#  - master
\ No newline at end of file