Commit 31fb847d authored by Lluis Gifre Renom's avatar Lluis Gifre Renom
Browse files

OSM Client && Mock OSM NBI: 

- Fixed CI/CD
parent 47342a8b

src/osm_client/.gitlab-ci.yml

+34 −29
Original line number Diff line number Diff line
@@ -20,17 +20,14 @@ build osm_client: 
    IMAGE_TAG: 'latest' # tag of the container image (production, development, etc)

  stage: build

  before_script:

    - docker image prune --force

    - docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY

  script:

    - docker buildx build -t "$IMAGE_NAME:$IMAGE_TAG" -f ./src/$IMAGE_NAME/Dockerfile .

    - docker tag "$IMAGE_NAME:$IMAGE_TAG" "$CI_REGISTRY_IMAGE/$IMAGE_NAME:$IMAGE_TAG"

    - docker push "$CI_REGISTRY_IMAGE/$IMAGE_NAME:$IMAGE_TAG"

    # Build mock images

    - docker buildx build -t "$MOCK_IMAGE_NAME:$IMAGE_TAG" -f ./src/tests/tools/$MOCK_IMAGE_NAME/Dockerfile .

    - docker tag "$MOCK_IMAGE_NAME:$IMAGE_TAG" "$CI_REGISTRY_IMAGE/$MOCK_IMAGE_NAME:$IMAGE_TAG"

    - docker push "$CI_REGISTRY_IMAGE/$MOCK_IMAGE_NAME:$IMAGE_TAG"

  after_script:

    - docker images --filter="dangling=true" --quiet | xargs -r docker rmi

    - 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"'
@@ -41,8 +38,9 @@ build osm_client: 
      - src/$IMAGE_NAME/Dockerfile

      - src/$IMAGE_NAME/tests/*.py

      - manifests/${IMAGE_NAME}service.yaml

      - src/tests/tools/$MOCK_IMAGE_NAME/**/*.{py,in,yml}

      - src/tests/tools/$MOCK_IMAGE_NAME/Dockerfile

      - src/tests/tools/mock_osm_nbi/**/*.{py,in,yml,yaml,yang,sh,json}

      - src/tests/tools/mock_osm_nbi/Dockerfile

      - src/tests/.gitlab-ci.yml

      - .gitlab-ci.yml



# Apply unit test to the component
@@ -54,31 +52,29 @@ unit_test osm_client: 
  stage: unit_test

  needs:

    - build osm_client

    - build mock_osm_nbi

  before_script:

    # Do Docker cleanup

    - docker ps --all --quiet | xargs --no-run-if-empty docker stop

    - docker container prune --force

    - docker ps --all --quiet | xargs --no-run-if-empty docker rm --force

    - docker image prune --force

    - docker network prune --force

    - docker volume prune --all --force

    - docker buildx prune --force



    # Login Docker repository

    - docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY

    - docker ps -aq | xargs -r docker rm -f

    - >

      if docker network list | grep teraflowbridge; then

        echo "teraflowbridge is already created";

      else

        docker network create -d bridge teraflowbridge;

      fi

    - >

      if docker container ls | grep $IMAGE_NAME; then

        docker rm -f $IMAGE_NAME;

      else

        echo "$IMAGE_NAME image is not in the system";

      fi

    - docker container prune -f

  script:

    - docker pull "$CI_REGISTRY_IMAGE/$IMAGE_NAME:$IMAGE_TAG"

    - docker pull "$CI_REGISTRY_IMAGE/mock-osm-nbi:$IMAGE_TAG"

    - docker images --filter="dangling=true" --quiet | xargs -r docker rmi

    - >

      docker run --name $MOCK_IMAGE_NAME -d 

      docker run --name mock_osm_nbi -d 

      --network=teraflowbridge

      --env LOG_LEVEL=DEBUG

      --env FLASK_ENV=development

      $CI_REGISTRY_IMAGE/$MOCK_IMAGE_NAME:$IMAGE_TAG

      $CI_REGISTRY_IMAGE/mock-osm-nbi:$IMAGE_TAG

    - >

      docker run --name $IMAGE_NAME -d -v "$PWD/src/$IMAGE_NAME/tests:/opt/results" 

      --network=teraflowbridge
