Commit ad6aa294 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 c3a902e2 98acad79
Loading
Loading
Loading
Loading
+9 −8
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 --ignore-not-found
    - helm3 uninstall --namespace nats-ip nats-ip --ignore-not-found
    - helm3 uninstall --namespace nats-opt nats-opt --ignore-not-found
    - helm3 uninstall --namespace nats nats --ignore-not-found
    - 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"
    - 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

@@ -161,10 +161,11 @@ end2end_test ecoc24:
    # Clean old docker images
    - docker images --filter="dangling=true" --quiet | xargs -r docker rmi -f

    - helm3 uninstall --namespace nats-e2e nats-e2e --ignore-not-found
    - helm3 uninstall --namespace nats-ip nats-ip --ignore-not-found
    - helm3 uninstall --namespace nats-opt nats-opt --ignore-not-found
    - helm3 uninstall --namespace nats nats --ignore-not-found

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