Commit ecfcb7e4 authored by Lluis Gifre Renom's avatar Lluis Gifre Renom
Browse files

EuCNC24: Fixed CI/CD pipeline

parent 26fdd9a0

.gitlab-ci.yml

+2 −2
Original line number Diff line number Diff line
@@ -23,9 +23,9 @@ stages: 
include:

  #- local: '/manifests/.gitlab-ci.yml'

  #- local: '/src/monitoring/.gitlab-ci.yml'

  - local: '/src/nbi/.gitlab-ci.yml'

  #- local: '/src/nbi/.gitlab-ci.yml'

  #- local: '/src/context/.gitlab-ci.yml'

  - local: '/src/device/.gitlab-ci.yml'

  #- local: '/src/device/.gitlab-ci.yml'

  #- local: '/src/service/.gitlab-ci.yml'

  #- local: '/src/dbscanserving/.gitlab-ci.yml'

  #- local: '/src/opticalattackmitigator/.gitlab-ci.yml'

src/tests/eucnc24/.gitlab-ci.yml

+6 −21
Original line number Diff line number Diff line
@@ -114,21 +114,17 @@ end2end_test eucnc24: 


    # Run end-to-end test: onboard scenario

    - >

      docker run -t --name ${TEST_NAME} --network=host 

      docker run -t --rm --name ${TEST_NAME} --network=host 

      --volume "$PWD/tfs_runtime_env_vars.sh:/var/teraflow/tfs_runtime_env_vars.sh"

      --volume "$PWD/src/tests/${TEST_NAME}:/opt/results"

      $CI_REGISTRY_IMAGE/${TEST_NAME}:latest /var/teraflow/run-onboarding.sh

    - docker logs ${TEST_NAME} || true

    - docker rm -f ${TEST_NAME} || true



    # Run end-to-end test: configure service TFS

    - >

      docker run -t --name ${TEST_NAME} --network=host 

      docker run -t --rm --name ${TEST_NAME} --network=host 

      --volume "$PWD/tfs_runtime_env_vars.sh:/var/teraflow/tfs_runtime_env_vars.sh"

      --volume "$PWD/src/tests/${TEST_NAME}:/opt/results"

      $CI_REGISTRY_IMAGE/${TEST_NAME}:latest /var/teraflow/run-service-tfs-create.sh

    - docker logs ${TEST_NAME} || true

    - docker rm -f ${TEST_NAME} || true



    # Run end-to-end test: test connectivity with ping

    - sudo containerlab exec --name eucnc24 --label clab-node-name=dc1 --cmd 'ping -n -c3 192.168.1.10'
@@ -139,21 +135,17 @@ end2end_test eucnc24: 


    # Run end-to-end test: deconfigure service TFS

    - >

      docker run -t --name ${TEST_NAME} --network=host 

      docker run -t --rm --name ${TEST_NAME} --network=host 

      --volume "$PWD/tfs_runtime_env_vars.sh:/var/teraflow/tfs_runtime_env_vars.sh"

      --volume "$PWD/src/tests/${TEST_NAME}:/opt/results"

      $CI_REGISTRY_IMAGE/${TEST_NAME}:latest /var/teraflow/run-service-tfs-remove.sh

    - docker logs ${TEST_NAME} || true

    - docker rm -f ${TEST_NAME} || true



    # Run end-to-end test: configure service IETF

    - >

      docker run -t --name ${TEST_NAME} --network=host 

      docker run -t --rm --name ${TEST_NAME} --network=host 

      --volume "$PWD/tfs_runtime_env_vars.sh:/var/teraflow/tfs_runtime_env_vars.sh"

      --volume "$PWD/src/tests/${TEST_NAME}:/opt/results"

      $CI_REGISTRY_IMAGE/${TEST_NAME}:latest /var/teraflow/run-service-ietf-create.sh

    - docker logs ${TEST_NAME} || true

    - docker rm -f ${TEST_NAME} || true



    # Run end-to-end test: test connectivity with ping

    - sudo containerlab exec --name eucnc24 --label clab-node-name=dc1 --cmd 'ping -n -c3 192.168.1.10'
@@ -164,21 +156,17 @@ end2end_test eucnc24: 


    # Run end-to-end test: deconfigure service IETF

    - >

      docker run -t --name ${TEST_NAME} --network=host 

      docker run -t --rm --name ${TEST_NAME} --network=host 

      --volume "$PWD/tfs_runtime_env_vars.sh:/var/teraflow/tfs_runtime_env_vars.sh"

      --volume "$PWD/src/tests/${TEST_NAME}:/opt/results"

      $CI_REGISTRY_IMAGE/${TEST_NAME}:latest /var/teraflow/run-service-ietf-remove.sh

    - docker logs ${TEST_NAME} || true

    - docker rm -f ${TEST_NAME} || true



    # Run end-to-end test: cleanup scenario

    - >

      docker run -t --name ${TEST_NAME} --network=host 

      docker run -t --rm --name ${TEST_NAME} --network=host 

      --volume "$PWD/tfs_runtime_env_vars.sh:/var/teraflow/tfs_runtime_env_vars.sh"

      --volume "$PWD/src/tests/${TEST_NAME}:/opt/results"

      $CI_REGISTRY_IMAGE/${TEST_NAME}:latest /var/teraflow/run-cleanup.sh

    - docker logs ${TEST_NAME} || true

    - docker rm -f ${TEST_NAME} || true



  after_script:

    # Dump TeraFlowSDN component logs
@@ -190,9 +178,6 @@ end2end_test eucnc24: 
    - kubectl --namespace $TFS_K8S_NAMESPACE logs deployment/nbiservice -c server

    #- kubectl --namespace $TFS_K8S_NAMESPACE logs deployment/monitoringservice -c server



    # Dump test container logs

    - docker logs ${TEST_NAME} || true



    # Destroy Scenario

    - docker rm -f ${TEST_NAME} || true

    - RUNNER_PATH=`pwd`

src/tests/eucnc24/tests/test_service_ietf_remove.py

+0 −1
Original line number Diff line number Diff line
@@ -52,7 +52,6 @@ def test_service_ietf_removal( 
    service_uuids : Set[str] = set()

    for service in response.services:

        service_id = service.service_id

        assert service_id.service_uuid.uuid == service_uuid

        assert service.service_status.service_status == ServiceStatusEnum.SERVICESTATUS_ACTIVE

        assert service.service_type == ServiceTypeEnum.SERVICETYPE_L3NM