From 9c932151ac50e52034c1734788b49197f6d1647e Mon Sep 17 00:00:00 2001 From: Javi Moreno Date: Fri, 23 Jul 2021 07:11:09 -0400 Subject: [PATCH] Changes in the script to run the service locally --- src/monitoring/.gitlab-ci.yml | 6 ++++-- src/monitoring/build.sh | 3 --- src/monitoring/clean.sh | 1 - src/monitoring/start.sh | 1 - 4 files changed, 4 insertions(+), 7 deletions(-) diff --git a/src/monitoring/.gitlab-ci.yml b/src/monitoring/.gitlab-ci.yml index 0fd5e8602..f65223412 100644 --- a/src/monitoring/.gitlab-ci.yml +++ b/src/monitoring/.gitlab-ci.yml @@ -79,9 +79,11 @@ test monitoring pytest: before_script: - if docker network list | grep teraflowbridge; then echo "teraflowbridge is already created"; else docker network create -d bridge teraflowbridge; fi script: - - docker run -d -p 7070:7070 --name monitoring-test --network=teraflowbridge --rm "$IMAGE_NAME:$IMAGE_TAG" - - docker exec monitoring-test bash + - docker run -d -p 7070:7070 --name monitoring-tests --network=teraflowbridge --rm "$IMAGE_NAME:$IMAGE_TAG" + - docker exec monitoring-tests bash - docker exec pytest --junitxml=report.xml + after_script: + - docker stop monitoring-test artifacts: when: always reports: diff --git a/src/monitoring/build.sh b/src/monitoring/build.sh index 41bf3f32c..fc3b40506 100755 --- a/src/monitoring/build.sh +++ b/src/monitoring/build.sh @@ -2,6 +2,3 @@ echo "BUILD monitoring server" docker build -t "monitoring:dockerfile" -f Dockerfile . - -echo "BUILD monitoring client" -docker build -t "monitoring_client:dockerfile" -f tests/Dockerfile . diff --git a/src/monitoring/clean.sh b/src/monitoring/clean.sh index 58667a9e6..9c96b6e12 100755 --- a/src/monitoring/clean.sh +++ b/src/monitoring/clean.sh @@ -1,6 +1,5 @@ #!/usr/bin/env bash docker rm --force monitoring -docker rm --force monitoring_client docker network remove teraflowbridge diff --git a/src/monitoring/start.sh b/src/monitoring/start.sh index dd12fc87c..da0e7789d 100755 --- a/src/monitoring/start.sh +++ b/src/monitoring/start.sh @@ -2,4 +2,3 @@ docker network create -d bridge teraflowbridge docker run -d -p 7070:7070 --name monitoring --network=teraflowbridge monitoring:dockerfile -docker run -d -p --name monitoring_client --network=teraflowbridge monitoring_client:dockerfile -- GitLab