|FAILURE| pw156566-156567 Description: Apply error encountered

[al-sw-devops at alabs.net]

Test-Name: DPDK Fast test suite
Test-Label: aws-unit-testing
Test-Status: FAILURE
_Unit Testing Apply error encountered_
http://dpdk.org/patch/156567

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)
Cleaning repository state...
Trying to checkout branch: origin/main
Checked out to main (f41d2db45d8a23c3315929c190d098154732a1ce)
Done: main commit f41d2db45d8a23c3315929c190d098154732a1ce
Trying to checkout branch: origin/next-dts-for-main
Checked out to next-dts-for-main (d382a5035be89b8b3259bc93ab4bae6b6b948aa5)
Applying patch...

Failed to apply patch:
Applying: dts: add RSS functions to testpmd
Using index info to reconstruct a base tree...
A	dts/api/testpmd/__init__.py
A	dts/api/testpmd/types.py
Falling back to patching base and 3-way merge...
CONFLICT (modify/delete): dts/api/testpmd/types.py deleted in HEAD and modified in dts: add RSS functions to testpmd. Version dts: add RSS functions to testpmd of dts/api/testpmd/types.py left in tree.
CONFLICT (modify/delete): dts/api/testpmd/__init__.py deleted in HEAD and modified in dts: add RSS functions to testpmd. Version dts: add RSS functions to testpmd of dts/api/testpmd/__init__.py left in tree.
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: add RSS functions to testpmd
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/api/testpmd/__init__.py', 'dts/api/testpmd/types.py']
Trying to checkout branch: origin/main
Checked out to main (f41d2db45d8a23c3315929c190d098154732a1ce)
Applying patch...

Failed to apply patch:
Applying: dts: add RSS functions to testpmd
Using index info to reconstruct a base tree...
A	dts/api/testpmd/__init__.py
A	dts/api/testpmd/types.py
Falling back to patching base and 3-way merge...
CONFLICT (modify/delete): dts/api/testpmd/types.py deleted in HEAD and modified in dts: add RSS functions to testpmd. Version dts: add RSS functions to testpmd of dts/api/testpmd/types.py left in tree.
CONFLICT (modify/delete): dts/api/testpmd/__init__.py deleted in HEAD and modified in dts: add RSS functions to testpmd. Version dts: add RSS functions to testpmd of dts/api/testpmd/__init__.py left in tree.
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: add RSS functions to testpmd
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/api/testpmd/__init__.py', 'dts/api/testpmd/types.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)
Cleaning repository state...
Trying to checkout branch: origin/main
Checked out to main (f41d2db45d8a23c3315929c190d098154732a1ce)
Done: main commit f41d2db45d8a23c3315929c190d098154732a1ce
Trying to checkout branch: origin/next-dts-for-main
Checked out to next-dts-for-main (d382a5035be89b8b3259bc93ab4bae6b6b948aa5)
Applying patch...
Applying: dts: add RSS functions to testpmd
Using index info to reconstruct a base tree...
A	dts/api/testpmd/__init__.py
A	dts/api/testpmd/types.py
Falling back to patching base and 3-way merge...
CONFLICT (modify/delete): dts/api/testpmd/types.py deleted in HEAD and modified in dts: add RSS functions to testpmd. Version dts: add RSS functions to testpmd of dts/api/testpmd/types.py left in tree.
CONFLICT (modify/delete): dts/api/testpmd/__init__.py deleted in HEAD and modified in dts: add RSS functions to testpmd. Version dts: add RSS functions to testpmd of dts/api/testpmd/__init__.py left in tree.
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: add RSS functions to testpmd
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/api/testpmd/__init__.py', 'dts/api/testpmd/types.py']
Trying to checkout branch: origin/main
Checked out to main (f41d2db45d8a23c3315929c190d098154732a1ce)
Applying patch...
Applying: dts: add RSS functions to testpmd
Using index info to reconstruct a base tree...
A	dts/api/testpmd/__init__.py
A	dts/api/testpmd/types.py
Falling back to patching base and 3-way merge...
CONFLICT (modify/delete): dts/api/testpmd/types.py deleted in HEAD and modified in dts: add RSS functions to testpmd. Version dts: add RSS functions to testpmd of dts/api/testpmd/types.py left in tree.
CONFLICT (modify/delete): dts/api/testpmd/__init__.py deleted in HEAD and modified in dts: add RSS functions to testpmd. Version dts: add RSS functions to testpmd of dts/api/testpmd/__init__.py left in tree.
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: add RSS functions to testpmd
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/api/testpmd/__init__.py', 'dts/api/testpmd/types.py']
FAILURE