From e7e3fec4a57bdc230310cf2e81af6fa9967f8b9b Mon Sep 17 00:00:00 2001
From: "agbarneo@optaresolutions.com" <agbarneo@optaresolutions.com>
Date: Mon, 21 Oct 2024 10:53:25 +0000
Subject: [PATCH] Fixed wrong identation

---
 src/service/.gitlab-ci.yml | 151 ++++++++++++++++---------------------
 1 file changed, 67 insertions(+), 84 deletions(-)

diff --git a/src/service/.gitlab-ci.yml b/src/service/.gitlab-ci.yml
index bae51e83d..83d01a903 100644
--- a/src/service/.gitlab-ci.yml
+++ b/src/service/.gitlab-ci.yml
@@ -49,23 +49,22 @@ unit_test service:
   before_script:
     - docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY
     - if docker network list | grep teraflowbridge; then echo "teraflowbridge is already created"; else docker network create --driver=bridge teraflowbridge; fi
-
-    # Context-related
-    - if docker container ls | grep crdb; then docker rm -f crdb; else echo "CockroachDB container is not in the system"; fi
-    - if docker volume ls | grep crdb; then docker volume rm -f crdb; else echo "CockroachDB volume is not in the system"; fi
-    - if docker container ls | grep nats; then docker rm -f nats; else echo "NATS container is not in the system"; fi
-
-    # Device-related
-    - if docker container ls | grep context; then docker rm -f context; else echo "context image is not in the system"; fi
-    - if docker container ls | grep device; then docker rm -f device; else echo "device image is not in the system"; fi
-
-    # Pathcomp-related
-    - if docker container ls | grep pathcomp-frontend; then docker rm -f pathcomp-frontend; else echo "pathcomp-frontend image is not in the system"; fi
-    - if docker container ls | grep pathcomp-backend; then docker rm -f pathcomp-backend; else echo "pathcomp-backend image is not in the system"; fi
-
-    # Service-related
-    - if docker container ls | grep $IMAGE_NAME; then docker rm -f $IMAGE_NAME; else echo "$IMAGE_NAME image is not in the system"; fi
-
+    - |
+      # Context-related
+      if docker container ls | grep crdb; then docker rm -f crdb; else echo "CockroachDB container is not in the system"; fi
+      if docker volume ls | grep crdb; then docker volume rm -f crdb; else echo "CockroachDB volume is not in the system"; fi
+      if docker container ls | grep nats; then docker rm -f nats; else echo "NATS container is not in the system"; fi
+    - |
+      # Device-related
+      if docker container ls | grep context; then docker rm -f context; else echo "context image is not in the system"; fi
+      if docker container ls | grep device; then docker rm -f device; else echo "device image is not in the system"; fi
+    - |
+      # Pathcomp-related
+      if docker container ls | grep pathcomp-frontend; then docker rm -f pathcomp-frontend; else echo "pathcomp-frontend image is not in the system"; fi
+      if docker container ls | grep pathcomp-backend; then docker rm -f pathcomp-backend; else echo "pathcomp-backend image is not in the system"; fi
+    - |
+      # Service-related
+      if docker container ls | grep $IMAGE_NAME; then docker rm -f $IMAGE_NAME; else echo "$IMAGE_NAME image is not in the system"; fi
   script:
     - docker pull "cockroachdb/cockroach:latest-v22.2"
     - docker pull "nats:2.9"
@@ -74,17 +73,16 @@ unit_test service:
     - docker pull "$CI_REGISTRY_IMAGE/pathcomp-frontend:$IMAGE_TAG"
     - docker pull "$CI_REGISTRY_IMAGE/pathcomp-backend:$IMAGE_TAG"
     - docker pull "$CI_REGISTRY_IMAGE/$IMAGE_NAME:$IMAGE_TAG"
-
-    # Context preparation
-    - docker volume create crdb
-    - >
-      docker run --name crdb -d --network=teraflowbridge -p 26257:26257 -p 8080:8080
-      --env COCKROACH_DATABASE=tfs_test --env COCKROACH_USER=tfs --env COCKROACH_PASSWORD=tfs123
-      --volume "crdb:/cockroach/cockroach-data"
-      cockroachdb/cockroach:latest-v22.2 start-single-node
-    - >
-      docker run --name nats -d --network=teraflowbridge -p 4222:4222 -p 8222:8222
-      nats:2.9 --http_port 8222 --user tfs --pass tfs123
+    - |
+      # Context preparation
+      docker volume create crdb
+      docker run --name crdb -d --network=teraflowbridge -p 26257:26257 -p 8080:8080 \
+        --env COCKROACH_DATABASE=tfs_test --env COCKROACH_USER=tfs --env COCKROACH_PASSWORD=tfs123 \
+        --volume "crdb:/cockroach/cockroach-data" \
+        cockroachdb/cockroach:latest-v22.2 start-single-node
+    - |
+      docker run --name nats -d --network=teraflowbridge -p 4222:4222 -p 8222:8222 \
+        nats:2.9 --http_port 8222 --user tfs --pass tfs123
     - echo "Waiting for initialization..."
     - while ! docker logs crdb 2>&1 | grep -q 'finished creating default user "tfs"'; do sleep 1; done
     - docker logs crdb
