Merge remote-tracking branch 'origin/master'

cicd/hsp.yml

@@ -46,40 +46,30 @@ test-formail:
     - docker push $IMAGE_TAG_LATEST_DEV
     - docker push $IMAGE_TAG_NAME_DEV
 
-#.deploy:
-#  stage: deploy
-#  before_script:
-#    - apk add --no-cache curl
-#
-#deploy_head:
-#  extends: .deploy
-#  except:
-#    - tags
-#  environment:
-#    name: Head
-#    url: $HEAD_URL
-#  script:
-#    - curl -X POST $HEAD_HOOK
-#    - curl -X POST $HEAD_NGINX_HOOK
-#
-#deploy_stage:
-#  extends: .deploy
-#  only:
-#    - tags
-#  except:
-#    - /-release$/
-#  environment:
-#    name: Stage
-#    url: $STAGE_URL
-#  script:
-#    - curl -X POST $STAGE_HOOK
-#
-#deploy_prod:
-#  extends: .deploy
-#  only:
-#    - /-release$/
-#  environment:
-#    name: Prod
-#    url: $PROD_URL
-#  script:
-#    - curl -X POST $PROD_HOOK
+.deploy:
+  stage: deploy
+  before_script:
+    - apk add --no-cache curl
+
+deploy_head:
+  extends: .deploy
+  except:
+    - tags
+  environment:
+    name: Head
+    url: $HEAD_URL
+  script:
+    - curl -X POST $HEAD_HOOK
+    - curl -X POST $HEAD_NGINX_HOOK
+
+
+deploy_prod:
+  extends: .deploy
+  only:
+    - /-release$/
+  environment:
+    name: Prod
+    url: $PROD_URL
+  script:
+    - curl -X POST $PROD_HOOK
+    - curl -X POST $PROD_NGINX_HOOK