Merge ~rafaeldtinoco/ubuntu/+source/libqb:lp1891780-groovy into ubuntu/+source/libqb:ubuntu/devel

[Rafael David Tinoco]

BUG: https://bugs.launchpad.net/ubuntu/+source/libqb/+bug/1891780

Being merged together: https://code.launchpad.net/~rafaeldtinoco/ubuntu/+source/pacemaker/+git/pacemaker/+merge/389392

[Rafael David Tinoco (rafaeldtinoco)]

BILETO: https://bileto.ubuntu.com/#/ticket/4210

[Rafael David Tinoco (rafaeldtinoco)]

PPA: https://launchpad.net/~ci-train-ppa-service/+archive/ubuntu/4210

[Christian Ehrhardt  (paelzer)]

Fail
"Depends: gcc:i386 but it is not installable"

Ok, sounds fine we don't want/need this for i386 anyway.

Couldn't this instead be just
  force-reset-test libqb/1.0.6-1
in lp:~ubuntu-release/britney/hints-ubuntu and that way avoid the need for tracking and re-merging this later on?

I think this is a perfect match for the section starting with:
"# these packages will continue to build on i386 but may not be cross-testable"

review: Disapprove

[Christian Ehrhardt  (paelzer)]

Well better i386 specific and since there is no hope no need to reset, so maybe this instead:
  force-badtest libqb/all/i386

[Christian Ehrhardt  (paelzer)]

There already is this line
  10391 force-badtest libqb/1.0.5-1/i386

Replace it with the one (and placing) suggested above

[Rafael David Tinoco (rafaeldtinoco)]

I am (was) trying to skip i386 britney changes for i386 badtests as I have been pushed back a few times in adding badtests. Let me try adding badtest for this then.

Unmerged commits

cfd3cfb... by Rafael David Tinoco on 2020-08-16

update-metadata

527bddc... by Rafael David Tinoco on 2020-08-16

changelog

88669dc... by Rafael David Tinoco on 2020-08-16

* d/t/control, d/t/ipc: Disable autopkgtest for i386 architecture.

diff --git a/debian/changelog b/debian/changelog
index 6d44fed..cf1c2fe 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+libqb (1.0.6-1ubuntu1) groovy; urgency=medium
+
+  * d/t/control, d/t/ipc: Disable autopkgtest for i386 architecture.
+    (LP: #1891780)
+
+ -- Rafael David Tinoco <[e-mail]>  Sun, 16 Aug 2020 00:59:31 +0000
+
 libqb (1.0.6-1) unstable; urgency=medium
 
   [ Ferenc Wágner ]
diff --git a/debian/control b/debian/control
index 99284cd..0d3e48c 100644
--- a/debian/control
+++ b/debian/control
@@ -1,6 +1,7 @@
 Source: libqb
 Priority: optional
-Maintainer: Debian HA Maintainers <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Debian HA Maintainers <[e-mail]>
 Uploaders:
            Ferenc Wágner <[e-mail]>,
            Adrian Vondendriesch <[e-mail]>
diff --git a/debian/tests/control b/debian/tests/control
index 35c6ed9..f78a181 100644
--- a/debian/tests/control
+++ b/debian/tests/control
@@ -1,3 +1,3 @@
-Depends: libqb-dev, gcc, libc6-dev, pkg-config
+Depends: libqb-dev, gcc [amd64 arm64 armhf ppc64el s390x], libc6-dev, pkg-config
 Tests: ipc
-Restrictions: allow-stderr
+Restrictions: allow-stderr, skippable
diff --git a/debian/tests/ipc b/debian/tests/ipc
index e24cf41..7804148 100755
--- a/debian/tests/ipc
+++ b/debian/tests/ipc
@@ -1,5 +1,11 @@
 #!/bin/sh -ex
 
+[ `dpkg-architecture -qDEB_TARGET_ARCH` == "i386" ] && {
+    # https://bugs.launchpad.net/bugs/1891780
+    echo "test disabled for this architecture"
+    exit 77
+}
+
 cd examples
 # the os_base.h in-tree header includes inttypes.h for the examples
 ln -sf /usr/include/inttypes.h os_base.h # -f to enable repeated runs