Commit 12b4483d authored by Lluis Gifre Renom's avatar Lluis Gifre Renom
Browse files

CI end-to-end tests:

- Dump logs to artifacts instead of console
- Ensure that logs are captured even if the commands fail by appending `|| true`.
- Adjust paths in the artifacts section to point to the new `logs` directory.
parent 5a594d8d
Loading
Loading
Loading
Loading
+9 −6
Original line number Diff line number Diff line
@@ -259,16 +259,17 @@ end2end_test acl_end2end:

  after_script:
    # Dump configuration of the firewall (on after_script)
    - containerlab exec --name acl_end2end --label clab-node-name=firewall --cmd "Cli --command \"enable"$'\n'$"show running-config\""
    - mkdir -p src/tests/${TEST_NAME}/logs
    - containerlab exec --name acl_end2end --label clab-node-name=firewall --cmd "Cli --command \"enable"$'\n'$"show running-config\"" > src/tests/${TEST_NAME}/logs/agent_firewall-running-config.log 2>&1 || true

    # Dump TeraFlowSDN component logs
    - source src/tests/${TEST_NAME}/deploy_specs.sh
    - ./deploy/show.sh
    - kubectl --namespace $TFS_K8S_NAMESPACE logs deployment/contextservice -c server
    - kubectl --namespace $TFS_K8S_NAMESPACE logs deployment/deviceservice -c server
    - kubectl --namespace $TFS_K8S_NAMESPACE logs deployment/pathcompservice -c frontend
    - kubectl --namespace $TFS_K8S_NAMESPACE logs deployment/serviceservice -c server
    - kubectl --namespace $TFS_K8S_NAMESPACE logs deployment/nbiservice -c server
    - kubectl --namespace $TFS_K8S_NAMESPACE logs deployment/contextservice -c server > src/tests/${TEST_NAME}/logs/tfs_${TFS_K8S_NAMESPACE}_contextservice-server.log 2>&1 || true
    - kubectl --namespace $TFS_K8S_NAMESPACE logs deployment/deviceservice -c server > src/tests/${TEST_NAME}/logs/tfs_${TFS_K8S_NAMESPACE}_deviceservice-server.log 2>&1 || true
    - kubectl --namespace $TFS_K8S_NAMESPACE logs deployment/pathcompservice -c frontend > src/tests/${TEST_NAME}/logs/tfs_${TFS_K8S_NAMESPACE}_pathcompservice-frontend.log 2>&1 || true
    - kubectl --namespace $TFS_K8S_NAMESPACE logs deployment/serviceservice -c server > src/tests/${TEST_NAME}/logs/tfs_${TFS_K8S_NAMESPACE}_serviceservice-server.log 2>&1 || true
    - kubectl --namespace $TFS_K8S_NAMESPACE logs deployment/nbiservice -c server > src/tests/${TEST_NAME}/logs/tfs_${TFS_K8S_NAMESPACE}_nbiservice-server.log 2>&1 || true

    # Clean up
    - RUNNER_PATH=`pwd`
