Git log: commit aa58ed49d3c54ca91204d53327aa859ca4f71a32
Author: Dan Streetman <ddstreet@canonical.com>
Date: Mon Oct 14 17:42:50 2019 -0400
test: add initial blacklist files
This is the initial 'blacklist-upstream' files to block running of certain
tests that are flaky until they can be investigated and fixed.
These files are associated with the previous commit that changes the
'upstream' autopkgtest's blacklist from a built-in variable to per-test
flag files.
commit 1d407ce94323d7b330ca166c06780db97867e623
Author: Dan Streetman <ddstreet@canonical.com>
Date: Tue Jul 9 11:43:48 2019 -0400
d/t/upstream: change BLACKLIST env var into per-test file that upstream can control
Currently, the 'upstream' test runs all upstream-provided tests at tests/TEST-*,
except for any that are in a hardcoded list contained in this test.
Any change to the hardcoded blacklist involves patching the debian repo, which is
not an ideal way for upstream systemd to manage a hopefully temporary blacklist of
problematic tests.
There was discussion around making the blacklist entirely provided by an upstream
env var, configured in the upstream webhooks that control the Ubuntu CI tests,
but that results in 2 problems; 1) Debian would no longer be able to easily
control its own blacklist, and 2) upstream would only have an all-or-none control
over the blacklist, meaning that it could only enable or disable any specific
test for all PRs; it could not enable a test for only a specific PR that was
attempting to fix the flaky test (for example).
This approach moves blacklist control into the systemd tests themselves, by changing
the 'upstream' test to look for a file in the test directory, and skipping the test
if such file is found. This way, Debian (and Ubuntu and other Debian derivatives)
can continue to manage their own blacklist, but also upstream can control
the blacklist for individual tests on a per-PR basis.
For example, if upstream has the file 'tests/TEST-01-BASIC/blacklist-ubuntu-ci'
in its repo, Ubuntu CI will skip this test for all PRs opened. Then, a PR can
be opened that both fixes the test, as well as removes this file. The Ubuntu CI
will then run the test, but only for the PR that attempts to fix it. Once that
PR is merged, all future tests will then run the fixed test.
The specific naming of the per-test blacklist file, for tests run from the
upstream repo, is either "blacklist-ubuntu-ci" to completely blacklist the test
on all archs, or "blacklist-ubuntu-ci-$DPKGARCH" to blacklist the test only
for a specific arch, for example "blacklist-ubuntu-ci-amd64". For tests run
from Debian (or Ubuntu), which are run without the TEST_UPSTREAM param set,
the blacklist filename is 'blacklist-upstream-ci[-$DPKGARCH]'.
Note that the $DPKGARCH is specified as the value returned by
'dpkg --print-architecture', not the value returned from 'uname -m' (e.g.
to blacklist a test for intel 64-bit, 'amd64' should be used, not 'x86_64').
This naming matches the title of the ubuntu tests, such as 'bionic-amd64',
'bionic-arm64', etc.
commit 511d5d5452d29bd3af7c3b461a6ec5de9c08e48c
Author: Balint Reczey <balint.reczey@canonical.com>
Date: Mon Sep 9 17:46:38 2019 +0200
debian/extra/checkout-upstream: Use dots when deriving version from upstream
to sort higher than potential versions in Debian and also to conform native
package versioning practice.
commit 6bbc230b0b2838ad407ff34c8bf610240973e89b
Author: Balint Reczey <balint.reczey@canonical.com>
Date: Mon Sep 2 16:14:24 2019 +0200
d/e/checkout-upstream: Keep all autopkgtests when KEEP_DEBIAN_TESTS is set
commit f7ac1e2c615bf5ff2791b14e505312dc89cda10c
Author: Balint Reczey <balint.reczey@canonical.com>
Date: Tue Aug 13 15:03:00 2019 +0200
d/e/checkout-upstream: Add KEEP_DEBIAN_PATCHES option to keep patches
The Debian patches that apply cleanly are kept when KEEP_DEBIAN_PATCHES
is set to give a better picture of how the tested upstream version
would work packaged.
commit 2487c0ebc27c786b722c6e223e226f06280e2edf
Author: Balint Reczey <balint.reczey@canonical.com>
Date: Tue Aug 13 13:40:53 2019 +0200
debian/extra/checkout-upstream: rebase only PRs on upstream master
This fixes testing arbitrary upstream commits with UPSTREAM_HEAD=<commit-id>.
commit 551f1cc82a9eee94ec5c704f0a3962c389494027
Author: Balint Reczey <balint.reczey@canonical.com>
Date: Tue Aug 13 15:43:48 2019 +0200
d/e/checkout-upstream: UPSTREAM_REPO can override default systemd repo
commit 8797c07910b649e748d95e4ab4908688fc76215f
Author: Dan Streetman <ddstreet@canonical.com>
Date: Thu Aug 15 08:21:40 2019 -0400
d/extra/rules/73-special-net-names.rules: use $$ instead of $ in PROGRAM= value
The use of the '$' character in PROGRAM="" values is supposed to be doubled
if it is intended for use by the program being run, instead of as a
substitution variable for udev to replace before running the program; i.e.
it should be '$$' if udev should pass a single '$' in its place to the
program command line.
However, if the variable it precedes isn't a valid substitution variable
name, it is left in place for the program to evaluate. So, while not
correct per the 'man udev' documentation, this udev rule's use of single
'$' characters has (and still currently does) work correctly.
However, since commit d7aee41db35f808bca92d4910bf6e52cec3f8e59, un-doubled
use of '$' characters like this has resulted in a warning message being printed:
[ 17.560125] systemd-udevd[132]: /lib/udev/rules.d/73-special-net-names.rules:14 Invalid value "/bin/sh -ec 'D=${DEVPATH#*/vio/}; D=${D%%%%/*}; D=${D#????}; D=${D#0}; D=${D#0}; D=${D#0}; D=${D#0}; echo ${D:-0}'" for PROGRAM (char 16: invalid substitution type), ignoring, but please fix it.
This corrects the rule to use $$ instead.
Also, just to note, the rule already correctly doubles the '%' chars
that it uses.
