From a9388f0f1ce4c59e49af9937cea84c898c738bea Mon Sep 17 00:00:00 2001
From: Lluis Gifre <lluis.gifre@cttc.es>
Date: Wed, 3 Aug 2022 16:05:03 +0000
Subject: [PATCH] Arranged GitLab CI/CD for PathComp component
---
src/pathcomp/.gitlab-ci.yml | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/pathcomp/.gitlab-ci.yml b/src/pathcomp/.gitlab-ci.yml
index ce0ab7b9b..fa3dff8c2 100644
--- a/src/pathcomp/.gitlab-ci.yml
+++ b/src/pathcomp/.gitlab-ci.yml
@@ -87,7 +87,7 @@ unit test pathcomp-backend:
- sleep 5
- docker ps -a
- docker logs ${IMAGE_NAME}-backend
- - docker exec -i $IMAGE_NAME-backend bash -c "curl -0 -v -X POST -H 'Content-Type:application/json' http://127.0.0.1:8081/pathComp/api/v1/compRoute -d @/var/teraflow/test/inter_domain_test.txt"
+ - docker exec -i $IMAGE_NAME-backend bash -c "curl -0 -v -X POST -H \"Expect:\" -H \"Content-Type: application/json\" http://127.0.0.1:8081/pathComp/api/v1/compRoute -d @/var/teraflow/test/inter_domain_test.txt"
- docker exec -i $IMAGE_NAME-backend bash -c "killall -USR1 pathComp-cvr"
- docker exec -i $IMAGE_NAME-backend bash -c "gcovr"
coverage: '/TOTAL\s+\d+\s+\d+\s+(\d+%)/'
@@ -128,8 +128,9 @@ unit test pathcomp-frontend:
script:
- docker pull "$CI_REGISTRY_IMAGE/${IMAGE_NAME}-frontend:$IMAGE_TAG"
- docker pull "$CI_REGISTRY_IMAGE/${IMAGE_NAME}-backend:$IMAGE_TAG"
- - docker run --name ${IMAGE_NAME}-frontend -d -p 10020:10020 -v "$PWD/src/${IMAGE_NAME}/frontend/tests:/opt/results" --network=teraflowbridge $CI_REGISTRY_IMAGE/${IMAGE_NAME}-frontend:$IMAGE_TAG
- docker run --name ${IMAGE_NAME}-backend -d -p 8081:8081 -v "$PWD/src/${IMAGE_NAME}/backend/tests:/opt/results" --network=teraflowbridge $CI_REGISTRY_IMAGE/${IMAGE_NAME}-backend:$IMAGE_TAG
+ - sleep 1
+ - docker run --name ${IMAGE_NAME}-frontend -d -p 10020:10020 --env "PATHCOMP_BACKEND_HOST=${IMAGE_NAME}-backend" --env "PATHCOMP_BACKEND_PORT=8081" -v "$PWD/src/${IMAGE_NAME}/frontend/tests:/opt/results" --network=teraflowbridge $CI_REGISTRY_IMAGE/${IMAGE_NAME}-frontend:$IMAGE_TAG
- sleep 5
- docker ps -a
- docker logs ${IMAGE_NAME}-frontend
--
GitLab