move various badtests to resets so they can be subsequently dropped

1 files changed, 129 insertions, 129 deletions

diff --git a/ubuntu-release b/ubuntu-release
index 8bab896b..447f5e59 100644
--- a/ubuntu-release
+++ b/ubuntu-release
@@ -6,191 +6,191 @@ force-badtest ruby-fakeweb/1.3.0+git20170806+dfsg1-1.1
 force-badtest gist/all/armhf gist/all/s390x
 
 # regressed in release
-force-badtest abi-monitor/1.12-2/armhf abi-monitor/1.12-2/i386
+force-reset-test abi-monitor/1.12-2/armhf abi-monitor/1.12-2/i386
 ## deliberate arch exclusion, not understood by dkms autodep8 test.
 force-badtest acpi-call/all/armhf acpi-call/all/ppc64el acpi-call/all/s390x
 ##
-force-badtest adequate/0.15.1ubuntu5
+force-reset-test adequate/0.15.1ubuntu5
 ##
-force-badtest apt-clone/0.4.1ubuntu2
+force-reset-test apt-clone/0.4.1ubuntu2
 ## python removal
-force-badtest apport/2.20.11-0ubuntu16
+force-reset-test apport/2.20.11-0ubuntu16
 ##
-force-badtest bacula/9.4.2-2ubuntu3
-force-badtest barbican/1:9.0.0-0ubuntu1/armhf
-force-badtest beanstalkd/1.11-1
-force-badtest bubblewrap/0.4.0-1ubuntu1/s390x
-force-badtest changeme/1.2.1-1
-force-badtest cinfony/1.2-4ubuntu2
-force-badtest courier-filter-perl/0.200+ds-4
+force-reset-test bacula/9.4.2-2ubuntu3
+force-reset-test barbican/1:9.0.0-0ubuntu1/armhf
+force-reset-test beanstalkd/1.11-1
+force-reset-test bubblewrap/0.4.0-1ubuntu1/s390x
+force-reset-test changeme/1.2.1-1
+force-reset-test cinfony/1.2-4ubuntu2
+force-reset-test courier-filter-perl/0.200+ds-4
 # regressed with move to kvm
-force-badtest coz-profiler/0.1.0-2ubuntu2
+force-reset-test coz-profiler/0.1.0-2ubuntu2
 ##
-force-badtest dbus-test-runner/15.04.0+19.04.20190115-0ubuntu1
+force-reset-test dbus-test-runner/15.04.0+19.04.20190115-0ubuntu1
 ## briefly passed but can never work on s390x; LP: #1837073
 force-badtest ddcci-driver-linux/all/s390x
 ##
-force-badtest debci/2.7
+force-reset-test debci/2.7
 ## fails to build on armhf: https://github.com/codahale/bcrypt-ruby/issues/201
-force-badtest diaspora-installer/0.7.6.1+debian1/ppc64el diaspora-installer/0.7.6.1+debian1/armhf
+force-reset-test diaspora-installer/0.7.6.1+debian1/ppc64el diaspora-installer/0.7.6.1+debian1/armhf
 ## depends on external website rails-assets.org which is down
-force-badtest diaspora-installer/0.7.6.1+debian1
+force-reset-test diaspora-installer/0.7.6.1+debian1
 ##
-force-badtest django-compat/1.0.15-2ubuntu1
-force-badtest dmarc-cat/0.12.0-1
+force-reset-test django-compat/1.0.15-2ubuntu1
+force-reset-test dmarc-cat/0.12.0-1
 ## was allowed to regress in Debian stable with the same problem, so don't block in Ubuntu indefinitely
-force-badtest dnssec-trigger/0.17+repack-3
+force-reset-test dnssec-trigger/0.17+repack-3
 ##
-force-badtest fdroidserver/1.1.1-1ubuntu1
+force-reset-test fdroidserver/1.1.1-1ubuntu1
 ## behaves the same as 0.5.0-1 under linux 4.15 and 5.0 with old and new fuse:
-force-badtest fuse-zip/0.6.0-0ubuntu1
+force-reset-test fuse-zip/0.6.0-0ubuntu1
 ##
