client test job

.gitlab-ci.yml

@@ -44,7 +44,7 @@ job_build-image:
     - docker network ls
 
 
-job_test-server-image:
+job_test-image:
   stage: test
   image: docker:20.10.12
   tags:
@@ -55,68 +55,30 @@ job_test-server-image:
     # NOTE: some random port that hopefully is free on the runner
     outerPort: '3002'
   before_script:
-    - docker network create -d bridge test-server-img-network
+    - docker network create -d bridge test-img-network
     - docker login -u ${CI_REGISTRY_USER} -p ${CI_REGISTRY_PASSWORD} ${CI_REGISTRY}
     - docker pull mongo
     - docker volume create mongodb
-    - docker run -p 27017:27017 -v mongodb:/.local/db/data/db --name mongo --network test-server-img-network -d mongo:4.4.13-rc0
+    - docker run -p 27017:27017 -v mongodb:/.local/db/data/db --name mongo --network test-img-network -d mongo:4.4.13-rc0
 
   script:
-    - docker build --file "./app/server/Dockerfile.testBackend" --tag testimgbackend:latest .
+    - docker build --file "./app/server/Dockerfile.testBackend" --tag testimg:latest .
     - docker run
-      --network=test-server-img-network
+      --network=test-img-network
       --env MONGODB_URL=mongodb://mongo:27017
       --env JWT_SECRET=test
       --name "${CI_PROJECT_ID}-${CI_PIPELINE_IID}"
-      "testimgbackend:latest"
+      "testimg:latest"
 
   after_script:
     # NOTE: clean up after test run (stop and remove container, clean up network and mongo db)
     - docker rm --force "${CI_PROJECT_ID}-${CI_PIPELINE_IID}"
     - docker image rm --force mongo
-    - docker network rm test-server-img-network
-    - docker network ls
-    - docker network prune
-    - docker kill $(docker ps -q)
-
-job_test-client-image:
-  stage: test
-  image: docker:20.10.12
-  tags:
-    - docker-privileged
-  services:
-    - name: docker:20.10.12-dind
-  variables:
-    # NOTE: some random port that hopefully is free on the runner
-    outerPort: '3002'
-  before_script:
-    - docker network create -d bridge test-client-img-network
-    - docker login -u ${CI_REGISTRY_USER} -p ${CI_REGISTRY_PASSWORD} ${CI_REGISTRY}
-    - docker pull mongo
-    - docker volume create mongodb
-    - docker run -p 27017:27017 -v mongodb:/.local/db/data/db --name mongo --network test-client-img-network -d mongo:4.4.13-rc0
-
-  script:
-    - docker build --file "./app/server/Dockerfile.testFrontend" --tag testimgfrontend:latest .
-    - docker run
-      --network=test-client-img-network
-      --env MONGODB_URL=mongodb://mongo:27017
-      --env JWT_SECRET=test
-      --name "${CI_PROJECT_ID}-${CI_PIPELINE_IID}"
-      "testimgfrontend:latest"
-
-  after_script:
-    # NOTE: clean up after test run (stop and remove container, clean up network and mongo db)
-    - docker rm --force "${CI_PROJECT_ID}-${CI_PIPELINE_IID}"
-    - docker image rm --force mongo
-    - docker network rm test-client-img-network
+    - docker network rm test-img-network
     - docker network ls
     - docker network prune
     - docker kill $(docker ps -q)
 
 job_bridge:
   stage: deploy
-  needs:
-    - job_test-server-image
-    - job_test-client-image
   trigger: s80984/devopsproject