Loading .gitlab-ci.yml +1 −1 Original line number Diff line number Diff line Loading @@ -11,7 +11,7 @@ stages: # include the individual .gitlab-ci.yml of each micro-service include: - local: '/manifests/.gitlab-ci.yml' #- local: '/src/monitoring/.gitlab-ci.yml' - local: '/src/monitoring/.gitlab-ci.yml' - local: '/src/context/.gitlab-ci.yml' - local: '/src/device/.gitlab-ci.yml' - local: '/src/service/.gitlab-ci.yml' Loading src/monitoring/.gitlab-ci.yml +6 −2 Original line number Diff line number Diff line Loading @@ -56,7 +56,8 @@ test monitoring run: - docker run -d -p 7070:7070 --name $IMAGE_NAME --network=teraflowbridge --rm "$IMAGE_NAME:$IMAGE_TAG" - docker ps after_script: - docker stop monitoring - docker stop "$IMAGE_NAME:$IMAGE_TAG" - docker rmi $(docker images --quiet --filter=dangling=true) rules: - if: '$CI_PIPELINE_SOURCE == "push" && $CI_COMMIT_BRANCH == "develop"' - changes: Loading @@ -73,12 +74,15 @@ test monitoring pytest: IMAGE_NAME: 'monitoring' # name of the microservice IMAGE_NAME_TEST: 'monitoring-test' # name of the microservice IMAGE_TAG: 'latest' # tag of the container image (production, development, etc) stage: test stage: unit_test needs: - build monitoring script: - docker build -t "$IMAGE_NAME_TEST:$IMAGE_TAG" -f ./src/$IMAGE_NAME/tests/Dockerfile ./src/ - docker run -v "$PWD/src/$IMAGE_NAME/tests:/opt/results" $IMAGE_NAME_TEST:$IMAGE_TAG after_script: - docker stop "$IMAGE_NAME_TEST:$IMAGE_TAG" - docker rmi $(docker images --quiet --filter=dangling=true) rules: - if: '$CI_PIPELINE_SOURCE == "push" && $CI_COMMIT_BRANCH == "develop"' - changes: Loading Loading
.gitlab-ci.yml +1 −1 Original line number Diff line number Diff line Loading @@ -11,7 +11,7 @@ stages: # include the individual .gitlab-ci.yml of each micro-service include: - local: '/manifests/.gitlab-ci.yml' #- local: '/src/monitoring/.gitlab-ci.yml' - local: '/src/monitoring/.gitlab-ci.yml' - local: '/src/context/.gitlab-ci.yml' - local: '/src/device/.gitlab-ci.yml' - local: '/src/service/.gitlab-ci.yml' Loading
src/monitoring/.gitlab-ci.yml +6 −2 Original line number Diff line number Diff line Loading @@ -56,7 +56,8 @@ test monitoring run: - docker run -d -p 7070:7070 --name $IMAGE_NAME --network=teraflowbridge --rm "$IMAGE_NAME:$IMAGE_TAG" - docker ps after_script: - docker stop monitoring - docker stop "$IMAGE_NAME:$IMAGE_TAG" - docker rmi $(docker images --quiet --filter=dangling=true) rules: - if: '$CI_PIPELINE_SOURCE == "push" && $CI_COMMIT_BRANCH == "develop"' - changes: Loading @@ -73,12 +74,15 @@ test monitoring pytest: IMAGE_NAME: 'monitoring' # name of the microservice IMAGE_NAME_TEST: 'monitoring-test' # name of the microservice IMAGE_TAG: 'latest' # tag of the container image (production, development, etc) stage: test stage: unit_test needs: - build monitoring script: - docker build -t "$IMAGE_NAME_TEST:$IMAGE_TAG" -f ./src/$IMAGE_NAME/tests/Dockerfile ./src/ - docker run -v "$PWD/src/$IMAGE_NAME/tests:/opt/results" $IMAGE_NAME_TEST:$IMAGE_TAG after_script: - docker stop "$IMAGE_NAME_TEST:$IMAGE_TAG" - docker rmi $(docker images --quiet --filter=dangling=true) rules: - if: '$CI_PIPELINE_SOURCE == "push" && $CI_COMMIT_BRANCH == "develop"' - changes: Loading