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

GitLab CI/CD pipeline:

- Upgraded CI/CD end-to-end tests to properly cleanup
-
parent 0d877c0a
Loading
Loading
Loading
Loading
+6 −6
Original line number Diff line number Diff line
@@ -133,7 +133,7 @@ end2end_test ecoc22:
    # Run end-to-end tests
    - if docker ps -a | grep ${TEST_NAME}; then docker rm -f ${TEST_NAME}; fi
    - >
      docker run -t --name ${TEST_NAME} --network=host 
      docker run -t --rm --name ${TEST_NAME} --network=host 
      --volume "$PWD/tfs_runtime_env_vars.sh:/var/teraflow/tfs_runtime_env_vars.sh"
      --volume "$PWD/src/tests/${TEST_NAME}:/opt/results"
      $CI_REGISTRY_IMAGE/${TEST_NAME}:latest
@@ -149,12 +149,12 @@ end2end_test ecoc22:
    - kubectl --namespace $TFS_K8S_NAMESPACE logs deployment/nbiservice -c server

    # Clean up
    - docker rm -f ${TEST_NAME} || true
    - kubectl delete namespaces tfs || true
    - docker rm --force qkd-node-01 qkd-node-02 qkd-node-03
    - docker network rm --force qkd-node-br
    - docker volume prune --force
    - docker image prune --force
    - docker ps --all --quiet | xargs --no-run-if-empty docker stop
    - docker container prune --force
    - docker ps --all --quiet | xargs --no-run-if-empty docker rm --force
    - docker network prune --force
    - docker volume prune --all --force

    # Clean old docker images
    - docker images --filter="dangling=true" --quiet | xargs -r docker rmi
+5 −5
Original line number Diff line number Diff line
@@ -282,7 +282,6 @@ end2end_test eucnc24:
    - kubectl --namespace $TFS_K8S_NAMESPACE logs deployment/nbiservice -c server

    # Clean up
    - docker rm -f ${TEST_NAME} || true
    - RUNNER_PATH=`pwd`
    #- cd $PWD/src/tests/${TEST_NAME}
    - cd /tmp/clab/${TEST_NAME}
@@ -290,10 +289,11 @@ end2end_test eucnc24:
    - sudo rm -rf clab-eucnc24/ .eucnc24.clab.yml.bak || true
    - cd $RUNNER_PATH
    - kubectl delete namespaces tfs || true
    - docker rm --force qkd-node-01 qkd-node-02 qkd-node-03
    - docker network rm --force qkd-node-br
    - docker volume prune --force
    - docker image prune --force
    - docker ps --all --quiet | xargs --no-run-if-empty docker stop
    - docker container prune --force
    - docker ps --all --quiet | xargs --no-run-if-empty docker rm --force
    - docker network prune --force
    - docker volume prune --all --force

    # Clean old docker images
    - docker images --filter="dangling=true" --quiet | xargs -r docker rmi
+7 −6
Original line number Diff line number Diff line
@@ -134,10 +134,11 @@ end2end_test ofc22:
    # Run end-to-end tests
    - if docker ps -a | grep ${TEST_NAME}; then docker rm -f ${TEST_NAME}; fi
    - >
      docker run -t --name ${TEST_NAME} --network=host 
      docker run -t --rm --name ${TEST_NAME} --network=host 
      --volume "$PWD/tfs_runtime_env_vars.sh:/var/teraflow/tfs_runtime_env_vars.sh"
      --volume "$PWD/src/tests/${TEST_NAME}:/opt/results"
      $CI_REGISTRY_IMAGE/${TEST_NAME}:latest

  after_script:
    # Dump TeraFlowSDN component logs
    - source src/tests/${TEST_NAME}/deploy_specs.sh
