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

GitLab CI tests:

- Update  configuration for end-to-end integration tests.
- Reactivated all tests
parent fa44f4d6
Loading
Loading
Loading
Loading
+38 −38
Original line number Diff line number Diff line
@@ -28,44 +28,44 @@ workflow:

# 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'
+18 −18
Original line number Diff line number Diff line
@@ -14,23 +14,23 @@

# 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/acl_end2end/.gitlab-ci.yml'
  - local: '/src/tests/l2_vpn_gnmi_oc/.gitlab-ci.yml'
  - local: '/src/tests/osm_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/l2_vpn_gnmi_oc/.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_datastore/.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_datastore/.gitlab-ci.yml'
+4 −4
Original line number Diff line number Diff line
@@ -166,10 +166,10 @@ end2end_test ofc25:

    # Configure TeraFlowSDN deployment
    # Uncomment if DEBUG log level is needed for the components
    - yq -i '((select(.kind=="Deployment").spec.template.spec.containers.[] | select(.name=="server").env.[]) | select(.name=="LOG_LEVEL").value) |= "DEBUG"' manifests/contextservice.yaml
    - yq -i '((select(.kind=="Deployment").spec.template.spec.containers.[] | select(.name=="server").env.[]) | select(.name=="LOG_LEVEL").value) |= "DEBUG"' manifests/deviceservice.yaml
    - yq -i '((select(.kind=="Deployment").spec.template.spec.containers.[] | select(.name=="frontend").env.[]) | select(.name=="LOG_LEVEL").value) |= "DEBUG"' manifests/pathcompservice.yaml
    - yq -i '((select(.kind=="Deployment").spec.template.spec.containers.[] | select(.name=="server").env.[]) | select(.name=="LOG_LEVEL").value) |= "DEBUG"' manifests/serviceservice.yaml
    #- yq -i '((select(.kind=="Deployment").spec.template.spec.containers.[] | select(.name=="server").env.[]) | select(.name=="LOG_LEVEL").value) |= "DEBUG"' manifests/contextservice.yaml
    #- yq -i '((select(.kind=="Deployment").spec.template.spec.containers.[] | select(.name=="server").env.[]) | select(.name=="LOG_LEVEL").value) |= "DEBUG"' manifests/deviceservice.yaml
    #- yq -i '((select(.kind=="Deployment").spec.template.spec.containers.[] | select(.name=="frontend").env.[]) | select(.name=="LOG_LEVEL").value) |= "DEBUG"' manifests/pathcompservice.yaml
    #- yq -i '((select(.kind=="Deployment").spec.template.spec.containers.[] | select(.name=="server").env.[]) | select(.name=="LOG_LEVEL").value) |= "DEBUG"' manifests/serviceservice.yaml
    #- yq -i '((select(.kind=="Deployment").spec.template.spec.containers.[] | select(.name=="server").env.[]) | select(.name=="LOG_LEVEL").value) |= "DEBUG"' manifests/sliceservice.yaml
    #- yq -i '((select(.kind=="Deployment").spec.template.spec.containers.[] | select(.name=="server").env.[]) | select(.name=="LOG_LEVEL").value) |= "DEBUG"' manifests/nbiservice.yaml
    #- yq -i '((select(.kind=="Deployment").spec.template.spec.containers.[] | select(.name=="server").env.[]) | select(.name=="LOG_LEVEL").value) |= "DEBUG"' manifests/opticalcontrollerservice.yaml
+3 −3
Original line number Diff line number Diff line
@@ -145,10 +145,10 @@ end2end_test osm_end2end:
    # Configure TeraFlowSDN deployment
    # Uncomment if DEBUG log level is needed for the components
    #- yq -i '((select(.kind=="Deployment").spec.template.spec.containers.[] | select(.name=="server").env.[]) | select(.name=="LOG_LEVEL").value) |= "DEBUG"' manifests/contextservice.yaml
    - yq -i '((select(.kind=="Deployment").spec.template.spec.containers.[] | select(.name=="server").env.[]) | select(.name=="LOG_LEVEL").value) |= "DEBUG"' manifests/deviceservice.yaml
    #- yq -i '((select(.kind=="Deployment").spec.template.spec.containers.[] | select(.name=="server").env.[]) | select(.name=="LOG_LEVEL").value) |= "DEBUG"' manifests/deviceservice.yaml
    #- yq -i '((select(.kind=="Deployment").spec.template.spec.containers.[] | select(.name=="frontend").env.[]) | select(.name=="LOG_LEVEL").value) |= "DEBUG"' manifests/pathcompservice.yaml
    - yq -i '((select(.kind=="Deployment").spec.template.spec.containers.[] | select(.name=="server").env.[]) | select(.name=="LOG_LEVEL").value) |= "DEBUG"' manifests/serviceservice.yaml
    - yq -i '((select(.kind=="Deployment").spec.template.spec.containers.[] | select(.name=="server").env.[]) | select(.name=="LOG_LEVEL").value) |= "DEBUG"' manifests/nbiservice.yaml
    #- yq -i '((select(.kind=="Deployment").spec.template.spec.containers.[] | select(.name=="server").env.[]) | select(.name=="LOG_LEVEL").value) |= "DEBUG"' manifests/serviceservice.yaml
    #- yq -i '((select(.kind=="Deployment").spec.template.spec.containers.[] | select(.name=="server").env.[]) | select(.name=="LOG_LEVEL").value) |= "DEBUG"' manifests/nbiservice.yaml

    - source src/tests/${TEST_NAME}/deploy_specs.sh
    #- export TFS_REGISTRY_IMAGES="${CI_REGISTRY_IMAGE}"