diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ce05a2d02b32f3c728f89c6561a089c51a117698..69f6f6b1bdcbcccbe74edc56b297bfa4138d7b0d 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,14 +1,18 @@ +include: + template: DAST.gitlab-ci.yml + stages: - build +# - test - deploy - dast -include: - - template: DAST.gitlab-ci.yml - variables: - DAST_WEBSITE: http://vm3816.kaj.pouta.csc.fi:30149/ - when: manual + DAST_WEBSITE: "http://vm3733.kaj.pouta.csc.fi:30149/" +# DAST_FULL_SCAN_ENABLED: "true" +# DAST_AUTH_URL: "http://vm3733.kaj.pouta.csc.fi:30149/login" +# DAST_AUTH_USERNAME: “DAST†+# DAST_AUTH_PASSWORD: “DAST†build: stage: build @@ -61,11 +65,3 @@ deploy: - kubectl apply -f $CI_PROJECT_DIR/conduit-front/front-service.yaml - kubectl apply -f $CI_PROJECT_DIR/conduit-front/front-deployment.yaml - kubectl -n default rollout restart deployment front - - -# script: echo "Deploying Frontend" -# image: bitnami/kubectl:latest -# script: -# - kubectl apply -f $CI_PROJECT_DIR/conduit-front/front-service.yaml -# - kubectl apply -f $CI_PROJECT_DIR/conduit-front/front-deployment.yaml -# - kubectl -n default rollout restart deployment front