Merge lp:~jelmer/byoci/drop-brz-config into lp:byoci

[Jelmer Vernooij]

Drop brz-specific container setup.

This configuration is already carried in lp:brz and lp:brz-debian

Unmerged revisions

221. By Jelmer Vernooij on 2020-05-29

Drop brz-specific container setup.

=== modified file 'containers/byov.conf'
--- containers/byov.conf	2018-09-15 17:18:11 +0000
+++ containers/byov.conf	2020-05-29 17:59:14 +0000
@@ -19,54 +19,3 @@
 # 'destination' is a path relative to '/home/ubuntu' inside the container.
 
 project.secrets =  # No secrets by default
-
-dulwich.clone = (git clone git://jelmer.uk/dulwich ../dulwich.git)
-dulwich.install = (cd ../dulwich.git && ./setup.py install --user)
-dulwich.install3 = (cd ../dulwich.git && python3 ./setup.py install --user)
-subunit.clone = (git clone https://github.com/testing-cabal/subunit.git ../subunit)
-
-[brz]
-# FIXME: python3-fastimport requires >= artful :-/ and we're stuck on xenial
-# because paramiko 2.0.0 is broken:
-# breezy.tests.test_transport.TestSSHConnections.test_bzr_connect_to_bzr_ssh
-# runs into a deprecation issue which is only fixed in 2.3.0 which is
-# available nowhere in ubuntu/debian /o\
-# https://github.com/paramiko/paramiko/issues/1030
-# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=882322 -- vila 2018-05-16
-
-# FIXME: Arguably this should be vm.build_deps=brz but it requires either an
-# available package or at least a debian/ dir ? -- vila 2018-02-23
-brz.build_deps = gcc, debhelper, python, python-all-dev, python3-all-dev, python-configobj, python3-configobj, python-docutils, python3-docutils, python-paramiko, python3-paramiko, python-subunit, python3-subunit, python-testtools, python3-testtools, subunit, cython, cython3, python-fastimport
-subunit.build_deps = python-testscenarios, python3-testscenarios, python-testtools, python3-testtools
-vm.packages = {brz.build_deps}, {subunit.build_deps}, bzr, python-junitxml
-[brz-xenial]
-vm.release = xenial
-byoci.setup.command = ({dulwich.clone} && {dulwich.install} && {dulwich.install3}  && {subunit.clone})
-# FIXME: bzr log -l2 should be by default -- vila 2018-03-09
-byoci.tests.command = bash -o pipefail -c "bzr log -l2 && PYTHONPATH=../subunit/python:$PYTHONPATH PATH=../subunit/filters:$PATH make check-ci | subunit2junitxml -o ../results.xml -f | subunit2pyunit"
-[brz-xenial-py3]
-byoci.tests.command = bash -o pipefail -c "bzr log -l2 && (PYTHONPATH=../subunit/python:$PYTHONPATH PATH=../subunit/filters:$PATH make extensions && BRZ_PLUGIN_PATH=-site:-user python3 -Werror -Wignore::FutureWarning  -Wignore::ImportWarning -Wignore::DeprecationWarning -O ./brz selftest --parallel=fork -Oselftest.timeout=120 --subunit2 | subunit2junitxml -o ../results.xml -f | subunit2pyunit)"
-[brz-bionic]
-vm.release = bionic
-[brz-cosmic]
-vm.release = cosmic
-lxd.image = ubuntu-daily:{vm.release}/{vm.architecture}
-[brz-buster]
-vm.distribution = debian
-vm.release = buster
-byoci.setup.command = ({subunit.clone})
-byoci.tests.command = bash -o pipefail -c "bzr log -l2 && (PYTHONPATH=../subunit/python:$PYTHONPATH PATH=../subunit/filters:$PATH make check-ci | subunit2junitxml -o ../results.xml -f | subunit2pyunit)"
-[brz-sid]
-vm.distribution = debian
-vm.release = sid
-
-[brz-plugin-debian]
-vm.release = xenial
-debian.build_deps = python-debian, python-apt, dpkg-dev, fakeroot, devscripts, patchutils, pristine-tar, quilt, python-lzma, libalgorithm-merge-perl
-# FIXME: Not sure it's really only for tests -- vila 2018-03-08
-debian.test_deps = python-distro-info
-vm.packages = {brz.build_deps}, {debian.build_deps}, {debian.test_deps}, bzr, python-debian, python-junitxml
-brz.branch = (bzr branch lp:brz ../brz-trunk)
-brz.make = (cd ../brz-trunk && make)
-byoci.setup.command = ({dulwich.clone} && {dulwich.install} && {brz.branch} && {brz.make})
-byoci.tests.command = bash -o pipefail -c "bzr log -l2 && (BRZ_PLUGINS_AT=debian@`pwd` BRZ_PLUGIN_PATH=-site:-user ../brz-trunk/brz selftest -v  --parallel=fork --subunit2 | subunit2junitxml -o ../results.xml -f | subunit2pyunit)"