@@ -151,12 +152,12 @@ end2end_test ofc22:
    - kubectl --namespace $TFS_K8S_NAMESPACE logs deployment/ztpservice -c ztpservice

    # Clean up
    - docker rm -f ${TEST_NAME} || true
    - kubectl delete namespaces tfs || true
    - docker rm --force qkd-node-01 qkd-node-02 qkd-node-03
    - docker network rm --force qkd-node-br
    - docker volume prune --force
    - docker image prune --force
    - docker ps --all --quiet | xargs --no-run-if-empty docker stop
    - docker container prune --force
    - docker ps --all --quiet | xargs --no-run-if-empty docker rm --force
    - docker network prune --force
    - docker volume prune --all --force

    # Clean old docker images
    - docker images --filter="dangling=true" --quiet | xargs -r docker rmi
+13 −13
Original line number Diff line number Diff line
@@ -172,12 +172,19 @@ end2end_test ofc24:
    # Run end-to-end tests
    - if docker ps -a | grep ${TEST_NAME}; then docker rm -f ${TEST_NAME}; fi
    - >
      docker run -t --name ${TEST_NAME} --network=host 
      docker run -t --rm --name ${TEST_NAME} --network=host 
      --volume "$PWD/tfs_runtime_env_vars.sh:/var/teraflow/tfs_runtime_env_vars.sh"
      --volume "$PWD/src/tests/${TEST_NAME}:/opt/results"
      $CI_REGISTRY_IMAGE/${TEST_NAME}:latest

  after_script:
    # Dump Optical Device Node Agents container status and logs
    - docker ps -a
    - docker logs na-t1
    - docker logs na-t2
    - docker logs na-r1
    - docker logs na-r2

    # Dump TeraFlowSDN component logs
    - source src/tests/${TEST_NAME}/deploy_specs.sh
    - kubectl --namespace $TFS_K8S_NAMESPACE logs deployment/contextservice -c server
@@ -187,20 +194,13 @@ end2end_test ofc24:
    - kubectl --namespace $TFS_K8S_NAMESPACE logs deployment/nbiservice -c server
    - kubectl --namespace $TFS_K8S_NAMESPACE logs deployment/opticalcontrollerservice -c server

    # Dump Optical Device Node Agents container status and logs
    - docker ps -a
    - docker logs na-t1
    - docker logs na-t2
    - docker logs na-r1
    - docker logs na-r2

    # Clean up
    - docker rm -f ${TEST_NAME} || true
    - kubectl delete namespaces tfs || true
    - docker rm --force qkd-node-01 qkd-node-02 qkd-node-03
    - docker network rm --force qkd-node-br
    - docker volume prune --force
    - docker image prune --force
    - docker ps --all --quiet | xargs --no-run-if-empty docker stop
    - docker container prune --force
    - docker ps --all --quiet | xargs --no-run-if-empty docker rm --force
    - docker network prune --force
    - docker volume prune --all --force

    # Clean old docker images
    - docker images --filter="dangling=true" --quiet | xargs -r docker rmi
+6 −5
Original line number Diff line number Diff line
@@ -289,6 +289,7 @@ end2end_test qkd_end2end:

  after_script:
    # Dump logs of the QKD Nodes (after_script)
    - docker ps -a
    - docker logs qkd-node-01
    - docker logs qkd-node-02
    - docker logs qkd-node-03
@@ -314,12 +315,12 @@ end2end_test qkd_end2end:
    - kubectl --namespace $TFS_K8S_NAMESPACE logs deployment/qkd-appservice -c server

    # Clean up
    - docker rm -f ${TEST_NAME} || true
    - kubectl delete namespaces tfs || true
    - docker rm --force qkd-node-01 qkd-node-02 qkd-node-03
    - docker network rm --force qkd-node-br
    - docker volume prune --force
    - docker image prune --force
    - docker ps --all --quiet | xargs --no-run-if-empty docker stop
    - docker container prune --force
    - docker ps --all --quiet | xargs --no-run-if-empty docker rm --force
    - docker network prune --force
    - docker volume prune --all --force

    # Clean old docker images
    - docker images --filter="dangling=true" --quiet | xargs -r docker rmi