diff --git a/debian/changelog b/debian/changelog index 28959029..b111ba90 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,10 @@ ostree (2019.2-2) UNRELEASED; urgency=medium * d/salsa-ci.yml: Request standard CI on salsa.debian.org - - Disable build-time tests with DEB_BUILD_OPTIONS=nocheck for now: - they don't currently work in the salsa-ci infrastructure. + - Disable build-time tests with DEB_BUILD_OPTIONS=nocheck for now. + They don't currently work in the salsa-ci infrastructure, but I + can't reproduce and debug the failure in a local Docker container. + - Similarly, disable the autopkgtest for now. -- Simon McVittie Sun, 23 Jun 2019 20:07:33 +0100 diff --git a/debian/salsa-ci.yml b/debian/salsa-ci.yml index 1ee604a7..5bdebbb3 100644 --- a/debian/salsa-ci.yml +++ b/debian/salsa-ci.yml @@ -2,5 +2,12 @@ include: - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/salsa-ci.yml - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/pipeline-jobs.yml +autopkgtest: + # https://github.com/ostreedev/ostree/issues/1885 + except: + variables: + - $DISABLED == "https://github.com/ostreedev/ostree/issues/1885" + variables: + # https://github.com/ostreedev/ostree/issues/1885 DEB_BUILD_OPTIONS: 'nocheck'