@@ -95,55 +93,50 @@ unit_test service:
     - echo $CRDB_ADDRESS
     - NATS_ADDRESS=$(docker inspect nats --format "{{.NetworkSettings.Networks.teraflowbridge.IPAddress}}")
     - echo $NATS_ADDRESS
-    - >
-      docker run --name context -d -p 1010:1010
-      --env "CRDB_URI=cockroachdb://tfs:tfs123@${CRDB_ADDRESS}:26257/tfs_test?sslmode=require"
-      --env "MB_BACKEND=nats"
-      --env "NATS_URI=nats://tfs:tfs123@${NATS_ADDRESS}:4222"
-      --network=teraflowbridge
-      $CI_REGISTRY_IMAGE/context:$IMAGE_TAG
+    - |
+      docker run --name context -d -p 1010:1010 \
+        --env "CRDB_URI=cockroachdb://tfs:tfs123@${CRDB_ADDRESS}:26257/tfs_test?sslmode=require" \
+        --env "MB_BACKEND=nats" \
+        --env "NATS_URI=nats://tfs:tfs123@${NATS_ADDRESS}:4222" \
+        --network=teraflowbridge \
+        $CI_REGISTRY_IMAGE/context:$IMAGE_TAG
     - CONTEXTSERVICE_SERVICE_HOST=$(docker inspect context --format "{{.NetworkSettings.Networks.teraflowbridge.IPAddress}}")
     - echo $CONTEXTSERVICE_SERVICE_HOST
-
-    # Device preparation
-    - >
-      docker run --name device -d -p 2020:2020
-      --env "CONTEXTSERVICE_SERVICE_HOST=${CONTEXTSERVICE_SERVICE_HOST}"
-      --network=teraflowbridge
-      $CI_REGISTRY_IMAGE/device:$IMAGE_TAG
+    - |
+      # Device preparation
+      docker run --name device -d -p 2020:2020 \
+        --env "CONTEXTSERVICE_SERVICE_HOST=${CONTEXTSERVICE_SERVICE_HOST}" \
+        --network=teraflowbridge \
+        $CI_REGISTRY_IMAGE/device:$IMAGE_TAG
     - DEVICESERVICE_SERVICE_HOST=$(docker inspect device --format "{{.NetworkSettings.Networks.teraflowbridge.IPAddress}}")
     - echo $DEVICESERVICE_SERVICE_HOST
-
-    # PathComp preparation
-    - >
-      docker run --name pathcomp-backend -d -p 8081:8081
-      --network=teraflowbridge
-      $CI_REGISTRY_IMAGE/pathcomp-backend:$IMAGE_TAG
+    - |
+      # PathComp preparation
+      docker run --name pathcomp-backend -d -p 8081:8081 \
+        --network=teraflowbridge \
+        $CI_REGISTRY_IMAGE/pathcomp-backend:$IMAGE_TAG
     - PATHCOMP_BACKEND_HOST=$(docker inspect pathcomp-backend --format "{{.NetworkSettings.Networks.teraflowbridge.IPAddress}}")
     - echo $PATHCOMP_BACKEND_HOST
     - sleep 1
-    - >
-      docker run --name pathcomp-frontend -d -p 10020:10020
-      --env "CONTEXTSERVICE_SERVICE_HOST=${CONTEXTSERVICE_SERVICE_HOST}"
-      --env "PATHCOMP_BACKEND_HOST=${PATHCOMP_BACKEND_HOST}"
-      --env "PATHCOMP_BACKEND_PORT=8081"
-      --network=teraflowbridge
-      $CI_REGISTRY_IMAGE/pathcomp-frontend:$IMAGE_TAG
+    - |
+      docker run --name pathcomp-frontend -d -p 10020:10020 \
+        --env "CONTEXTSERVICE_SERVICE_HOST=${CONTEXTSERVICE_SERVICE_HOST}" \
+        --env "PATHCOMP_BACKEND_HOST=${PATHCOMP_BACKEND_HOST}" \
+        --env "PATHCOMP_BACKEND_PORT=8081" \
+        --network=teraflowbridge \
+        $CI_REGISTRY_IMAGE/pathcomp-frontend:$IMAGE_TAG
     - sleep 1
     - PATHCOMPSERVICE_SERVICE_HOST=$(docker inspect pathcomp-frontend --format "{{.NetworkSettings.Networks.teraflowbridge.IPAddress}}")
     - echo $PATHCOMPSERVICE_SERVICE_HOST
