Merge ~paelzer/ubuntu/+source/dpdk:fix-autopkgtest-impish into ubuntu/+source/dpdk:ubuntu/impish-devel

[Christian Ehrhardt ]

[Christian Ehrhardt  (paelzer)]

This is built and tested in https://launchpad.net/~ci-train-ppa-service/+archive/ubuntu/4613/+packages

This has been submitted to Debian in https://salsa.debian.org/debian/dpdk/-/merge_requests/51
Uploading it now resolved the block in excuses and we can later sync 22.11.2-2 once merged in Debian (same changes).

All pass fine (DPDK and also OVS tests)
  dpdk @ amd64:
      test-initscripts PASS
      test-linkage PASS
      test-autotest PASS
      test-fastsuite PASS
  openvswitch @ amd64:
      vanilla PASS
      dpdk PASS
  dpdk @ arm64:
      test-initscripts PASS
      test-linkage PASS
      test-fastsuite PASS
  openvswitch @ arm64:
      vanilla PASS
      dpdk PASS
  dpdk @ armhf:
      test-linkage PASS
      test-fastsuite PASS
  openvswitch @ armhf:
  dpdk @ ppc64el:
      test-initscripts PASS
      test-linkage PASS
      test-fastsuite PASS
  openvswitch @ ppc64el:
      vanilla PASS
      dpdk PASS
  dpdk @ s390x:

[Utkarsh Gupta (utkarsh)]