-force-badtest ghub-plus-el/0.3-5/s390x
-force-badtest git-buildpackage/0.9.17 git-buildpackage/0.9.17ubuntu3
+force-reset-test ghub-plus-el/0.3-5/s390x
+force-reset-test git-buildpackage/0.9.17 git-buildpackage/0.9.17ubuntu3
 ## x32 tests now run and fail on i386 with amd64 kernels, whee:
-force-badtest glibc/2.30-0ubuntu3/i386
+force-reset-test glibc/2.30-0ubuntu3/i386
 ##
-force-badtest golang-github-shirou-gopsutil/2.18.06-1/amd64 golang-github-shirou-gopsutil/2.18.06-1/ppc64el
-force-badtest gvfs/1.42.2-1ubuntu3/amd64 gvfs/1.42.2-1ubuntu3/arm64
+force-reset-test golang-github-shirou-gopsutil/2.18.06-1/amd64 golang-github-shirou-gopsutil/2.18.06-1/ppc64el
+force-reset-test gvfs/1.42.2-1ubuntu3/amd64 gvfs/1.42.2-1ubuntu3/arm64
 ## the autopkgtests were not running the testsuite before but they do now
 ## that's not a regression, also looks like a ghostcript issue 
-force-badtest img2pdf/0.3.3-1ubuntu3.1/s390x
+force-reset-test img2pdf/0.3.3-1ubuntu3.1/s390x
 ##
-force-badtest juju-deployer/0.6.4-0ubuntu2
+force-reset-test juju-deployer/0.6.4-0ubuntu2
 ## LP: #1860269
-force-badtest kazoo/2.6.1-4ubuntu1
+force-reset-test kazoo/2.6.1-4ubuntu1
 ## chromium-browser failing to upgrade due to snap transaction
-force-badtest kopano-webapp/3.5.14+dfsg1.orig-1
+force-reset-test kopano-webapp/3.5.14+dfsg1.orig-1
 ##
-force-badtest libapp-stacktrace-perl/0.09-3ubuntu2/armhf
-force-badtest libfile-userconfig-perl/0.06-4/i386
-force-badtest libmonitoring-livestatus-perl/0.80-1
-force-badtest libterm-filter-perl/0.03-2/arm64 libterm-filter-perl/0.03-2/i386
-force-badtest libtest-valgrind-perl/1.19-1/ppc64el
-force-badtest libwww-mechanize-shell-perl/0.58-1
+force-reset-test libapp-stacktrace-perl/0.09-3ubuntu2/armhf
+force-reset-test libfile-userconfig-perl/0.06-4/i386
+force-reset-test libmonitoring-livestatus-perl/0.80-1
+force-reset-test libterm-filter-perl/0.03-2/arm64 libterm-filter-perl/0.03-2/i386
+force-reset-test libtest-valgrind-perl/1.19-1/ppc64el
+force-reset-test libwww-mechanize-shell-perl/0.58-1
 ## autopkgtests try to build ubuntu-server, which is not supported on i386
 ## in focal and not buildable now due to removals.  These need fixed to test
 ## the relevant thing (launchpad-buildd rootfs), and also the test deps
 ## would need to be cross-installable.
-force-badtest livecd-rootfs/2.640/i386
+force-reset-test livecd-rootfs/2.640/i386
 ##
-force-badtest mothur/1.42.1-1/i386
-force-badtest nanoc/4.11.0-3
-force-badtest node-buble/0.19.4-3build2
-force-badtest node-gulp-coffee/2.3.4-1/arm64
-force-badtest notary/0.6.1~ds1-4
-force-badtest ocfs2-tools/1.8.6-2ubuntu1
-force-badtest ostree/2019.6-1/ppc64el
-force-badtest packer/1.3.4+dfsg-4
-force-badtest panko/7.0.0-0ubuntu1
+force-reset-test mothur/1.42.1-1/i386
+force-reset-test nanoc/4.11.0-3
+force-reset-test node-buble/0.19.4-3build2
+force-reset-test node-gulp-coffee/2.3.4-1/arm64
+force-reset-test notary/0.6.1~ds1-4
+force-reset-test ocfs2-tools/1.8.6-2ubuntu1
+force-reset-test ostree/2019.6-1/ppc64el
+force-reset-test packer/1.3.4+dfsg-4
+force-reset-test panko/7.0.0-0ubuntu1
 ## autopkgtest depends on procenv not being ftbfs, procenv regressed due to toolchain changes
