diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 7bf56bd14e6b42979e83f5ed17120a9658e3c5e7..38e63ece935111f7c77f35bebd2ebc3469244151 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -63,10 +63,11 @@ review:xpub-collabra: variables: PACKAGE_NAME: xpub-collabra FORCE_FRESH_DB: "yes" + REQUIRES_PROVISIONING: "yes" environment: name: $PACKAGE_NAME/review/$CI_COMMIT_REF_NAME # !! kube-lego will fail if domain > 64 chars - url: "https://${CI_ENVIRONMENT_SLUG}.${BASE_DOMAIN}" + url: "http://${CI_ENVIRONMENT_SLUG}.${BASE_DOMAIN}" on_stop: stop_review:xpub-collabra except: - master @@ -79,6 +80,7 @@ stop_review:xpub-collabra: stage: review variables: PACKAGE_NAME: xpub-collabra + REQUIRES_PROVISIONING: "yes" GIT_STRATEGY: none environment: name: $PACKAGE_NAME/review/$CI_COMMIT_REF_NAME @@ -89,7 +91,7 @@ stop_review:xpub-collabra: script: - source deploy.sh - delete_deployment - + - delete_objects_in_environment pvc staging:xpub-collabra: image: pubsweet/deployer:latest @@ -144,8 +146,8 @@ demo:xpub-collabra: # PACKAGE_NAME: xpub-ui # environment: # name: $PACKAGE_NAME/review/$CI_COMMIT_REF_NAME -# # !! kube-lego will fail if domain > 64 chars -# url: "https://${CI_ENVIRONMENT_SLUG}.${BASE_DOMAIN}" +# # !! kube-lego will fail if domain > 63 chars +# url: "http://${CI_ENVIRONMENT_SLUG}.${BASE_DOMAIN}" # on_stop: stop_review:xpub-ui # except: # - master