Test-Name: DPDK Fast test suite Test-Label: aws-unit-testing Test-Status: FAILURE _Unit Testing Apply error encountered_ http://dpdk.org/patch/156568 Test Status Summary: +--------------+------------------+ | Architecture | DPDK Unit Test | +--------------+------------------+ | x86_64 | FAILURE | +--------------+------------------+ | arm64 | FAILURE | +--------------+------------------+ Test environment (aarch64): Description: Apply error encountered OS : Ubuntu 24.04.1 LTS Kernel : 6.14.0-1012-aws NIC : Elastic Network Adapter GCC : 13.3.0-6ubuntu2~24.04 Test last 100 lines (aarch64) Auto-merging dts/tests/TestSuite_port_restart_config_persistency.py CONFLICT (content): Merge conflict in dts/tests/TestSuite_port_restart_config_persistency.py Auto-merging dts/tests/TestSuite_port_control.py Auto-merging dts/tests/TestSuite_pmd_buffer_scatter.py Auto-merging dts/tests/TestSuite_packet_capture.py Auto-merging dts/tests/TestSuite_mtu.py CONFLICT (content): Merge conflict in dts/tests/TestSuite_mtu.py Auto-merging dts/tests/TestSuite_mac_filter.py Auto-merging dts/tests/TestSuite_l2fwd.py Auto-merging dts/tests/TestSuite_hello_world.py Auto-merging dts/tests/TestSuite_dynamic_queue_conf.py Auto-merging dts/tests/TestSuite_dynamic_config.py CONFLICT (content): Merge conflict in dts/tests/TestSuite_dynamic_config.py Auto-merging dts/tests/TestSuite_dual_vlan.py CONFLICT (content): Merge conflict in dts/tests/TestSuite_dual_vlan.py Auto-merging dts/tests/TestSuite_checksum_offload.py CONFLICT (content): Merge conflict in dts/tests/TestSuite_checksum_offload.py Auto-merging dts/tests/TestSuite_blocklist.py error: Failed to merge in the changes. hint: Use 'git am --show-current-patch=diff' to see the failed patch Patch failed at 0001 dts: update testsuite docs When you have resolved this problem, run "git am --continue". If you prefer to skip this patch, run "git am --skip" instead. To restore the original branch and stop patching, run "git am --abort". Patch failed. Checking for conflicts in .rst files... Patch apply failed with conflicts in non-.rst files: ['dts/tests/TestSuite_checksum_offload.py', 'dts/tests/TestSuite_dual_vlan.py', 'dts/tests/TestSuite_dynamic_config.py', 'dts/tests/TestSuite_mtu.py', 'dts/tests/TestSuite_port_restart_config_persistency.py', 'dts/tests/TestSuite_rte_flow.py', 'dts/tests/TestSuite_uni_pkt.py', 'dts/tests/TestSuite_vlan.py'] Trying to checkout branch: origin/main Checked out to main (f41d2db45d8a23c3315929c190d098154732a1ce) Applying patch... Failed to apply patch: Applying: dts: update testsuite docs Using index info to reconstruct a base tree... M dts/tests/TestSuite_blocklist.py M dts/tests/TestSuite_checksum_offload.py M dts/tests/TestSuite_dual_vlan.py M dts/tests/TestSuite_dynamic_config.py M dts/tests/TestSuite_dynamic_queue_conf.py M dts/tests/TestSuite_hello_world.py M dts/tests/TestSuite_l2fwd.py M dts/tests/TestSuite_mac_filter.py M dts/tests/TestSuite_mtu.py M dts/tests/TestSuite_packet_capture.py M dts/tests/TestSuite_pmd_buffer_scatter.py M dts/tests/TestSuite_port_control.py M dts/tests/TestSuite_port_restart_config_persistency.py M dts/tests/TestSuite_port_stats.py M dts/tests/TestSuite_promisc_support.py M dts/tests/TestSuite_queue_start_stop.py M dts/tests/TestSuite_rte_flow.py M dts/tests/TestSuite_smoke_tests.py M dts/tests/TestSuite_softnic.py M dts/tests/TestSuite_uni_pkt.py M dts/tests/TestSuite_vlan.py Falling back to patching base and 3-way merge... Auto-merging dts/tests/TestSuite_vlan.py CONFLICT (content): Merge conflict in dts/tests/TestSuite_vlan.py Auto-merging dts/tests/TestSuite_uni_pkt.py CONFLICT (content): Merge conflict in dts/tests/TestSuite_uni_pkt.py Auto-merging dts/tests/TestSuite_softnic.py Auto-merging dts/tests/TestSuite_smoke_tests.py Auto-merging dts/tests/TestSuite_rte_flow.py CONFLICT (content): Merge conflict in dts/tests/TestSuite_rte_flow.py Auto-merging dts/tests/TestSuite_queue_start_stop.py Auto-merging dts/tests/TestSuite_promisc_support.py Auto-merging dts/tests/TestSuite_port_stats.py Auto-merging dts/tests/TestSuite_port_restart_config_persistency.py CONFLICT (content): Merge conflict in dts/tests/TestSuite_port_restart_config_persistency.py Auto-merging dts/tests/TestSuite_port_control.py Auto-merging dts/tests/TestSuite_pmd_buffer_scatter.py CONFLICT (content): Merge conflict in dts/tests/TestSuite_pmd_buffer_scatter.py Auto-merging dts/tests/TestSuite_packet_capture.py Auto-merging dts/tests/TestSuite_mtu.py CONFLICT (content): Merge conflict in dts/tests/TestSuite_mtu.py Auto-merging dts/tests/TestSuite_mac_filter.py Auto-merging dts/tests/TestSuite_l2fwd.py Auto-merging dts/tests/TestSuite_hello_world.py Auto-merging dts/tests/TestSuite_dynamic_queue_conf.py CONFLICT (content): Merge conflict in dts/tests/TestSuite_dynamic_queue_conf.py Auto-merging dts/tests/TestSuite_dynamic_config.py CONFLICT (content): Merge conflict in dts/tests/TestSuite_dynamic_config.py Auto-merging dts/tests/TestSuite_dual_vlan.py CONFLICT (content): Merge conflict in dts/tests/TestSuite_dual_vlan.py Auto-merging dts/tests/TestSuite_checksum_offload.py CONFLICT (content): Merge conflict in dts/tests/TestSuite_checksum_offload.py Auto-merging dts/tests/TestSuite_blocklist.py CONFLICT (content): Merge conflict in dts/tests/TestSuite_blocklist.py error: Failed to merge in the changes. hint: Use 'git am --show-current-patch=diff' to see the failed patch Patch failed at 0001 dts: update testsuite docs When you have resolved this problem, run "git am --continue". If you prefer to skip this patch, run "git am --skip" instead. To restore the original branch and stop patching, run "git am --abort". Patch failed. Checking for conflicts in .rst files... Patch apply failed with conflicts in non-.rst files: ['dts/tests/TestSuite_blocklist.py', 'dts/tests/TestSuite_checksum_offload.py', 'dts/tests/TestSuite_dual_vlan.py', 'dts/tests/TestSuite_dynamic_config.py', 'dts/tests/TestSuite_dynamic_queue_conf.py', 'dts/tests/TestSuite_mtu.py', 'dts/tests/TestSuite_pmd_buffer_scatter.py', 'dts/tests/TestSuite_port_restart_config_persistency.py', 'dts/tests/TestSuite_rte_flow.py', 'dts/tests/TestSuite_uni_pkt.py', 'dts/tests/TestSuite_vlan.py'] FAILURE Test environment (x86_64): Description: Apply error encountered OS : Ubuntu 24.04.1 LTS Kernel : 6.14.0-1012-aws NIC : Elastic Network Adapter GCC : 13.3.0-6ubuntu2~24.04 Test last 100 lines (x86_64) Auto-merging dts/tests/TestSuite_port_restart_config_persistency.py CONFLICT (content): Merge conflict in dts/tests/TestSuite_port_restart_config_persistency.py Auto-merging dts/tests/TestSuite_port_control.py Auto-merging dts/tests/TestSuite_pmd_buffer_scatter.py Auto-merging dts/tests/TestSuite_packet_capture.py Auto-merging dts/tests/TestSuite_mtu.py CONFLICT (content): Merge conflict in dts/tests/TestSuite_mtu.py Auto-merging dts/tests/TestSuite_mac_filter.py Auto-merging dts/tests/TestSuite_l2fwd.py Auto-merging dts/tests/TestSuite_hello_world.py Auto-merging dts/tests/TestSuite_dynamic_queue_conf.py Auto-merging dts/tests/TestSuite_dynamic_config.py CONFLICT (content): Merge conflict in dts/tests/TestSuite_dynamic_config.py Auto-merging dts/tests/TestSuite_dual_vlan.py CONFLICT (content): Merge conflict in dts/tests/TestSuite_dual_vlan.py Auto-merging dts/tests/TestSuite_checksum_offload.py CONFLICT (content): Merge conflict in dts/tests/TestSuite_checksum_offload.py Auto-merging dts/tests/TestSuite_blocklist.py error: Failed to merge in the changes. hint: Use 'git am --show-current-patch=diff' to see the failed patch Patch failed at 0001 dts: update testsuite docs When you have resolved this problem, run "git am --continue". If you prefer to skip this patch, run "git am --skip" instead. To restore the original branch and stop patching, run "git am --abort". Patch failed. Checking for conflicts in .rst files... Patch apply failed with conflicts in non-.rst files: ['dts/tests/TestSuite_checksum_offload.py', 'dts/tests/TestSuite_dual_vlan.py', 'dts/tests/TestSuite_dynamic_config.py', 'dts/tests/TestSuite_mtu.py', 'dts/tests/TestSuite_port_restart_config_persistency.py', 'dts/tests/TestSuite_rte_flow.py', 'dts/tests/TestSuite_uni_pkt.py', 'dts/tests/TestSuite_vlan.py'] Trying to checkout branch: origin/main Checked out to main (f41d2db45d8a23c3315929c190d098154732a1ce) Applying patch... Applying: dts: update testsuite docs Using index info to reconstruct a base tree... M dts/tests/TestSuite_blocklist.py M dts/tests/TestSuite_checksum_offload.py M dts/tests/TestSuite_dual_vlan.py M dts/tests/TestSuite_dynamic_config.py M dts/tests/TestSuite_dynamic_queue_conf.py M dts/tests/TestSuite_hello_world.py M dts/tests/TestSuite_l2fwd.py M dts/tests/TestSuite_mac_filter.py M dts/tests/TestSuite_mtu.py M dts/tests/TestSuite_packet_capture.py M dts/tests/TestSuite_pmd_buffer_scatter.py M dts/tests/TestSuite_port_control.py M dts/tests/TestSuite_port_restart_config_persistency.py M dts/tests/TestSuite_port_stats.py M dts/tests/TestSuite_promisc_support.py M dts/tests/TestSuite_queue_start_stop.py M dts/tests/TestSuite_rte_flow.py M dts/tests/TestSuite_smoke_tests.py M dts/tests/TestSuite_softnic.py M dts/tests/TestSuite_uni_pkt.py M dts/tests/TestSuite_vlan.py Falling back to patching base and 3-way merge... Auto-merging dts/tests/TestSuite_vlan.py CONFLICT (content): Merge conflict in dts/tests/TestSuite_vlan.py Auto-merging dts/tests/TestSuite_uni_pkt.py CONFLICT (content): Merge conflict in dts/tests/TestSuite_uni_pkt.py Auto-merging dts/tests/TestSuite_softnic.py Auto-merging dts/tests/TestSuite_smoke_tests.py Auto-merging dts/tests/TestSuite_rte_flow.py CONFLICT (content): Merge conflict in dts/tests/TestSuite_rte_flow.py Auto-merging dts/tests/TestSuite_queue_start_stop.py Auto-merging dts/tests/TestSuite_promisc_support.py Auto-merging dts/tests/TestSuite_port_stats.py Auto-merging dts/tests/TestSuite_port_restart_config_persistency.py CONFLICT (content): Merge conflict in dts/tests/TestSuite_port_restart_config_persistency.py Auto-merging dts/tests/TestSuite_port_control.py Auto-merging dts/tests/TestSuite_pmd_buffer_scatter.py CONFLICT (content): Merge conflict in dts/tests/TestSuite_pmd_buffer_scatter.py Auto-merging dts/tests/TestSuite_packet_capture.py Auto-merging dts/tests/TestSuite_mtu.py CONFLICT (content): Merge conflict in dts/tests/TestSuite_mtu.py Auto-merging dts/tests/TestSuite_mac_filter.py Auto-merging dts/tests/TestSuite_l2fwd.py Auto-merging dts/tests/TestSuite_hello_world.py Auto-merging dts/tests/TestSuite_dynamic_queue_conf.py CONFLICT (content): Merge conflict in dts/tests/TestSuite_dynamic_queue_conf.py Auto-merging dts/tests/TestSuite_dynamic_config.py CONFLICT (content): Merge conflict in dts/tests/TestSuite_dynamic_config.py Auto-merging dts/tests/TestSuite_dual_vlan.py CONFLICT (content): Merge conflict in dts/tests/TestSuite_dual_vlan.py Auto-merging dts/tests/TestSuite_checksum_offload.py CONFLICT (content): Merge conflict in dts/tests/TestSuite_checksum_offload.py Auto-merging dts/tests/TestSuite_blocklist.py CONFLICT (content): Merge conflict in dts/tests/TestSuite_blocklist.py error: Failed to merge in the changes. hint: Use 'git am --show-current-patch=diff' to see the failed patch Patch failed at 0001 dts: update testsuite docs When you have resolved this problem, run "git am --continue". If you prefer to skip this patch, run "git am --skip" instead. To restore the original branch and stop patching, run "git am --abort". Patch failed. Checking for conflicts in .rst files... Patch apply failed with conflicts in non-.rst files: ['dts/tests/TestSuite_blocklist.py', 'dts/tests/TestSuite_checksum_offload.py', 'dts/tests/TestSuite_dual_vlan.py', 'dts/tests/TestSuite_dynamic_config.py', 'dts/tests/TestSuite_dynamic_queue_conf.py', 'dts/tests/TestSuite_mtu.py', 'dts/tests/TestSuite_pmd_buffer_scatter.py', 'dts/tests/TestSuite_port_restart_config_persistency.py', 'dts/tests/TestSuite_rte_flow.py', 'dts/tests/TestSuite_uni_pkt.py', 'dts/tests/TestSuite_vlan.py'] FAILURE