From: sys_stv@intel.com
To: test-report@dpdk.org, dts-test-report@dpdk.org, weiyuanx.li@intel.com
Subject: [dts-test-report] |FAILURE| pw(120054-120061) sid(25853) job(DTS_AUTO_1908) [V5, 8/8] tests/vlan: modify script and test plan to support i40e fimware >= 8.4
Date: 22 Nov 2022 19:59:32 -0800 [thread overview]
Message-ID: <d60617$iuac6d@orsmga007-auth.jf.intel.com> (raw)
[-- Attachment #1: Type: text/plain, Size: 1459 bytes --]
Test-Label: Intel-dts-suite-test
Test-Status: FAILURE
http://dpdk.org/patch/120061
Subject: [V5,8/8] tests/vlan: modify script and test plan to support i40e fimware >= 8.4
_Apply issues_
Diff:
test_plans/dual_vlan_test_plan.rst
tests/TestSuite_dual_vlan.py
test_plans/ipgre_test_plan.rst
tests/TestSuite_ipgre.py
test_plans/vlan_ethertype_config_test_plan.rst
tests/TestSuite_vlan_ethertype_config.py
test_plans/vlan_test_plan.rst
tests/TestSuite_vlan.py
DPDK:
commit 84f8e7c029b04fa43d0982e4af593257316798cb
Author: Thomas Monjalon <thomas@monjalon.net>
Date: Tue Nov 22 16:46:04 2022 +0100
Comment: version: 22.11-rc4
DTS:
commit 162192afa25c5e079daf8b437bc0558074f4d06a
Author: Lijuan Tu <lijuan.tu@intel.com>
Date: Tue Nov 22 16:55:38 2022 +0800
Comment: version: 22.07.0
DTS git baseline:
Repo:dts, CommitID: 162192afa25c5e079daf8b437bc0558074f4d06a
* Repo: dts
Falling back to patching base and 3-way merge...
Auto-merging tests/TestSuite_dual_vlan.py
CONFLICT (content): Merge conflict in tests/TestSuite_dual_vlan.py
error: Failed to merge in the changes.
Patch failed at 0002 tests/dual_vlan: modify script and test plan to support i40e fimware >= 8.4
Use 'git am --show-current-patch' to see the failed patch
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".
DPDK STV team
reply other threads:[~2022-11-23 3:59 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='d60617$iuac6d@orsmga007-auth.jf.intel.com' \
--to=sys_stv@intel.com \
--cc=dts-test-report@dpdk.org \
--cc=test-report@dpdk.org \
--cc=weiyuanx.li@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).