Two trivial comments otherwise LGTM! \o/
(hoping you've done the testing (which you always do), et al)

review: Approve

[Christian Ehrhardt  (paelzer)]

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

I also added the missing update-maintainer ... :-/
Tests complete

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

[Christian Ehrhardt  (paelzer)]

merged

diff --git a/debian/changelog b/debian/changelog
index a33520d..53ce036 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,17 @@
+dpdk (20.11.2-1ubuntu1) impish; urgency=medium
+
+  [ Christian Ehrhardt ]
+  * d/p/disable_autopkgtest_fails.patch: disable failures that do
+    not represent regressions
+  * d/t/control: restrict more tests to avoid badpkg failures on e.g. s390x
+  * d/p/disable_armhf_autopkgtest_fails.patch: disable arm failures that
+    do not represent regressions
+
+  [ Luca Boccassi ]
+  * autopkgtest: restrict to amd64 arm64 armhf i386 ppc64el
+
+ -- Christian Ehrhardt <[e-mail]>  Tue, 13 Jul 2021 07:43:36 +0200
+
 dpdk (20.11.2-1) experimental; urgency=medium
 
   * New upstream release candidate 20.11.2
diff --git a/debian/patches/disable_armhf_autopkgtest_fails.patch b/debian/patches/disable_armhf_autopkgtest_fails.patch
new file mode 100644
index 0000000..3a714c1
--- /dev/null
+++ b/debian/patches/disable_armhf_autopkgtest_fails.patch
@@ -0,0 +1,32 @@
+Description: Skip tests failing in arm test environment
+ These tests generally work but fail in a Ubuntu arm autopkgtest environment.
+ Skip those as they do not represent real regressions.
+Forwarded: no
+X-Not-Forwarded-Reason: This only applies to autopkgtest environments
+Author: Christian Ehrhardt <[e-mail]>
+Last-Update: 2021-07-13
+--- a/app/test/meson.build
++++ b/app/test/meson.build
+@@ -228,10 +228,8 @@ fast_tests = [
+         ['per_lcore_autotest', false],
+         ['prefetch_autotest', true],
+         ['rcu_qsbr_autotest', false],
+-        ['red_autotest', true],
+         ['rib_autotest', true],
+         ['rib6_autotest', true],
+-        ['ring_autotest', true],
+         ['rwlock_test1_autotest', true],
+         ['rwlock_rda_autotest', true],
+         ['rwlock_rds_wrm_autotest', true],
+@@ -422,6 +420,11 @@ if arch_subdir != 'ppc'
+ 	fast_tests += [['lcores_autotest', true]]
+ endif
+ 
++# These tests consistently fail on arm (containerized) test environments
++if arch_subdir != 'arm'
++	fast_tests += [['red_autotest', true], ['ring_autotest', true]]
++endif
++
+ foreach d:test_deps
+ 	def_lib = get_option('default_library')
+ 	test_dep_objs += get_variable(def_lib + '_rte_' + d)
diff --git a/debian/patches/disable_autopkgtest_fails.patch b/debian/patches/disable_autopkgtest_fails.patch
new file mode 100644
index 0000000..24d15a6
--- /dev/null
+++ b/debian/patches/disable_autopkgtest_fails.patch
@@ -0,0 +1,49 @@
+Description: Skip tests failing in test environment
+ These tests generally work but fail in a Ubuntu autopkgtest environment.
+ This is consistent across all architectures.
+ Skip those as they do not represent real regressions.
+Forwarded: no
+X-Not-Forwarded-Reason: This only applies to autopkgtest environments
+Author: Christian Ehrhardt <[e-mail]>
+Last-Update: 2021-07-13
+--- a/app/test/meson.build
++++ b/app/test/meson.build
+@@ -210,7 +210,7 @@ fast_tests = [
+         ['fib6_autotest', true],
+         ['func_reentrancy_autotest', false],
+         ['flow_classify_autotest', false],
+-        ['hash_autotest', true],
++        ['hash_autotest', false],
+         ['interrupt_autotest', true],
+         ['ipfrag_autotest', false],
+         ['logs_autotest', true],
+@@ -225,9 +225,9 @@ fast_tests = [
+         ['memzone_autotest', false],
+         ['meter_autotest', true],
+         ['multiprocess_autotest', false],
+-        ['per_lcore_autotest', true],
++        ['per_lcore_autotest', false],
+         ['prefetch_autotest', true],
+-        ['rcu_qsbr_autotest', true],
++        ['rcu_qsbr_autotest', false],
+         ['red_autotest', true],
+         ['rib_autotest', true],
+         ['rib6_autotest', true],
+@@ -242,7 +242,7 @@ fast_tests = [
+         ['stack_autotest', false],
+         ['stack_lf_autotest', false],
+         ['string_autotest', true],
+-        ['table_autotest', true],
++        ['table_autotest', false],
+         ['tailq_autotest', true],
+         ['timer_autotest', false],
+         ['user_delay_us', true],
+@@ -262,7 +262,7 @@ fast_tests = [
+         ['power_autotest', true],
+         ['power_kvm_vm_autotest', false],
+         ['reorder_autotest', true],
+-        ['service_autotest', true],
++        ['service_autotest', false],
+         ['thash_autotest', true],
+         ['trace_autotest', true],
+ ]
diff --git a/debian/patches/series b/debian/patches/series
index a36dbcd..b7c783f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,4 @@
 0001-eal-linux-force-iova-mode-va-with-no-huge-option.patch
 disable_lcores_autotest_ppc.patch
+disable_autopkgtest_fails.patch
+disable_armhf_autopkgtest_fails.patch
diff --git a/debian/tests/control b/debian/tests/control
index 56101dd..19e369e 100644
--- a/debian/tests/control
+++ b/debian/tests/control
@@ -1,10 +1,12 @@
 Tests: test-initscripts
 Restrictions: allow-stderr, isolation-machine, needs-root, skippable
 Depends: dpdk, gawk, mount, systemd, sysvinit-utils, iproute2
+Architecture: amd64 arm64 armhf i386 ppc64el
 
 Tests: test-linkage
 Restrictions: allow-stderr, skippable
 Depends: libdpdk-dev, libc6-dev, gcc, grep, libpcap-dev, pax-utils, pkg-config
+Architecture: amd64 arm64 armhf i386 ppc64el
 
 Tests: test-autotest
 Restrictions: allow-stderr, isolation-machine, needs-root, skippable
@@ -13,3 +15,4 @@ Depends: dpdk-dev [amd64 arm64 i386 ppc64el], python3, python3-pexpect
 Tests: test-fastsuite
 Restrictions: allow-stderr, skippable
 Depends: build-essential, @builddeps@
+Architecture: amd64 arm64 armhf i386 ppc64el