-force-badtest pbuilder/0.230.4
+force-reset-test pbuilder/0.230.4
 ## was allowed to regress in Debian testing, don't wait indefinitely
-force-badtest php-horde-crypt/2.7.12-2
+force-reset-test php-horde-crypt/2.7.12-2
 ##
-force-badtest php-horde-exception/2.0.8-2ubuntu1
-force-badtest php-horde-http/2.1.7-4
-force-badtest php-horde-serialize/2.0.5-3ubuntu1
-force-badtest php-horde-support/2.2.0-1ubuntu1
-force-badtest php-horde-util/2.5.8-1ubuntu1
-force-badtest php-horde-view/2.0.6-3ubuntu1
-force-badtest php-pimple/3.0.2-2ubuntu1
-force-badtest php-text-password/1.2.1-2
-force-badtest profnet/1.0.22-6
-force-badtest prometheus/2.7.1+ds-3
-force-badtest puppet-module-asciiduck-sssd/0.3.0-1
-force-badtest pyfai/0.18.0+dfsg1-3build1
-force-badtest python-adal/1.2.2-1
-force-badtest python-azure/20181112+git-3
+force-reset-test php-horde-exception/2.0.8-2ubuntu1
+force-reset-test php-horde-http/2.1.7-4
+force-reset-test php-horde-serialize/2.0.5-3ubuntu1
+force-reset-test php-horde-support/2.2.0-1ubuntu1
+force-reset-test php-horde-util/2.5.8-1ubuntu1
+force-reset-test php-horde-view/2.0.6-3ubuntu1
+force-reset-test php-pimple/3.0.2-2ubuntu1
+force-reset-test php-text-password/1.2.1-2
+force-reset-test profnet/1.0.22-6
+force-reset-test prometheus/2.7.1+ds-3
+force-reset-test puppet-module-asciiduck-sssd/0.3.0-1
+force-reset-test pyfai/0.18.0+dfsg1-3build1
+force-reset-test python-adal/1.2.2-1
+force-reset-test python-azure/20181112+git-3
 ## LP: #1860270
-force-badtest python-bleach/3.1.0-2
+force-reset-test python-bleach/3.1.0-2
 ##
