Commit 02b6e5c8 authored by Lluis Gifre Renom's avatar Lluis Gifre Renom
Browse files

Tests - EUCNC24 End-to-end integration test: 

- Fixed CI/CD test commands
- Deactivated other unneeded tests temporarily
parent d6e55aaa

.gitlab-ci.yml

+38 −38
Original line number Diff line number Diff line
@@ -22,44 +22,44 @@ stages: 


# include the individual .gitlab-ci.yml of each micro-service and tests

include:

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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



  # This should be last one: end-to-end integration tests

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

src/tests/.gitlab-ci.yml

+16 −16
Original line number Diff line number Diff line
@@ -14,21 +14,21 @@ 


# include the individual .gitlab-ci.yml of each end-to-end integration test

include:

  - local: '/src/tests/ofc22/.gitlab-ci.yml'

  #- local: '/src/tests/oeccpsc22/.gitlab-ci.yml'

  - local: '/src/tests/ecoc22/.gitlab-ci.yml'

  #- local: '/src/tests/nfvsdn22/.gitlab-ci.yml'

  #- local: '/src/tests/ofc23/.gitlab-ci.yml'

  - local: '/src/tests/ofc24/.gitlab-ci.yml'

  - local: '/src/tests/eucnc24/.gitlab-ci.yml'

  #- local: '/src/tests/ofc25-camara-agg-net-controller/.gitlab-ci.yml'

  #- local: '/src/tests/ofc25-camara-e2e-controller/.gitlab-ci.yml'

  #- local: '/src/tests/ofc25/.gitlab-ci.yml'

  #- local: '/src/tests/ryu-openflow/.gitlab-ci.yml'

  - local: '/src/tests/qkd_end2end/.gitlab-ci.yml'

#  - local: '/src/tests/ofc22/.gitlab-ci.yml'

#  #- local: '/src/tests/oeccpsc22/.gitlab-ci.yml'

#  - local: '/src/tests/ecoc22/.gitlab-ci.yml'

#  #- local: '/src/tests/nfvsdn22/.gitlab-ci.yml'

#  #- local: '/src/tests/ofc23/.gitlab-ci.yml'

#  - local: '/src/tests/ofc24/.gitlab-ci.yml'

#  - local: '/src/tests/eucnc24/.gitlab-ci.yml'

#  #- local: '/src/tests/ofc25-camara-agg-net-controller/.gitlab-ci.yml'

#  #- local: '/src/tests/ofc25-camara-e2e-controller/.gitlab-ci.yml'

#  #- local: '/src/tests/ofc25/.gitlab-ci.yml'

#  #- local: '/src/tests/ryu-openflow/.gitlab-ci.yml'

#  - local: '/src/tests/qkd_end2end/.gitlab-ci.yml'

  - local: '/src/tests/acl_end2end/.gitlab-ci.yml'



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

  - local: '/src/tests/tools/simap_server/.gitlab-ci.yml'
 
#  - 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'

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

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

+2 −2
Original line number Diff line number Diff line
@@ -208,7 +208,7 @@ end2end_test acl_end2end: 
      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-acl-create-tests.sh

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



    # Run end-to-end test: test connectivity with ping after creating ACL

    - export TEST_CLIENT1_FW=$(containerlab exec --name acl_end2end --label clab-node-name=client1 --cmd 'ping -n -c3 172.16.11.1' --format json)
@@ -230,7 +230,7 @@ end2end_test acl_end2end: 
      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-acl-delete-tests.sh

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



    # Run end-to-end test: test connectivity with ping after deleting ACL

    - export TEST_CLIENT1_FW=$(containerlab exec --name acl_end2end --label clab-node-name=client1 --cmd 'ping -n -c3 172.16.11.1' --format json)