Commit c3a902e2 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 da6c8767 54c6e7cf
Loading
Loading
Loading
Loading
+2 −11
Original line number Diff line number Diff line
@@ -19,15 +19,6 @@ build ecoc24:
  stage: build
  before_script:
    - docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY

    - kubectl delete namespaces tfs tfs-ip tfs-opt tfs-e2e qdb qdb-e2e qdb-opt qdb-ip --ignore-not-found
    - helm3 uninstall --namespace nats-e2e nats-e2e
    - helm3 uninstall --namespace nats-ip nats-ip
    - helm3 uninstall --namespace nats-opt nats-opt
    - helm3 uninstall --namespace nats nats
    - kubectl delete namespaces nats nats-ip nats-opt nats-e2e


  script:
    - docker buildx build -t "${TEST_NAME}:latest" -f ./src/tests/${TEST_NAME}/Dockerfile .
    - docker tag "${TEST_NAME}:latest" "$CI_REGISTRY_IMAGE/${TEST_NAME}:latest"
@@ -57,11 +48,11 @@ end2end_test ecoc24:
    - docker network rm -f na-br


    - kubectl delete namespaces tfs tfs-ip tfs-opt tfs-e2e qdb qdb-e2e qdb-opt qdb-ip --ignore-not-found
    - 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
    - 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

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

    - kubectl delete namespaces tfs tfs-ip tfs-opt tfs-e2e qdb qdb-e2e qdb-opt qdb-ip --ignore-not-found
    - 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
    - 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