Ver Fonte

测试11

hu hao há 4 anos atrás
pai
commit
ba4f5777c4
2 ficheiros alterados com 7 adições e 5 exclusões
  1. 5 1
      .gitlab-ci.yml
  2. 2 4
      ci/sendEmail.sh

+ 5 - 1
.gitlab-ci.yml

@@ -4,6 +4,9 @@ stages:
   - test_failed
   - deploy
 
+variables:
+  PARAM: "TEST"
+
 cache:
   paths:
     - vendor/
@@ -29,7 +32,8 @@ test:
     - echo "run test....."
     - path=`pwd`
     - sudo bash ci/judgePush.sh $path
-    - php vendor/bin/phpunit --testsuite=Services
+    - $PARAM=`php vendor/bin/phpunit --testsuite=Services|grep`
+    - echo "$PARAM"
     - sudo bash ci/sendEmail.sh
 
 test_failed:

+ 2 - 4
ci/sendEmail.sh

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