Commit cc148edc authored by Carlos Manso's avatar Carlos Manso
Browse files

Merge branch...

Merge branch 'feat/216-cttc-implement-integration-test-between-e2e-ip-optical-sdn-controllers' of https://labs.etsi.org/rep/tfs/controller into feat/216-cttc-implement-integration-test-between-e2e-ip-optical-sdn-controllers
parents 8c2b7464 155618ef
Loading
Loading
Loading
Loading
+15 −11
Original line number Diff line number Diff line
@@ -48,10 +48,10 @@ end2end_test ecoc24:
    - docker network rm -f na-br


    - helm3 uninstall --namespace nats-e2e nats-e2e 2>/dev/null  || echo "Release not found"
    - helm3 uninstall --namespace nats-ip nats-ip 2>/dev/null  || echo "Release not found"
    - helm3 uninstall --namespace nats-opt nats-opt 2>/dev/null  || echo "Release not found"
    - helm3 uninstall --namespace nats nats 2>/dev/null  || echo "Release not found"
    - helm3 uninstall --namespace nats-e2e nats-e2e 2>/dev/null  || echo "Namespace not found"
    - helm3 uninstall --namespace nats-ip nats-ip 2>/dev/null  || echo "Namespace not found"
    - helm3 uninstall --namespace nats-opt nats-opt 2>/dev/null  || echo "Namespace not found"
    - helm3 uninstall --namespace nats nats 2>/dev/null  || echo "Namespace not found"
    - kubectl delete namespaces tfs tfs-ip tfs-opt tfs-e2e qdb qdb-e2e qdb-opt qdb-ip --ignore-not-found
    - kubectl delete namespaces nats nats-ip nats-opt nats-e2e --ignore-not-found

@@ -97,7 +97,11 @@ end2end_test ecoc24:
    
    - ./deploy/crdb.sh
    - ./deploy/nats.sh
    - ./deploy/qdb.sh
    
    
    # - ./deploy/qdb.sh


    - ./deploy/expose_dashboard.sh
    - ./deploy/tfs.sh
    - ./deploy/show.sh
@@ -131,7 +135,7 @@ end2end_test ecoc24:
    # - source src/tests/${TEST_NAME}/deploy_specs_ip.sh
    - ./deploy/crdb.sh
    - ./deploy/nats.sh
    - ./deploy/qdb.sh
    # - ./deploy/qdb.sh
    - ./deploy/expose_dashboard.sh
    - ./deploy/tfs.sh
    - ./deploy/show.sh
@@ -162,7 +166,7 @@ end2end_test ecoc24:
    
    - ./deploy/crdb.sh
    - ./deploy/nats.sh
    - ./deploy/qdb.sh
    # - ./deploy/qdb.sh
    - ./deploy/expose_dashboard.sh
    - ./deploy/tfs.sh
    - ./deploy/show.sh
@@ -224,10 +228,10 @@ end2end_test ecoc24:
    - docker images --filter="dangling=true" --quiet | xargs -r docker rmi -f


    - helm3 uninstall --namespace nats-e2e nats-e2e 2>/dev/null  || echo "Release not found"
    - helm3 uninstall --namespace nats-ip nats-ip 2>/dev/null  || echo "Release not found"
    - helm3 uninstall --namespace nats-opt nats-opt 2>/dev/null  || echo "Release not found"
    - helm3 uninstall --namespace nats nats 2>/dev/null  || echo "Release not found"
    - helm3 uninstall --namespace nats-e2e nats-e2e 2>/dev/null  || echo "Namespace not found"
    - helm3 uninstall --namespace nats-ip nats-ip 2>/dev/null  || echo "Namespace not found"
    - helm3 uninstall --namespace nats-opt nats-opt 2>/dev/null  || echo "Namespace not found"
    - helm3 uninstall --namespace nats nats 2>/dev/null  || echo "Namespace not found"
    - kubectl delete namespaces tfs tfs-ip tfs-opt tfs-e2e qdb qdb-e2e qdb-opt qdb-ip --ignore-not-found
    - kubectl delete namespaces nats nats-ip nats-opt nats-e2e --ignore-not-found