bbb

.gitlab-ci.yml

@@ -4,7 +4,6 @@ include:
   - template: Security/Secret-Detection.gitlab-ci.yml
   - template: Dependency-Scanning.gitlab-ci.yml
   - template: Security/License-Scanning.gitlab-ci.yml
-  - template: Container-Scanning.gitlab-ci.yml
 
 image: docker:20.10.5
 
@@ -22,16 +21,6 @@ stages:
   - deploy
 
 
-code_quality:
-  stage: check
-sast:
-  stage: check
-.secret-analyzer:
-  stage: check
-dependency_scanning:
-  stage: check
-
-
 build:
   stage: build
   script:
@@ -54,15 +43,26 @@ test-unit:
     - make run-detached
     - make test-unit
 
-# test-e2e:
-#   stage: test
-#   script:
-#     - apk add make docker-compose
-#     - make init-dev-config
-#     - docker load -i backend_image.tar
-#     - make run-detached
-#     - sleep 20
-#     - make test-e2e
+test-e2e:
+  stage: test
+  script:
+    - apk add make docker-compose
+    - make init-dev-config
+    - docker load -i backend_image.tar
+    - make run-detached
+    - sleep 20
+    - make test-e2e
+
+code_quality:
+  stage: check
+sast:
+  stage: check
+.secret-analyzer:
+  stage: check
+dependency_scanning:
+  stage: check
+license_scanning:
+  stage: check
 
 deploy-docker-image:
   stage: deploy
@@ -78,13 +78,13 @@ deploy-docker-image:
   rules:
     - if: '$CI_COMMIT_BRANCH == "master"'
 
-# deploy-tagged-docker-image:
-#   stage: deploy
-#   script:
-#     - docker load -i backend_latest.tar
-#     - docker tag iqbberlin/testcenter-backend:latest iqbberlin/testcenter-backend:$CI_COMMIT_TAG
-#     - echo "$DOCKERHUB_PASSWORD" | docker login -u "$DOCKERHUB_USERNAME" --password-stdin
-#     - docker push iqbberlin/testcenter-backend:$CI_COMMIT_TAG
-#   rules:
-#     - if: '$CI_COMMIT_TAG'
-#     - if: '$CI_COMMIT_BRANCH == "master"'
+deploy-tagged-docker-image:
+  stage: deploy
+  script:
+    - docker load -i backend_latest.tar
+    - docker tag iqbberlin/testcenter-backend:latest iqbberlin/testcenter-backend:$CI_COMMIT_TAG
+    - echo "$DOCKERHUB_PASSWORD" | docker login -u "$DOCKERHUB_USERNAME" --password-stdin
+    - docker push iqbberlin/testcenter-backend:$CI_COMMIT_TAG
+  rules:
+    - if: '$CI_COMMIT_TAG'
+    - if: '$CI_COMMIT_BRANCH == "master"'