-force-badtest python-boto/2.49.0-2.1
-force-badtest python-furl/2.1.0-1
-force-badtest python-msrestazure/0.6.2-1
-force-badtest python-persistent/4.4.3-0ubuntu1
-force-badtest python-pysam/0.15.2+ds-2build1
-force-badtest python-pyvcf/0.6.8+git20170215.476169c-2
-force-badtest radicale/2.1.11-7
-force-badtest r-bioc-annotationhub/2.18.0+dfsg-2
-force-badtest r-bioc-bitseq/1.30.0+dfsg-1
-force-badtest r-bioc-pcamethods/1.78.0-1
-force-badtest r-bioc-rhdf5/2.30.1+dfsg-1
-force-badtest r-bioc-tximport/1.14.0+dfsg-2
-force-badtest r-cran-assertive.base/0.0-7-1
-force-badtest r-cran-clubsandwich/0.4.0-1
-force-badtest r-cran-cowplot/1.0.0+dfsg-1
-force-badtest r-cran-data.table/1.12.8+dfsg-1
-force-badtest r-cran-dbplyr/1.4.2-1
-force-badtest r-cran-mice/3.7.0-1
-force-badtest r-cran-pdftools/2.3-1
-force-badtest r-cran-pkgbuild/1.0.6-1
-force-badtest r-cran-pls/2.7-2-1
-force-badtest r-cran-processx/3.4.1-2
-force-badtest r-cran-remotes/2.1.0-1
-force-badtest r-cran-rsconnect/0.8.16-1
-force-badtest r-cran-rsvd/1.0.2-1
-force-badtest r-cran-svglite/1.2.2-1
-force-badtest r-cran-usethis/1.5.1-1
-force-badtest rdkit/201909.1-2ubuntu1
-force-badtest rpmlint/1.9-6build1
-force-badtest ruby-encryptor/3.0.0-2
+force-reset-test python-boto/2.49.0-2.1
+force-reset-test python-furl/2.1.0-1
+force-reset-test python-msrestazure/0.6.2-1
+force-reset-test python-persistent/4.4.3-0ubuntu1
+force-reset-test python-pysam/0.15.2+ds-2build1
+force-reset-test python-pyvcf/0.6.8+git20170215.476169c-2
+force-reset-test radicale/2.1.11-7
+force-reset-test r-bioc-annotationhub/2.18.0+dfsg-2
+force-reset-test r-bioc-bitseq/1.30.0+dfsg-1
+force-reset-test r-bioc-pcamethods/1.78.0-1
+force-reset-test r-bioc-rhdf5/2.30.1+dfsg-1
+force-reset-test r-bioc-tximport/1.14.0+dfsg-2
+force-reset-test r-cran-assertive.base/0.0-7-1
+force-reset-test r-cran-clubsandwich/0.4.0-1
+force-reset-test r-cran-cowplot/1.0.0+dfsg-1
+force-reset-test r-cran-data.table/1.12.8+dfsg-1
+force-reset-test r-cran-dbplyr/1.4.2-1
+force-reset-test r-cran-mice/3.7.0-1
+force-reset-test r-cran-pdftools/2.3-1
+force-reset-test r-cran-pkgbuild/1.0.6-1
+force-reset-test r-cran-pls/2.7-2-1
+force-reset-test r-cran-processx/3.4.1-2
+force-reset-test r-cran-remotes/2.1.0-1
+force-reset-test r-cran-rsconnect/0.8.16-1
+force-reset-test r-cran-rsvd/1.0.2-1
+force-reset-test r-cran-svglite/1.2.2-1
+force-reset-test r-cran-usethis/1.5.1-1
+force-reset-test rdkit/201909.1-2ubuntu1
+force-reset-test rpmlint/1.9-6build1
+force-reset-test ruby-encryptor/3.0.0-2
 ## depends on chromium-browser which is now a snap, not working in autopkgtest lxd
-force-badtest ruby-jquery-atwho-rails/1.5.4+dfsg-1/armhf
+force-reset-test ruby-jquery-atwho-rails/1.5.4+dfsg-1/armhf
 ##
-force-badtest ruby-jquery-rails/4.3.3-1
+force-reset-test ruby-jquery-rails/4.3.3-1
 ## depends on chromium-browser which is now a snap, not working in autopkgtest lxd
-force-badtest ruby-leaflet-rails/1.3.1+dfsg-1/armhf
-force-badtest ruby-mousetrap-rails/1.4.6-6/armhf
-force-badtest ruby-rails-assets-autosize/4.0.2-5/armhf
-force-badtest ruby-rails-assets-emojione/2.2.6-2/armhf
-force-badtest ruby-rails-assets-favico.js/0.3.10+dfsg-1/armhf
-force-badtest ruby-rails-assets-jquery/3.3.1-1/armhf
-force-badtest ruby-rails-assets-markdown-it/8.4.2-2/armhf
-force-badtest ruby-rails-assets-underscore/1.8.3+dfsg-1/armhf
+force-reset-test ruby-leaflet-rails/1.3.1+dfsg-1/armhf
+force-reset-test ruby-mousetrap-rails/1.4.6-6/armhf
+force-reset-test ruby-rails-assets-autosize/4.0.2-5/armhf
+force-reset-test ruby-rails-assets-emojione/2.2.6-2/armhf
+force-reset-test ruby-rails-assets-favico.js/0.3.10+dfsg-1/armhf
+force-reset-test ruby-rails-assets-jquery/3.3.1-1/armhf
+force-reset-test ruby-rails-assets-markdown-it/8.4.2-2/armhf
+force-reset-test ruby-rails-assets-underscore/1.8.3+dfsg-1/armhf
 ##