@@ -293,3 +294,5 @@ end2end_test acl_end2end:
      when: always
      reports:
        junit: ./src/tests/${TEST_NAME}/report_*.xml
      paths:
        - ./src/tests/${TEST_NAME}/logs/*.log
+8 −5
Original line number Diff line number Diff line
@@ -161,13 +161,14 @@ end2end_test ecoc22:

  after_script:
    # Dump TeraFlowSDN component logs
    - mkdir -p src/tests/${TEST_NAME}/logs
    - source src/tests/${TEST_NAME}/deploy_specs.sh
    - ./deploy/show.sh
    - kubectl --namespace $TFS_K8S_NAMESPACE logs deployment/contextservice -c server
    - kubectl --namespace $TFS_K8S_NAMESPACE logs deployment/deviceservice -c server
    - kubectl --namespace $TFS_K8S_NAMESPACE logs deployment/pathcompservice -c frontend
    - kubectl --namespace $TFS_K8S_NAMESPACE logs deployment/serviceservice -c server
    - kubectl --namespace $TFS_K8S_NAMESPACE logs deployment/nbiservice -c server
    - kubectl --namespace $TFS_K8S_NAMESPACE logs deployment/contextservice -c server > src/tests/${TEST_NAME}/logs/tfs_${TFS_K8S_NAMESPACE}_contextservice-server.log 2>&1 || true
    - kubectl --namespace $TFS_K8S_NAMESPACE logs deployment/deviceservice -c server > src/tests/${TEST_NAME}/logs/tfs_${TFS_K8S_NAMESPACE}_deviceservice-server.log 2>&1 || true
    - kubectl --namespace $TFS_K8S_NAMESPACE logs deployment/pathcompservice -c frontend > src/tests/${TEST_NAME}/logs/tfs_${TFS_K8S_NAMESPACE}_pathcompservice-frontend.log 2>&1 || true
    - kubectl --namespace $TFS_K8S_NAMESPACE logs deployment/serviceservice -c server > src/tests/${TEST_NAME}/logs/tfs_${TFS_K8S_NAMESPACE}_serviceservice-server.log 2>&1 || true
    - kubectl --namespace $TFS_K8S_NAMESPACE logs deployment/nbiservice -c server > src/tests/${TEST_NAME}/logs/tfs_${TFS_K8S_NAMESPACE}_nbiservice-server.log 2>&1 || true

    # Clean up
    - kubectl delete namespaces tfs || true
@@ -186,3 +187,5 @@ end2end_test ecoc22:
      when: always
      reports:
        junit: ./src/tests/${TEST_NAME}/report_*.xml
      paths:
        - ./src/tests/${TEST_NAME}/logs/*.log
+11 −8
Original line number Diff line number Diff line
@@ -290,18 +290,19 @@ end2end_test eucnc24:

  after_script:
    # Dump configuration of the routers (on after_script)
    - containerlab exec --name ${TEST_NAME} --label clab-node-name=r1 --cmd "Cli --command \"enable"$'\n'$"show running-config\""
    - containerlab exec --name ${TEST_NAME} --label clab-node-name=r2 --cmd "Cli --command \"enable"$'\n'$"show running-config\""
    - containerlab exec --name ${TEST_NAME} --label clab-node-name=r3 --cmd "Cli --command \"enable"$'\n'$"show running-config\""
    - mkdir -p src/tests/${TEST_NAME}/logs
    - containerlab exec --name ${TEST_NAME} --label clab-node-name=r1 --cmd "Cli --command \"enable"$'\n'$"show running-config\"" > src/tests/${TEST_NAME}/logs/agent_r1-running-config.log 2>&1 || true
    - containerlab exec --name ${TEST_NAME} --label clab-node-name=r2 --cmd "Cli --command \"enable"$'\n'$"show running-config\"" > src/tests/${TEST_NAME}/logs/agent_r2-running-config.log 2>&1 || true
    - containerlab exec --name ${TEST_NAME} --label clab-node-name=r3 --cmd "Cli --command \"enable"$'\n'$"show running-config\"" > src/tests/${TEST_NAME}/logs/agent_r3-running-config.log 2>&1 || true

    # Dump TeraFlowSDN component logs
    - source src/tests/${TEST_NAME}/deploy_specs.sh
    - ./deploy/show.sh
    - kubectl --namespace $TFS_K8S_NAMESPACE logs deployment/contextservice -c server
    - kubectl --namespace $TFS_K8S_NAMESPACE logs deployment/deviceservice -c server
    - kubectl --namespace $TFS_K8S_NAMESPACE logs deployment/pathcompservice -c frontend
    - kubectl --namespace $TFS_K8S_NAMESPACE logs deployment/serviceservice -c server
    - kubectl --namespace $TFS_K8S_NAMESPACE logs deployment/nbiservice -c server
    - kubectl --namespace $TFS_K8S_NAMESPACE logs deployment/contextservice -c server > src/tests/${TEST_NAME}/logs/tfs_${TFS_K8S_NAMESPACE}_contextservice-server.log 2>&1 || true
    - kubectl --namespace $TFS_K8S_NAMESPACE logs deployment/deviceservice -c server > src/tests/${TEST_NAME}/logs/tfs_${TFS_K8S_NAMESPACE}_deviceservice-server.log 2>&1 || true
    - kubectl --namespace $TFS_K8S_NAMESPACE logs deployment/pathcompservice -c frontend > src/tests/${TEST_NAME}/logs/tfs_${TFS_K8S_NAMESPACE}_pathcompservice-frontend.log 2>&1 || true
    - kubectl --namespace $TFS_K8S_NAMESPACE logs deployment/serviceservice -c server > src/tests/${TEST_NAME}/logs/tfs_${TFS_K8S_NAMESPACE}_serviceservice-server.log 2>&1 || true
    - kubectl --namespace $TFS_K8S_NAMESPACE logs deployment/nbiservice -c server > src/tests/${TEST_NAME}/logs/tfs_${TFS_K8S_NAMESPACE}_nbiservice-server.log 2>&1 || true

    # Clean up
    - RUNNER_PATH=`pwd`
@@ -326,3 +327,5 @@ end2end_test eucnc24:
      when: always
      reports:
        junit: ./src/tests/${TEST_NAME}/report_*.xml
      paths:
        - ./src/tests/${TEST_NAME}/logs/*.log
+11 −8
Original line number Diff line number Diff line
@@ -306,18 +306,19 @@ end2end_test l2_vpn_gnmi_oc:

  after_script:
    # Dump configuration of the routers (on after_script)
    - containerlab exec --name ${TEST_NAME} --label clab-node-name=r1 --cmd "Cli --command \"enable"$'\n'$"show running-config\""
    - containerlab exec --name ${TEST_NAME} --label clab-node-name=r2 --cmd "Cli --command \"enable"$'\n'$"show running-config\""
    - containerlab exec --name ${TEST_NAME} --label clab-node-name=r3 --cmd "Cli --command \"enable"$'\n'$"show running-config\""
    - mkdir -p src/tests/${TEST_NAME}/logs
    - containerlab exec --name ${TEST_NAME} --label clab-node-name=r1 --cmd "Cli --command \"enable"$'\n'$"show running-config\"" > src/tests/${TEST_NAME}/logs/agent_r1-running-config.log 2>&1 || true
    - containerlab exec --name ${TEST_NAME} --label clab-node-name=r2 --cmd "Cli --command \"enable"$'\n'$"show running-config\"" > src/tests/${TEST_NAME}/logs/agent_r2-running-config.log 2>&1 || true
    - containerlab exec --name ${TEST_NAME} --label clab-node-name=r3 --cmd "Cli --command \"enable"$'\n'$"show running-config\"" > src/tests/${TEST_NAME}/logs/agent_r3-running-config.log 2>&1 || true

    # Dump TeraFlowSDN component logs
    - source src/tests/${TEST_NAME}/deploy_specs.sh
    - ./deploy/show.sh
    - kubectl --namespace $TFS_K8S_NAMESPACE logs deployment/contextservice -c server
    - kubectl --namespace $TFS_K8S_NAMESPACE logs deployment/deviceservice -c server
    - kubectl --namespace $TFS_K8S_NAMESPACE logs deployment/pathcompservice -c frontend
    - kubectl --namespace $TFS_K8S_NAMESPACE logs deployment/serviceservice -c server
    - kubectl --namespace $TFS_K8S_NAMESPACE logs deployment/nbiservice -c server
    - kubectl --namespace $TFS_K8S_NAMESPACE logs deployment/contextservice -c server > src/tests/${TEST_NAME}/logs/tfs_${TFS_K8S_NAMESPACE}_contextservice-server.log 2>&1 || true
    - kubectl --namespace $TFS_K8S_NAMESPACE logs deployment/deviceservice -c server > src/tests/${TEST_NAME}/logs/tfs_${TFS_K8S_NAMESPACE}_deviceservice-server.log 2>&1 || true
    - kubectl --namespace $TFS_K8S_NAMESPACE logs deployment/pathcompservice -c frontend > src/tests/${TEST_NAME}/logs/tfs_${TFS_K8S_NAMESPACE}_pathcompservice-frontend.log 2>&1 || true
    - kubectl --namespace $TFS_K8S_NAMESPACE logs deployment/serviceservice -c server > src/tests/${TEST_NAME}/logs/tfs_${TFS_K8S_NAMESPACE}_serviceservice-server.log 2>&1 || true
    - kubectl --namespace $TFS_K8S_NAMESPACE logs deployment/nbiservice -c server > src/tests/${TEST_NAME}/logs/tfs_${TFS_K8S_NAMESPACE}_nbiservice-server.log 2>&1 || true

    # Clean up
    - RUNNER_PATH=`pwd`
@@ -342,3 +343,5 @@ end2end_test l2_vpn_gnmi_oc:
      when: always
      reports:
        junit: ./src/tests/${TEST_NAME}/report_*.xml
      paths:
        - ./src/tests/${TEST_NAME}/logs/*.log
+10 −10
Original line number Diff line number Diff line
@@ -164,15 +164,15 @@ end2end_test ofc22:
    # Dump TeraFlowSDN component logs
    - source src/tests/${TEST_NAME}/deploy_specs.sh
    - ./deploy/show.sh
    - rm -rf src/tests/${TEST_NAME}/component_logs
    - mkdir -p src/tests/${TEST_NAME}/component_logs
    - kubectl logs --namespace $TFS_K8S_NAMESPACE deployment/contextservice -c server > src/tests/${TEST_NAME}/component_logs/contextservice.log 2>&1 || true
    - kubectl logs --namespace $TFS_K8S_NAMESPACE deployment/deviceservice -c server > src/tests/${TEST_NAME}/component_logs/deviceservice.log 2>&1 || true
    - kubectl logs --namespace $TFS_K8S_NAMESPACE deployment/pathcompservice -c frontend > src/tests/${TEST_NAME}/component_logs/pathcompservice-frontend.log 2>&1 || true
    - kubectl logs --namespace $TFS_K8S_NAMESPACE deployment/serviceservice -c server > src/tests/${TEST_NAME}/component_logs/serviceservice.log 2>&1 || true
    - kubectl logs --namespace $TFS_K8S_NAMESPACE deployment/nbiservice -c server > src/tests/${TEST_NAME}/component_logs/nbiservice.log 2>&1 || true
    - kubectl logs --namespace $TFS_K8S_NAMESPACE deployment/monitoringservice -c server > src/tests/${TEST_NAME}/component_logs/monitoringservice.log 2>&1 || true
    - kubectl logs --namespace $TFS_K8S_NAMESPACE deployment/ztpservice -c ztpservice > src/tests/${TEST_NAME}/component_logs/ztpservice.log 2>&1 || true
    - rm -rf src/tests/${TEST_NAME}/logs
    - mkdir -p src/tests/${TEST_NAME}/logs
    - kubectl logs --namespace $TFS_K8S_NAMESPACE deployment/contextservice -c server > src/tests/${TEST_NAME}/logs/tfs_${TFS_K8S_NAMESPACE}_contextservice.log 2>&1 || true
    - kubectl logs --namespace $TFS_K8S_NAMESPACE deployment/deviceservice -c server > src/tests/${TEST_NAME}/logs/tfs_${TFS_K8S_NAMESPACE}_deviceservice.log 2>&1 || true
    - kubectl logs --namespace $TFS_K8S_NAMESPACE deployment/pathcompservice -c frontend > src/tests/${TEST_NAME}/logs/tfs_${TFS_K8S_NAMESPACE}_pathcompservice-frontend.log 2>&1 || true
    - kubectl logs --namespace $TFS_K8S_NAMESPACE deployment/serviceservice -c server > src/tests/${TEST_NAME}/logs/tfs_${TFS_K8S_NAMESPACE}_serviceservice.log 2>&1 || true
    - kubectl logs --namespace $TFS_K8S_NAMESPACE deployment/nbiservice -c server > src/tests/${TEST_NAME}/logs/tfs_${TFS_K8S_NAMESPACE}_nbiservice.log 2>&1 || true
    - kubectl logs --namespace $TFS_K8S_NAMESPACE deployment/monitoringservice -c server > src/tests/${TEST_NAME}/logs/tfs_${TFS_K8S_NAMESPACE}_monitoringservice.log 2>&1 || true
    - kubectl logs --namespace $TFS_K8S_NAMESPACE deployment/ztpservice -c ztpservice > src/tests/${TEST_NAME}/logs/tfs_${TFS_K8S_NAMESPACE}_ztpservice.log 2>&1 || true

    # Clean up
    - kubectl delete namespaces tfs || true
@@ -192,4 +192,4 @@ end2end_test ofc22:
      reports:
        junit: ./src/tests/${TEST_NAME}/report_*.xml
      paths:
        - ./src/tests/${TEST_NAME}/component_logs/*.log
        - ./src/tests/${TEST_NAME}/logs/*.log
Loading