@@ -89,15 +85,23 @@ unit_test osm_client: 
    - while ! docker logs $IMAGE_NAME 2>&1 | grep -q 'Running...'; do sleep 1; done

    - docker ps -a

    - docker logs $IMAGE_NAME

    - docker logs $MOCK_IMAGE_NAME

    - docker logs mock_osm_nbi

    - 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_unitary.xml"

    - docker exec -i $IMAGE_NAME bash -c "coverage report --include='${IMAGE_NAME}/*' --show-missing"

  coverage: '/TOTAL\s+\d+\s+\d+\s+(\d+%)/'

  after_script:

    - docker logs $IMAGE_NAME

    - docker rm -f $IMAGE_NAME

    - docker rm -f $MOCK_IMAGE_NAME

    - docker network rm teraflowbridge

    - docker logs mock_osm_nbi



    # Do Docker cleanup

    - docker ps --all --quiet | xargs --no-run-if-empty docker stop

    - docker container prune --force

    - docker ps --all --quiet | xargs --no-run-if-empty docker rm --force

    - docker image prune --force

    - docker network prune --force

    - docker volume prune --all --force

    - docker buildx 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"'
@@ -108,8 +112,9 @@ unit_test osm_client: 
      - src/$IMAGE_NAME/Dockerfile

      - src/$IMAGE_NAME/tests/*.py

      - manifests/${IMAGE_NAME}service.yaml

      - src/tests/tools/$MOCK_IMAGE_NAME/**/*.{py,in,yml}

      - src/tests/tools/$MOCK_IMAGE_NAME/Dockerfile

      - src/tests/tools/mock_osm_nbi/**/*.{py,in,yml,yaml,yang,sh,json}

      - src/tests/tools/mock_osm_nbi/Dockerfile

      - src/tests/.gitlab-ci.yml

      - .gitlab-ci.yml

  artifacts:

      when: always

src/tests/.gitlab-ci.yml

+1 −0
Original line number Diff line number Diff line
@@ -29,3 +29,4 @@ include: 


  - local: '/src/tests/tools/mock_tfs_nbi_dependencies/.gitlab-ci.yml'

  - local: '/src/tests/tools/mock_qkd_node/.gitlab-ci.yml'

  - local: '/src/tests/tools/mock_osm_nbi/.gitlab-ci.yml'

src/tests/tools/mock_osm_nbi/.gitlab-ci.yml

0 → 100644
+38 −0
Original line number Diff line number Diff line 
# Copyright 2022-2025 ETSI SDG TeraFlowSDN (TFS) (https://tfs.etsi.org/)

#

# Licensed under the Apache License, Version 2.0 (the "License");

# you may not use this file except in compliance with the License.

# You may obtain a copy of the License at

#

#      http://www.apache.org/licenses/LICENSE-2.0

#

# Unless required by applicable law or agreed to in writing, software

# distributed under the License is distributed on an "AS IS" BASIS,

# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

# See the License for the specific language governing permissions and

# limitations under the License.



# Build, tag, and push the Docker image to the GitLab Docker registry

build mock_osm_nbi:

  stage: build

  before_script:

    - docker image prune --force

    - docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY

  script:

    - docker buildx build -t "$CI_REGISTRY_IMAGE/mock-osm-nbi:test" -f ./src/tests/tools/mock_osm_nbi/Dockerfile ./src/tests/tools/mock_osm_nbi

    - docker push "$CI_REGISTRY_IMAGE/mock-osm-nbi:test"

  after_script:

    - 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"'

    - changes:

      - src/common/**/*.py

      - proto/*.proto

      - src/tests/tools/mock_osm_nbi/**/*.{py,in,yml,yaml,yang,sh,json}

      - src/tests/tools/mock_osm_nbi/Dockerfile

      - src/tests/.gitlab-ci.yml

      - src/osm_client/**/*.{py,in,yml}

      - src/osm_client/Dockerfile

      - src/osm_client/tests/*.py

      - .gitlab-ci.yml