-force-badtest ruby-rack/2.0.7-2
-force-badtest ruby-rails-assets-blueimp-gallery/2.33.0-1 
-force-badtest ruby-rails-assets-diaspora-jsxc/0.1.5+dfsg2~develop.7-3
-force-badtest ruby-rspec-puppet/2.6.1-1
-force-badtest rust-utf8-ranges/1.0.4-1
+force-reset-test ruby-rack/2.0.7-2
+force-reset-test ruby-rails-assets-blueimp-gallery/2.33.0-1 
+force-reset-test ruby-rails-assets-diaspora-jsxc/0.1.5+dfsg2~develop.7-3
+force-reset-test ruby-rspec-puppet/2.6.1-1
+force-reset-test rust-utf8-ranges/1.0.4-1
 ## autopkgtest depends on procenv not being ftbfs, procenv regressed due to toolchain changes
-force-badtest sbuild/0.78.1-2ubuntu1
+force-reset-test sbuild/0.78.1-2ubuntu1
 ##
-force-badtest spice/0.14.2-4ubuntu1/ppc64el
-force-badtest spyder-memory-profiler/0.1.2-1/s390x
-force-badtest stunnel4/3:5.56-1
-force-badtest svgpp/1.2.3+dfsg1-6/s390x
-force-badtest symfony/4.3.8+dfsg-1ubuntu1
+force-reset-test spice/0.14.2-4ubuntu1/ppc64el
+force-reset-test spyder-memory-profiler/0.1.2-1/s390x
+force-reset-test stunnel4/3:5.56-1
+force-reset-test svgpp/1.2.3+dfsg1-6/s390x
+force-reset-test symfony/4.3.8+dfsg-1ubuntu1
 ## https://twistedmatrix.com/trac/ticket/9495
-force-badtest twisted/18.9.0-6
+force-reset-test twisted/18.9.0-6
 ##
-force-badtest ubuntu-make/18.09+disco1
-force-badtest udisks2/2.8.4-1
-force-badtest unrar-free/1:0.0.1+cvs20140707-4/ppc64el
+force-reset-test ubuntu-make/18.09+disco1
+force-reset-test udisks2/2.8.4-1
+force-reset-test unrar-free/1:0.0.1+cvs20140707-4/ppc64el
 ## video pre-dependencies dropped from s390x kernel
 force-badtest v4l2loopback/all/s390x
 ##
-force-badtest vagrant-lxc/1.4.3-1/amd64
-force-badtest vuls/0.6.1-1
+force-reset-test vagrant-lxc/1.4.3-1/amd64
+force-reset-test vuls/0.6.1-1
 ## toolchain-triggered build regression
-force-badtest webcamoid/8.6.1+dfsg-2/ppc64el
+force-reset-test webcamoid/8.6.1+dfsg-2/ppc64el
 ##
-force-badtest wifite/2.5.0~git20191114-2
-force-badtest yorick/2.2.04+dfsg1-10
-force-badtest yt/3.5.1-3/amd64
+force-reset-test wifite/2.5.0~git20191114-2
+force-reset-test yorick/2.2.04+dfsg1-10
+force-reset-test yt/3.5.1-3/amd64
 
 # skip tests that fail now that s390x has full VMs
-force-badtest vagrant-lxc/1.4.3-1/s390x
-force-badtest python-docker/4.1.0-1/s390x
-force-badtest libdata-uuid-libuuid-perl/0.05-3build3/s390x
+force-reset-test vagrant-lxc/1.4.3-1/s390x
+force-reset-test python-docker/4.1.0-1/s390x
+force-reset-test libdata-uuid-libuuid-perl/0.05-3build3/s390x
 # Was skipped in lxc, never passed in a vm, questionable usefulness on s390x/ppc64el given it tests usb camera...
 force-badtest gvfs/all/s390x
 # doesn't fail every time, but is now very flaky
-force-badtest gvfs/1.42.2-1ubuntu3/ppc64el gvfs/1.42.2-1ubuntu3/i386
+force-reset-test gvfs/1.42.2-1ubuntu3/ppc64el gvfs/1.42.2-1ubuntu3/i386
 
 # flaky due to dependency on network resources
-force-badtest vagrant-mutate/1.2.0-4/armhf
+force-reset-test vagrant-mutate/1.2.0-4/armhf
 
 # Only "passed" because of an exit 0 on 32-bits, now fails to install test deps:
 force-badtest zfs-linux/all/i386 zfs-linux/all/armhf