From cac45825b23674ba09d58c5f6c043a2306c8d5dc Mon Sep 17 00:00:00 2001
From: M9713 <m9713@student.jamk.fi>
Date: Mon, 22 Nov 2021 16:11:42 +0200
Subject: [PATCH] Update .gitlab-ci.yml

---
 .gitlab-ci.yml | 22 +++++++++-------------
 1 file changed, 9 insertions(+), 13 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ce05a2d..69f6f6b 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 
-- 
GitLab