Commit 5d59451b authored by Lluis Gifre Renom's avatar Lluis Gifre Renom
Browse files

Ryu E2E Integration Test: 

- Resolve merge conflict in CI/CD pipeline descriptors
parent 344b68b5

.gitlab-ci.yml

+1 −39
Original line number Diff line number Diff line
@@ -27,13 +27,13 @@ workflow: 


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

include:

<<<<<<< HEAD

#  #- 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'
@@ -63,44 +63,6 @@ include: 
#  - local: '/src/e2e_orchestrator/.gitlab-ci.yml'

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

#  - local: '/src/osm_client/.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'

>>>>>>> e3f502c37e9ed4060edf0d3af0a22857867233b3



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

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

src/tests/.gitlab-ci.yml

+3 −19
Original line number Diff line number Diff line
@@ -14,7 +14,6 @@ 


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

include:

<<<<<<< HEAD

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

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

#  - local: '/src/tests/ecoc22/.gitlab-ci.yml'
@@ -26,23 +25,8 @@ include: 
#  #- 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/tools/mock_tfs_nbi_dependencies/.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/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'

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

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

src/tests/ryu-openflow/docker-compose.yml

+0 −1
Original line number Diff line number Diff line
@@ -18,4 +18,3 @@ services: 
    build:

      context: .

      dockerfile: Ryu.Dockerfile

src/tests/ryu-openflow/.gitlab-ci.yml

+1 −1

File changed.

Contains only whitespace changes.