-
-    # Service preparation
-    - >
-      docker run --name $IMAGE_NAME -d -p 3030:3030
-      --env "CONTEXTSERVICE_SERVICE_HOST=${CONTEXTSERVICE_SERVICE_HOST}"
-      --env "DEVICESERVICE_SERVICE_HOST=${DEVICESERVICE_SERVICE_HOST}"
-      --env "PATHCOMPSERVICE_SERVICE_HOST=${PATHCOMPSERVICE_SERVICE_HOST}"
-      --volume "$PWD/src/$IMAGE_NAME/tests:/opt/results"
-      --network=teraflowbridge
-      $CI_REGISTRY_IMAGE/$IMAGE_NAME:$IMAGE_TAG
-
-    # Check status before the tests
+    - |
+      # Service preparation
+      docker run --name $IMAGE_NAME -d -p 3030:3030 \
+        --env "CONTEXTSERVICE_SERVICE_HOST=${CONTEXTSERVICE_SERVICE_HOST}" \
+        --env "DEVICESERVICE_SERVICE_HOST=${DEVICESERVICE_SERVICE_HOST}" \
+        --env "PATHCOMPSERVICE_SERVICE_HOST=${PATHCOMPSERVICE_SERVICE_HOST}" \
+        --volume "$PWD/src/$IMAGE_NAME/tests:/opt/results" \
+        --network=teraflowbridge \
+        $CI_REGISTRY_IMAGE/$IMAGE_NAME:$IMAGE_TAG
     - sleep 5
     - docker ps -a
     - docker logs context
@@ -151,16 +144,14 @@ unit_test service:
     - docker logs pathcomp-frontend
     - docker logs pathcomp-backend
     - docker logs $IMAGE_NAME
-
-    # Run the tests
-    - >
-      docker exec -i $IMAGE_NAME bash -c
-      "coverage run -m pytest --log-level=INFO --verbose $IMAGE_NAME/tests/test_unitary.py --junitxml=/opt/results/${IMAGE_NAME}_report.xml"
+    - |
+      # Run the tests
+      docker exec -i $IMAGE_NAME bash -c \
+        "coverage run -m pytest --log-level=INFO --verbose $IMAGE_NAME/tests/test_unitary.py --junitxml=/opt/results/${IMAGE_NAME}_report.xml"
     - docker exec -i $IMAGE_NAME bash -c "coverage report --include='${IMAGE_NAME}/*' --show-missing"
-
-    # QKD Mock Nodes Deployment
     - echo "Starting stage: deploy_mock_nodes"
-    - for port in 11111 22222 33333; do
+    - |
+      for port in 11111 22222 33333; do
         if lsof -i:$port >/dev/null 2>&1; then
           echo "Freeing up port $port..."
           fuser -k $port/tcp
@@ -197,32 +188,25 @@ unit_test service:
         echo "Error: Mock nodes failed to start after multiple attempts."
         exit 1
       fi
-
-    # Run QKD Bootstrap Test
     - docker exec -i $IMAGE_NAME bash -c "coverage run --append -m pytest --log-level=INFO --verbose service/tests/qkd/test_functional_bootstrap.py"
-
   coverage: '/TOTAL\s+\d+\s+\d+\s+(\d+%)/'
   after_script:
-    # Check status after the tests
     - docker ps -a
     - docker logs context
     - docker logs device
     - docker logs pathcomp-frontend
     - docker logs pathcomp-backend
     - docker logs $IMAGE_NAME
-
     - docker rm -f $IMAGE_NAME
     - docker rm -f pathcomp-frontend
     - docker rm -f pathcomp-backend
     - docker rm -f device
     - docker rm -f context
-
     - docker rm -f $IMAGE_NAME crdb nats
     - docker volume rm -f crdb
     - docker network rm teraflowbridge
     - docker volume prune --force
     - docker image prune --force
-
   rules:
     - if: '$CI_PIPELINE_SOURCE == "merge_request_event" && ($CI_MERGE_REQUEST_TARGET_BRANCH_NAME == "develop" || $CI_MERGE_REQUEST_TARGET_BRANCH_NAME == $CI_DEFAULT_BRANCH)'
     - if: '$CI_PIPELINE_SOURCE == "push" && $CI_COMMIT_BRANCH == "develop"'
@@ -234,7 +218,6 @@ unit_test service:
       - src/$IMAGE_NAME/tests/*.py
       - manifests/${IMAGE_NAME}service.yaml
       - .gitlab-ci.yml
-
   artifacts:
       when: always
       reports:
@@ -264,4 +247,4 @@ unit_test service:
 #    - if: '$CI_PIPELINE_SOURCE == "merge_request_event" && ($CI_MERGE_REQUEST_TARGET_BRANCH_NAME == "develop" || $CI_MERGE_REQUEST_TARGET_BRANCH_NAME == $CI_DEFAULT_BRANCH)'
 #      when: manual    
 #    - if: '$CI_PIPELINE_SOURCE == "push" && $CI_COMMIT_BRANCH == "develop"'
-#      when: manual
+#      when: manual
\ No newline at end of file
-- 
GitLab