summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2018-09-11 20:34:36 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2018-09-11 20:34:36 +0000
commit82174ec97cbd7098869be0950372d411e749b7bc (patch)
treea1e0ada64387a5f1fc8f75e2f4668bde17b86c26
parentReleasing progress-linux version 2018.7-1~dschinn1. (diff)
downloadostree-82174ec97cbd7098869be0950372d411e749b7bc.zip
ostree-82174ec97cbd7098869be0950372d411e749b7bc.tar.xz
Merging debian version 2018.7-2.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
-rw-r--r--debian/changelog9
-rw-r--r--debian/patches/debian/Skip-test-pull-repeated-during-CI.patch34
-rw-r--r--debian/patches/series1
3 files changed, 44 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index 459f298..6527780 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+ostree (2018.7-2) unstable; urgency=medium
+
+ * d/p/debian/Skip-test-pull-repeated-during-CI.patch:
+ Skip a test that is non-deterministic and can spuriously fail,
+ which is not suitable for build-time testing or gating migration in
+ autopkgtest.
+
+ -- Simon McVittie <smcv@debian.org> Mon, 30 Jul 2018 16:52:35 +0100
+
ostree (2018.7-1~dschinn1) dschinn-backports; urgency=medium
* Uploading to dschinn-backports, remaining changes:
diff --git a/debian/patches/debian/Skip-test-pull-repeated-during-CI.patch b/debian/patches/debian/Skip-test-pull-repeated-during-CI.patch
new file mode 100644
index 0000000..4b370fb
--- /dev/null
+++ b/debian/patches/debian/Skip-test-pull-repeated-during-CI.patch
@@ -0,0 +1,34 @@
+From: Simon McVittie <smcv@debian.org>
+Date: Mon, 30 Jul 2018 16:51:01 +0100
+Subject: Skip test-pull-repeated during CI
+
+This test is expected to fail a small proportion of the time. During
+the build of ostree 2018.7-1 in Debian, it seems we were unlucky on
+s390x. Non-deterministic tests are also problematic for autopkgtest,
+where they can gate migration of our dependencies like GLib, so skip
+this test unless the caller has opted-in to non-deterministic tests.
+
+It would be appropriate to enable this test in environments where
+failures can easily be retried and are not disruptive to other
+packages.
+
+Signed-off-by: Simon McVittie <smcv@debian.org>
+---
+ tests/test-pull-repeated.sh | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/tests/test-pull-repeated.sh b/tests/test-pull-repeated.sh
+index a2707d6..33b9d37 100755
+--- a/tests/test-pull-repeated.sh
++++ b/tests/test-pull-repeated.sh
+@@ -23,6 +23,10 @@ set -euo pipefail
+
+ . $(dirname $0)/libtest.sh
+
++if [ "${OSTREE_TEST_ALLOW_RANDOM:-}" != 1 ]; then
++ skip "Non-deterministic test will fail if we are unlucky"
++fi
++
+ echo "1..4"
+
+ COMMIT_SIGN="--gpg-homedir=${TEST_GPG_KEYHOME} --gpg-sign=${TEST_GPG_KEYID_1}"
diff --git a/debian/patches/series b/debian/patches/series
index ad0ed6a..9adee33 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
lib-pull-Fix-minor-memleak-in-error-path.patch
+debian/Skip-test-pull-repeated-during-CI.patch