测试10

.gitlab-ci.yml

@@ -11,8 +11,8 @@ cache:
 
 before_script:
 #配置环境
-#  - sudo cp ci/.envCi .env
-#  - sudo bash ci/installEnv.sh
+  - sudo cp ci/.envCi .env
+  - sudo bash ci/installEnv.sh
 
 build:
   stage: build
@@ -27,10 +27,10 @@ test:
     - testwas
   script:
     - echo "run test....."
-#    - path=`pwd`
-#    - sudo bash ci/judgePush.sh $path
-#    - php vendor/bin/phpunit --testsuite=Services
-#    - sudo bash ci/sendEmail.sh
+    - path=`pwd`
+    - sudo bash ci/judgePush.sh $path
+    - php vendor/bin/phpunit --testsuite=Services
+    - sudo bash ci/sendEmail.sh
 
 test_failed:
   stage: test_failed
@@ -38,8 +38,8 @@ test_failed:
     - testwas
   script:
     - echo "run test failed_1"
-#    - email=`sudo git log --pretty=format:"%ce" -1`
-#    - sudo bash ci/sendEmail.sh $email
+    - email=`sudo git log --pretty=format:"%ce" -1`
+    - sudo bash ci/sendEmail.sh $email
   when: on_failure
 
 deploy:
@@ -48,8 +48,8 @@ deploy:
     - testwas
   script:
     - echo "deploy ...."
-    - cd /var/www/bswas_test && sudo git config --global credential.helper store
-    - sudo git pull
-    - sudo bash ci/executeCommand.sh
+#    - cd /var/www/bswas_test && sudo git config --global credential.helper store
+#    - sudo git pull
+#    - sudo bash ci/executeCommand.sh
 #  only:
 #    - master

ci/sendEmail.sh

@@ -4,8 +4,8 @@ email=$*
 
 if [ "$email" == '' ]; then
 #    curl -i -X POST -d "status=success" http://bswas/api/email/send/gitPushSendEmail
-    curl -v "http://bswas/api/email/send/gitPushSendEmail?status=success"
+    curl -v "http://testwas.baoshi56.com/api/email/send/gitPushSendEmail?status=success"
 elif [ "$email" != '' ]; then
 #    curl -i -X POST -d "status=failed&email=$email&title=上传代码邮件通知&description=开发者上传代码失败,请检查错误!" http://bswas/api/email/send/gitPushSendEmail
-    curl -v "http://bswas/api/email/send/gitPushSendEmail?status=failed&email=$email&title=上传代码邮件通知&description=开发者上传代码失败,请检查错误!"
+    curl -v "http://testwas.baoshi56.com/api/email/send/gitPushSendEmail?status=failed&email=$email&title=上传代码邮件通知&description=开发者上传代码失败,请检查错误!"
 fi