Merge ~paelzer/ubuntu/+source/dpdk:fix-ppc-test-IMPISH into ubuntu/+source/dpdk:ubuntu/impish-devel

Proposed by Christian Ehrhardt 
Status: Merged
Approved by: Christian Ehrhardt 
Approved revision: 3e06892a4569ceea0b5f90470b41a7684d81e3b1
Merge reported by: Christian Ehrhardt 
Merged at revision: 3e06892a4569ceea0b5f90470b41a7684d81e3b1
Proposed branch: ~paelzer/ubuntu/+source/dpdk:fix-ppc-test-IMPISH
Merge into: ubuntu/+source/dpdk:ubuntu/impish-devel
Diff against target: 57 lines (+35/-0)
3 files modified
debian/changelog (+7/-0)
debian/patches/disable_ppc64_autopkgtest_fails.patch (+27/-0)
debian/patches/series (+1/-0)
Reviewer Review Type Date Requested Status
Canonical Server packageset reviewers Pending
Canonical Server Pending
git-ubuntu developers Pending
Review via email: mp+407060@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Christian Ehrhardt  (paelzer) wrote :

PPA for testing (just started building):
  https://launchpad.net/~ci-train-ppa-service/+archive/ubuntu/4647

Revision history for this message
Graham Inggs (ginggs) wrote :
Revision history for this message
Graham Inggs (ginggs) wrote :
Revision history for this message
Christian Ehrhardt  (paelzer) wrote :

Thanks, uploading

Revision history for this message
Christian Ehrhardt  (paelzer) wrote :

Also merged in Debian already

Revision history for this message
Christian Ehrhardt  (paelzer) wrote :

To ssh://git.launchpad.net/~usd-import-team/ubuntu/+source/dpdk
 * [new tag] upload/20.11.2-1ubuntu2 -> upload/20.11.2-1ubuntu2

Uploading to ubuntu (via ftp to upload.ubuntu.com):
  Uploading dpdk_20.11.2-1ubuntu2.dsc: done.
  Uploading dpdk_20.11.2-1ubuntu2.debian.tar.xz: done.
  Uploading dpdk_20.11.2-1ubuntu2_source.buildinfo: done.
  Uploading dpdk_20.11.2-1ubuntu2_source.changes: done.
Successfully uploaded packages.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/debian/changelog b/debian/changelog
2index 53ce036..5242405 100644
3--- a/debian/changelog
4+++ b/debian/changelog
5@@ -1,3 +1,10 @@
6+dpdk (20.11.2-1ubuntu2) impish; urgency=medium
7+
8+ * d/p/disable_ppc64_autopkgtest_fails.patch: skip known
9+ false-positives (LP: #1939861)
10+
11+ -- Christian Ehrhardt <christian.ehrhardt@canonical.com> Fri, 13 Aug 2021 10:18:34 +0200
12+
13 dpdk (20.11.2-1ubuntu1) impish; urgency=medium
14
15 [ Christian Ehrhardt ]
16diff --git a/debian/patches/disable_ppc64_autopkgtest_fails.patch b/debian/patches/disable_ppc64_autopkgtest_fails.patch
17new file mode 100644
18index 0000000..a0bf0ec
19--- /dev/null
20+++ b/debian/patches/disable_ppc64_autopkgtest_fails.patch
21@@ -0,0 +1,27 @@
22+Description: Skip tests failing in ppc64 test environment
23+ It turned out that this regressed in release and acl_autotest is
24+ unrelable on ppc64.
25+ Skip it as they do not represent real regressions in or against DPDK.
26+Forwarded: https://salsa.debian.org/debian/dpdk/-/merge_requests/52
27+X-Not-Forwarded-Reason: This only applies to autopkgtest environments
28+Author: Christian Ehrhardt <christian.ehrhardt@canonical.com>
29+Last-Update: 2021-08-13
30+--- a/app/test/meson.build
31++++ b/app/test/meson.build
32+@@ -180,7 +180,6 @@ test_deps = ['acl',
33+ # Each test is marked with flag true/false
34+ # to indicate whether it can run in no-huge mode.
35+ fast_tests = [
36+- ['acl_autotest', true],
37+ ['alarm_autotest', false],
38+ ['atomic_autotest', false],
39+ ['bitops_autotest', true],
40+@@ -417,7 +416,7 @@ endif
41+
42+ # This test consistently times out on ppc64
43+ if arch_subdir != 'ppc'
44+- fast_tests += [['lcores_autotest', true]]
45++ fast_tests += [['lcores_autotest', true], ['acl_autotest', true]]
46+ endif
47+
48+ # These tests consistently fail on arm (containerized) test environments
49diff --git a/debian/patches/series b/debian/patches/series
50index b7c783f..37037a5 100644
51--- a/debian/patches/series
52+++ b/debian/patches/series
53@@ -2,3 +2,4 @@
54 disable_lcores_autotest_ppc.patch
55 disable_autopkgtest_fails.patch
56 disable_armhf_autopkgtest_fails.patch
57+disable_ppc64_autopkgtest_fails.patch

Subscribers

People subscribed via source and target branches