launchpad-reviewers team mailing list archive
-
launchpad-reviewers team
-
Mailing list archive
-
Message #32857
[Merge] ~mwhudson/launchpad-buildd:separate-isa-abi-tags into launchpad-buildd:master
Michael Hudson-Doyle has proposed merging ~mwhudson/launchpad-buildd:separate-isa-abi-tags into launchpad-buildd:master.
Commit message:
Change in-target to take separate abi and isa tags
This change has absolutely no effect on what we build but requires
changing so many tests I want to get it landed rather than having to
keep maintaining so I can test my own hacks.
Requested reviews:
Launchpad code reviewers (launchpad-reviewers)
For more details, see:
https://code.launchpad.net/~mwhudson/launchpad-buildd/+git/launchpad-buildd/+merge/490630
--
Your team Launchpad code reviewers is requested to review the proposed merge of ~mwhudson/launchpad-buildd:separate-isa-abi-tags into launchpad-buildd:master.
diff --git a/lpbuildd/builder.py b/lpbuildd/builder.py
index 42e49bb..7ffa3be 100644
--- a/lpbuildd/builder.py
+++ b/lpbuildd/builder.py
@@ -165,9 +165,11 @@ class BuildManager:
escaped_args = " ".join(shell_escape(arg) for arg in text_args)
# Log timestamps in the following form: '[Sun Jun 20 23:21:05 1993]'.
- # The day field is two characters long and is space padded if the day is
+ # The day field is two characters long and is space padded if the day is
# a single digit, e.g.: 'Wed Jun 9 04:26:40 1993'.
- self._builder.log(f"[{datetime.now().replace(tzinfo=timezone.utc).ctime()}]\n")
+ self._builder.log(
+ f"[{datetime.now().replace(tzinfo=timezone.utc).ctime()}]\n"
+ )
self._builder.log(f"RUN: {command} {escaped_args}\n")
childfds = {
@@ -191,7 +193,8 @@ class BuildManager:
command,
"--backend=%s" % self.backend_name,
"--series=%s" % self.series,
- "--arch=%s" % self.arch_tag,
+ "--abi-tag=%s" % self.arch_tag,
+ "--isa-tag=%s" % self.arch_tag,
]
for constraint in self.constraints:
base_args.append("--constraint=%s" % constraint)
diff --git a/lpbuildd/target/build_livefs.py b/lpbuildd/target/build_livefs.py
index d3b592e..f0a788e 100644
--- a/lpbuildd/target/build_livefs.py
+++ b/lpbuildd/target/build_livefs.py
@@ -169,7 +169,7 @@ class BuildLiveFS(SnapStoreOperationMixin, Operation):
"--locale",
self.args.locale,
"--arch",
- self.args.arch,
+ self.args.abi_tag,
"--release",
self.args.series,
]
@@ -191,7 +191,7 @@ class BuildLiveFS(SnapStoreOperationMixin, Operation):
base_lb_env = OrderedDict()
base_lb_env["PROJECT"] = self.args.project
- base_lb_env["ARCH"] = self.args.arch
+ base_lb_env["ARCH"] = self.args.abi_tag
if self.args.subproject is not None:
base_lb_env["SUBPROJECT"] = self.args.subproject
if self.args.subarch is not None:
diff --git a/lpbuildd/target/operation.py b/lpbuildd/target/operation.py
index 1590271..1fd248c 100644
--- a/lpbuildd/target/operation.py
+++ b/lpbuildd/target/operation.py
@@ -23,7 +23,14 @@ class Operation:
"--series", metavar="SERIES", help="operate on series SERIES"
)
parser.add_argument(
- "--arch", metavar="ARCH", help="operate on architecture ARCH"
+ "--abi-tag",
+ metavar="ABI",
+ help="operate on Debian architecture ABI",
+ )
+ parser.add_argument(
+ "--isa-tag",
+ metavar="ISA",
+ help="(currently ununsed)",
)
parser.add_argument(
"--constraint",
@@ -42,7 +49,7 @@ class Operation:
self.args.backend,
self.args.build_id,
series=self.args.series,
- arch=self.args.arch,
+ arch=self.args.abi_tag,
constraints=self.args.constraints,
)
diff --git a/lpbuildd/target/tests/test_apt.py b/lpbuildd/target/tests/test_apt.py
index eb7ed9e..ffa1079 100644
--- a/lpbuildd/target/tests/test_apt.py
+++ b/lpbuildd/target/tests/test_apt.py
@@ -41,7 +41,8 @@ class TestOverrideSourcesList(TestCase):
"override-sources-list",
"--backend=fake",
"--series=xenial",
- "--arch=amd64",
+ "--abi-tag=amd64",
+ "--isa-tag=amd64",
"1",
"deb http://archive.ubuntu.com/ubuntu xenial main",
"deb http://ppa.launchpad.net/launchpad/ppa/ubuntu xenial main",
@@ -100,7 +101,8 @@ class TestOverrideSourcesList(TestCase):
"override-sources-list",
"--backend=fake",
"--series=oracular",
- "--arch=amd64",
+ "--abi-tag=amd64",
+ "--isa-tag=amd64",
"1",
"deb [trusted=yes] http://archive.ubuntu.com/ubuntu oracular main",
"deb [ arch=amd64,armel lang=en_US,en_CA ] http://ppa.launchpad.net/launchpad/ppa/ubuntu oracular main", # noqa: E501
@@ -156,7 +158,8 @@ class TestOverrideSourcesList(TestCase):
"override-sources-list",
"--backend=fake",
"--series=oracular",
- "--arch=amd64",
+ "--abi-tag=amd64",
+ "--isa-tag=amd64",
"1",
"bad-source.com",
"deb [reject=yes] http://archive.ubuntu.com/ubuntu oracular main",
@@ -177,7 +180,8 @@ class TestOverrideSourcesList(TestCase):
"override-sources-list",
"--backend=fake",
"--series=xenial",
- "--arch=amd64",
+ "--abi-tag=amd64",
+ "--isa-tag=amd64",
"1",
"--apt-proxy-url",
"http://apt-proxy.example:3128/";,
@@ -274,7 +278,8 @@ class TestAddTrustedKeys(TestCase):
"add-trusted-keys",
"--backend=fake",
"--series=xenial",
- "--arch=amd64",
+ "--abi-tag=amd64",
+ "--isa-tag=amd64",
"1",
]
add_trusted_keys = parse_args(args=args).operation
@@ -345,7 +350,8 @@ class TestUpdate(TestCase):
"update-debian-chroot",
"--backend=fake",
"--series=xenial",
- "--arch=amd64",
+ "--abi-tag=amd64",
+ "--isa-tag=amd64",
"1",
]
update = parse_args(args=args).operation
@@ -378,7 +384,8 @@ class TestUpdate(TestCase):
"update-debian-chroot",
"--backend=fake",
"--series=xenial",
- "--arch=amd64",
+ "--abi-tag=amd64",
+ "--isa-tag=amd64",
"1",
]
update = parse_args(args=args).operation
diff --git a/lpbuildd/target/tests/test_build_charm.py b/lpbuildd/target/tests/test_build_charm.py
index 42e3154..c9f11c3 100644
--- a/lpbuildd/target/tests/test_build_charm.py
+++ b/lpbuildd/target/tests/test_build_charm.py
@@ -34,7 +34,8 @@ class TestBuildCharm(TestCase):
"build-charm",
"--backend=fake",
"--series=xenial",
- "--arch=amd64",
+ "--abi-tag=amd64",
+ "--isa-tag=amd64",
"1",
"--branch",
"lp:foo",
@@ -58,7 +59,8 @@ class TestBuildCharm(TestCase):
"build-charm",
"--backend=fake",
"--series=xenial",
- "--arch=amd64",
+ "--abi-tag=amd64",
+ "--isa-tag=amd64",
"1",
"--branch",
"lp:foo",
@@ -86,7 +88,8 @@ class TestBuildCharm(TestCase):
"build-charm",
"--backend=fake",
"--series=xenial",
- "--arch=amd64",
+ "--abi-tag=amd64",
+ "--isa-tag=amd64",
"1",
"--channel=core=candidate",
"--channel=core18=beta",
@@ -119,7 +122,8 @@ class TestBuildCharm(TestCase):
"build-charm",
"--backend=fake",
"--series=xenial",
- "--arch=amd64",
+ "--abi-tag=amd64",
+ "--isa-tag=amd64",
"1",
"--branch",
"lp:foo",
@@ -145,7 +149,8 @@ class TestBuildCharm(TestCase):
"build-charm",
"--backend=fake",
"--series=xenial",
- "--arch=amd64",
+ "--abi-tag=amd64",
+ "--isa-tag=amd64",
"1",
"--git-repository",
"lp:foo",
@@ -190,7 +195,8 @@ class TestBuildCharm(TestCase):
"build-charm",
"--backend=fake",
"--series=xenial",
- "--arch=amd64",
+ "--abi-tag=amd64",
+ "--isa-tag=amd64",
"1",
"--git-repository",
"lp:foo",
@@ -225,7 +231,8 @@ class TestBuildCharm(TestCase):
"build-charm",
"--backend=fake",
"--series=xenial",
- "--arch=amd64",
+ "--abi-tag=amd64",
+ "--isa-tag=amd64",
"1",
"--git-repository",
"lp:foo",
@@ -270,7 +277,8 @@ class TestBuildCharm(TestCase):
"build-charm",
"--backend=fake",
"--series=xenial",
- "--arch=amd64",
+ "--abi-tag=amd64",
+ "--isa-tag=amd64",
"1",
"--git-repository",
"lp:foo",
@@ -335,7 +343,9 @@ class TestBuildCharm(TestCase):
)
self.assertEqual(
(b"proxy script\n", stat.S_IFREG | 0o755),
- build_charm.backend.backend_fs["/usr/local/bin/lpbuildd-git-proxy"],
+ build_charm.backend.backend_fs[
+ "/usr/local/bin/lpbuildd-git-proxy"
+ ],
)
self.assertEqual(
(
@@ -365,7 +375,8 @@ class TestBuildCharm(TestCase):
"build-charm",
"--backend=fake",
"--series=xenial",
- "--arch=amd64",
+ "--abi-tag=amd64",
+ "--isa-tag=amd64",
"1",
"--git-repository",
"lp:foo",
@@ -430,7 +441,9 @@ class TestBuildCharm(TestCase):
)
self.assertEqual(
(b"proxy script\n", stat.S_IFREG | 0o755),
- build_charm.backend.backend_fs["/usr/local/bin/lpbuildd-git-proxy"],
+ build_charm.backend.backend_fs[
+ "/usr/local/bin/lpbuildd-git-proxy"
+ ],
)
self.assertEqual(
(
@@ -451,7 +464,8 @@ class TestBuildCharm(TestCase):
"build-charm",
"--backend=fake",
"--series=xenial",
- "--arch=amd64",
+ "--abi-tag=amd64",
+ "--isa-tag=amd64",
"1",
"--git-repository",
"lp:foo",
@@ -495,7 +509,8 @@ class TestBuildCharm(TestCase):
"build-charm",
"--backend=fake",
"--series=focal",
- "--arch=amd64",
+ "--abi-tag=amd64",
+ "--isa-tag=amd64",
"1",
"--git-repository",
"lp:foo",
@@ -531,7 +546,8 @@ class TestBuildCharm(TestCase):
"build-charm",
"--backend=fake",
"--series=xenial",
- "--arch=amd64",
+ "--abi-tag=amd64",
+ "--isa-tag=amd64",
"1",
"--branch",
"lp:foo",
@@ -567,7 +583,8 @@ class TestBuildCharm(TestCase):
"build-charm",
"--backend=fake",
"--series=xenial",
- "--arch=amd64",
+ "--abi-tag=amd64",
+ "--isa-tag=amd64",
"1",
"--git-repository",
"lp:foo",
@@ -617,7 +634,8 @@ class TestBuildCharm(TestCase):
"build-charm",
"--backend=fake",
"--series=xenial",
- "--arch=amd64",
+ "--abi-tag=amd64",
+ "--isa-tag=amd64",
"1",
"--git-repository",
"lp:foo",
@@ -669,7 +687,8 @@ class TestBuildCharm(TestCase):
"build-charm",
"--backend=fake",
"--series=xenial",
- "--arch=amd64",
+ "--abi-tag=amd64",
+ "--isa-tag=amd64",
"1",
"--git-repository",
"lp:foo",
@@ -721,7 +740,8 @@ class TestBuildCharm(TestCase):
"build-charm",
"--backend=fake",
"--series=xenial",
- "--arch=amd64",
+ "--abi-tag=amd64",
+ "--isa-tag=amd64",
"1",
"--git-repository",
"lp:foo",
@@ -784,7 +804,8 @@ class TestBuildCharm(TestCase):
"build-charm",
"--backend=fake",
"--series=xenial",
- "--arch=amd64",
+ "--abi-tag=amd64",
+ "--isa-tag=amd64",
"1",
"--git-repository",
"lp:foo",
@@ -866,7 +887,8 @@ class TestBuildCharm(TestCase):
"build-charm",
"--backend=fake",
"--series=xenial",
- "--arch=amd64",
+ "--abi-tag=amd64",
+ "--isa-tag=amd64",
"1",
"--branch",
"lp:foo",
@@ -892,7 +914,8 @@ class TestBuildCharm(TestCase):
"build-charm",
"--backend=fake",
"--series=xenial",
- "--arch=amd64",
+ "--abi-tag=amd64",
+ "--isa-tag=amd64",
"1",
"--branch",
"lp:foo",
@@ -920,7 +943,8 @@ class TestBuildCharm(TestCase):
"build-charm",
"--backend=fake",
"--series=xenial",
- "--arch=amd64",
+ "--abi-tag=amd64",
+ "--isa-tag=amd64",
"1",
"--branch",
"lp:foo",
@@ -956,7 +980,8 @@ class TestBuildCharm(TestCase):
"build-charm",
"--backend=fake",
"--series=xenial",
- "--arch=amd64",
+ "--abi-tag=amd64",
+ "--isa-tag=amd64",
"1",
"--branch",
"lp:foo",
@@ -985,7 +1010,8 @@ class TestBuildCharm(TestCase):
"build-charm",
"--backend=fake",
"--series=xenial",
- "--arch=amd64",
+ "--abi-tag=amd64",
+ "--isa-tag=amd64",
"1",
"--branch",
"lp:foo",
@@ -1026,13 +1052,14 @@ class TestBuildCharm(TestCase):
]
),
)
-
+
def test_run_succeeds(self):
args = [
"build-charm",
"--backend=fake",
"--series=xenial",
- "--arch=amd64",
+ "--abi-tag=amd64",
+ "--isa-tag=amd64",
"1",
"--branch",
"lp:foo",
@@ -1077,7 +1104,8 @@ class TestBuildCharm(TestCase):
"build-charm",
"--backend=fake",
"--series=xenial",
- "--arch=amd64",
+ "--abi-tag=amd64",
+ "--isa-tag=amd64",
"1",
"--branch",
"lp:foo",
@@ -1099,7 +1127,8 @@ class TestBuildCharm(TestCase):
"build-charm",
"--backend=fake",
"--series=xenial",
- "--arch=amd64",
+ "--abi-tag=amd64",
+ "--isa-tag=amd64",
"1",
"--branch",
"lp:foo",
@@ -1121,7 +1150,8 @@ class TestBuildCharm(TestCase):
"build-charm",
"--backend=fake",
"--series=xenial",
- "--arch=amd64",
+ "--abi-tag=amd64",
+ "--isa-tag=amd64",
"1",
"--branch",
"lp:foo",
@@ -1137,7 +1167,8 @@ class TestBuildCharm(TestCase):
"build-charm",
"--backend=fake",
"--series=xenial",
- "--arch=amd64",
+ "--abi-tag=amd64",
+ "--isa-tag=amd64",
"1",
"--branch",
"lp:foo",
@@ -1154,7 +1185,8 @@ class TestBuildCharm(TestCase):
"build-charm",
"--backend=fake",
"--series=xenial",
- "--arch=amd64",
+ "--abi-tag=amd64",
+ "--isa-tag=amd64",
"1",
"--branch",
"lp:foo",
@@ -1171,7 +1203,8 @@ class TestBuildCharm(TestCase):
"build-charm",
"--backend=fake",
"--series=xenial",
- "--arch=amd64",
+ "--abi-tag=amd64",
+ "--isa-tag=amd64",
"1",
"--branch",
"lp:foo",
diff --git a/lpbuildd/target/tests/test_build_craft.py b/lpbuildd/target/tests/test_build_craft.py
index 98f2623..256cd66 100644
--- a/lpbuildd/target/tests/test_build_craft.py
+++ b/lpbuildd/target/tests/test_build_craft.py
@@ -31,7 +31,8 @@ class TestBuildCraft(TestCase):
"build-craft",
"--backend=fake",
"--series=xenial",
- "--arch=amd64",
+ "--abi-tag=amd64",
+ "--isa-tag=amd64",
"1",
"--branch",
"lp:foo",
@@ -55,7 +56,8 @@ class TestBuildCraft(TestCase):
"build-craft",
"--backend=fake",
"--series=xenial",
- "--arch=amd64",
+ "--abi-tag=amd64",
+ "--isa-tag=amd64",
"1",
"--branch",
"lp:foo",
@@ -83,7 +85,8 @@ class TestBuildCraft(TestCase):
"build-craft",
"--backend=fake",
"--series=xenial",
- "--arch=amd64",
+ "--abi-tag=amd64",
+ "--isa-tag=amd64",
"1",
"--channel=core=candidate",
"--channel=core18=beta",
@@ -114,7 +117,8 @@ class TestBuildCraft(TestCase):
"build-craft",
"--backend=fake",
"--series=xenial",
- "--arch=amd64",
+ "--abi-tag=amd64",
+ "--isa-tag=amd64",
"1",
"--branch",
"lp:foo",
@@ -143,7 +147,8 @@ class TestBuildCraft(TestCase):
"build-craft",
"--backend=fake",
"--series=xenial",
- "--arch=amd64",
+ "--abi-tag=amd64",
+ "--isa-tag=amd64",
"1",
"--git-repository",
"lp:foo",
@@ -191,7 +196,8 @@ class TestBuildCraft(TestCase):
"build-craft",
"--backend=fake",
"--series=xenial",
- "--arch=amd64",
+ "--abi-tag=amd64",
+ "--isa-tag=amd64",
"1",
"--git-repository",
"lp:foo",
@@ -229,7 +235,8 @@ class TestBuildCraft(TestCase):
"build-craft",
"--backend=fake",
"--series=xenial",
- "--arch=amd64",
+ "--abi-tag=amd64",
+ "--isa-tag=amd64",
"1",
"--git-repository",
"lp:foo",
@@ -277,7 +284,8 @@ class TestBuildCraft(TestCase):
"build-craft",
"--backend=fake",
"--series=xenial",
- "--arch=amd64",
+ "--abi-tag=amd64",
+ "--isa-tag=amd64",
"1",
"--git-repository",
"lp:foo",
@@ -377,7 +385,8 @@ class TestBuildCraft(TestCase):
"build-craft",
"--backend=fake",
"--series=xenial",
- "--arch=amd64",
+ "--abi-tag=amd64",
+ "--isa-tag=amd64",
"1",
"--git-repository",
"lp:foo",
@@ -468,7 +477,8 @@ class TestBuildCraft(TestCase):
"build-craft",
"--backend=fake",
"--series=xenial",
- "--arch=amd64",
+ "--abi-tag=amd64",
+ "--isa-tag=amd64",
"1",
"--git-repository",
"lp:foo",
@@ -512,7 +522,8 @@ class TestBuildCraft(TestCase):
"build-craft",
"--backend=fake",
"--series=focal",
- "--arch=amd64",
+ "--abi-tag=amd64",
+ "--isa-tag=amd64",
"1",
"--git-repository",
"lp:foo",
@@ -548,7 +559,8 @@ class TestBuildCraft(TestCase):
"build-craft",
"--backend=fake",
"--series=xenial",
- "--arch=amd64",
+ "--abi-tag=amd64",
+ "--isa-tag=amd64",
"1",
"--branch",
"lp:foo",
@@ -584,7 +596,8 @@ class TestBuildCraft(TestCase):
"build-craft",
"--backend=fake",
"--series=xenial",
- "--arch=amd64",
+ "--abi-tag=amd64",
+ "--isa-tag=amd64",
"1",
"--git-repository",
"lp:foo",
@@ -634,7 +647,8 @@ class TestBuildCraft(TestCase):
"build-craft",
"--backend=fake",
"--series=xenial",
- "--arch=amd64",
+ "--abi-tag=amd64",
+ "--isa-tag=amd64",
"1",
"--git-repository",
"lp:foo",
@@ -686,7 +700,8 @@ class TestBuildCraft(TestCase):
"build-craft",
"--backend=fake",
"--series=xenial",
- "--arch=amd64",
+ "--abi-tag=amd64",
+ "--isa-tag=amd64",
"1",
"--git-repository",
"lp:foo",
@@ -738,7 +753,8 @@ class TestBuildCraft(TestCase):
"build-craft",
"--backend=fake",
"--series=xenial",
- "--arch=amd64",
+ "--abi-tag=amd64",
+ "--isa-tag=amd64",
"1",
"--git-repository",
"lp:foo",
@@ -801,7 +817,8 @@ class TestBuildCraft(TestCase):
"build-craft",
"--backend=fake",
"--series=xenial",
- "--arch=amd64",
+ "--abi-tag=amd64",
+ "--isa-tag=amd64",
"1",
"--git-repository",
"lp:foo",
@@ -883,7 +900,8 @@ class TestBuildCraft(TestCase):
"build-craft",
"--backend=fake",
"--series=xenial",
- "--arch=amd64",
+ "--abi-tag=amd64",
+ "--isa-tag=amd64",
"1",
"--branch",
"lp:foo",
@@ -909,7 +927,8 @@ class TestBuildCraft(TestCase):
"build-craft",
"--backend=fake",
"--series=xenial",
- "--arch=amd64",
+ "--abi-tag=amd64",
+ "--isa-tag=amd64",
"1",
"--branch",
"lp:foo",
@@ -939,7 +958,8 @@ class TestBuildCraft(TestCase):
"build-craft",
"--backend=fake",
"--series=xenial",
- "--arch=amd64",
+ "--abi-tag=amd64",
+ "--isa-tag=amd64",
"1",
"--branch",
"lp:foo",
@@ -967,7 +987,8 @@ class TestBuildCraft(TestCase):
"build-craft",
"--backend=fake",
"--series=xenial",
- "--arch=amd64",
+ "--abi-tag=amd64",
+ "--isa-tag=amd64",
"1",
"--branch",
"lp:foo",
@@ -1003,7 +1024,8 @@ class TestBuildCraft(TestCase):
"build-craft",
"--backend=fake",
"--series=xenial",
- "--arch=amd64",
+ "--abi-tag=amd64",
+ "--isa-tag=amd64",
"1",
"--branch",
"lp:foo",
@@ -1050,7 +1072,8 @@ class TestBuildCraft(TestCase):
"build-craft",
"--backend=fake",
"--series=xenial",
- "--arch=amd64",
+ "--abi-tag=amd64",
+ "--isa-tag=amd64",
"1",
"--branch",
"lp:foo",
@@ -1093,7 +1116,8 @@ class TestBuildCraft(TestCase):
"build-craft",
"--backend=fake",
"--series=xenial",
- "--arch=amd64",
+ "--abi-tag=amd64",
+ "--isa-tag=amd64",
"1",
"--branch",
"lp:foo",
@@ -1115,7 +1139,8 @@ class TestBuildCraft(TestCase):
"build-craft",
"--backend=fake",
"--series=xenial",
- "--arch=amd64",
+ "--abi-tag=amd64",
+ "--isa-tag=amd64",
"1",
"--branch",
"lp:foo",
@@ -1137,7 +1162,8 @@ class TestBuildCraft(TestCase):
"build-craft",
"--backend=fake",
"--series=xenial",
- "--arch=amd64",
+ "--abi-tag=amd64",
+ "--isa-tag=amd64",
"1",
"--branch",
"lp:foo",
@@ -1153,7 +1179,8 @@ class TestBuildCraft(TestCase):
"build-craft",
"--backend=fake",
"--series=xenial",
- "--arch=amd64",
+ "--abi-tag=amd64",
+ "--isa-tag=amd64",
"1",
"--branch",
"lp:foo",
@@ -1170,7 +1197,8 @@ class TestBuildCraft(TestCase):
"build-craft",
"--backend=fake",
"--series=xenial",
- "--arch=amd64",
+ "--abi-tag=amd64",
+ "--isa-tag=amd64",
"1",
"--branch",
"lp:foo",
@@ -1187,7 +1215,8 @@ class TestBuildCraft(TestCase):
"build-craft",
"--backend=fake",
"--series=xenial",
- "--arch=amd64",
+ "--abi-tag=amd64",
+ "--isa-tag=amd64",
"1",
"--branch",
"lp:foo",
@@ -1207,7 +1236,8 @@ class TestBuildCraft(TestCase):
"build-craft",
"--backend=fake",
"--series=xenial",
- "--arch=amd64",
+ "--abi-tag=amd64",
+ "--isa-tag=amd64",
"1",
"--branch",
"lp:foo",
@@ -1249,7 +1279,8 @@ class TestBuildCraft(TestCase):
"build-craft",
"--backend=fake",
"--series=xenial",
- "--arch=amd64",
+ "--abi-tag=amd64",
+ "--isa-tag=amd64",
"1",
"--branch",
"lp:foo",
@@ -1291,7 +1322,8 @@ class TestBuildCraft(TestCase):
"build-craft",
"--backend=fake",
"--series=xenial",
- "--arch=amd64",
+ "--abi-tag=amd64",
+ "--isa-tag=amd64",
"1",
"--branch",
"lp:foo",
@@ -1374,7 +1406,8 @@ class TestBuildCraft(TestCase):
"build-craft",
"--backend=fake",
"--series=xenial",
- "--arch=amd64",
+ "--abi-tag=amd64",
+ "--isa-tag=amd64",
"1",
"--branch",
"lp:foo",
diff --git a/lpbuildd/target/tests/test_build_livefs.py b/lpbuildd/target/tests/test_build_livefs.py
index ca173c1..0c5f21c 100644
--- a/lpbuildd/target/tests/test_build_livefs.py
+++ b/lpbuildd/target/tests/test_build_livefs.py
@@ -29,7 +29,8 @@ class TestBuildLiveFS(TestCase):
"buildlivefs",
"--backend=fake",
"--series=xenial",
- "--arch=amd64",
+ "--abi-tag=amd64",
+ "--isa-tag=amd64",
"1",
]
build_livefs = parse_args(args=args).operation
@@ -49,7 +50,8 @@ class TestBuildLiveFS(TestCase):
"buildlivefs",
"--backend=fake",
"--series=xenial",
- "--arch=amd64",
+ "--abi-tag=amd64",
+ "--isa-tag=amd64",
"1",
"--locale=zh_CN",
]
@@ -94,7 +96,8 @@ class TestBuildLiveFS(TestCase):
"buildlivefs",
"--backend=fake",
"--series=xenial",
- "--arch=amd64",
+ "--abi-tag=amd64",
+ "--isa-tag=amd64",
"1",
"--snap-store-proxy-url",
"http://snap-store-proxy.example/";,
@@ -123,7 +126,8 @@ class TestBuildLiveFS(TestCase):
"buildlivefs",
"--backend=fake",
"--series=xenial",
- "--arch=amd64",
+ "--abi-tag=amd64",
+ "--isa-tag=amd64",
"1",
"--project=ubuntu",
]
@@ -178,7 +182,8 @@ class TestBuildLiveFS(TestCase):
"buildlivefs",
"--backend=fake",
"--series=xenial",
- "--arch=amd64",
+ "--abi-tag=amd64",
+ "--isa-tag=amd64",
"1",
"--project=ubuntu",
"--snapshot-service-timestamp",
@@ -239,7 +244,8 @@ class TestBuildLiveFS(TestCase):
"buildlivefs",
"--backend=fake",
"--series=xenial",
- "--arch=amd64",
+ "--abi-tag=amd64",
+ "--isa-tag=amd64",
"1",
"--locale=zh_CN",
]
@@ -269,7 +275,8 @@ class TestBuildLiveFS(TestCase):
"buildlivefs",
"--backend=fake",
"--series=xenial",
- "--arch=amd64",
+ "--abi-tag=amd64",
+ "--isa-tag=amd64",
"1",
"--project=ubuntu-core",
"--extra-ppa=owner1/name1",
@@ -330,7 +337,8 @@ class TestBuildLiveFS(TestCase):
"buildlivefs",
"--backend=fake",
"--series=xenial",
- "--arch=amd64",
+ "--abi-tag=amd64",
+ "--isa-tag=amd64",
"1",
"--project=ubuntu",
"--debug",
@@ -398,7 +406,8 @@ class TestBuildLiveFS(TestCase):
"buildlivefs",
"--backend=fake",
"--series=xenial",
- "--arch=amd64",
+ "--abi-tag=amd64",
+ "--isa-tag=amd64",
"1",
"--project=ubuntu-cpc",
f"--http-proxy={proxy}",
@@ -449,7 +458,8 @@ class TestBuildLiveFS(TestCase):
"buildlivefs",
"--backend=fake",
"--series=xenial",
- "--arch=amd64",
+ "--abi-tag=amd64",
+ "--isa-tag=amd64",
"1",
"--project=ubuntu",
]
@@ -479,7 +489,8 @@ class TestBuildLiveFS(TestCase):
"buildlivefs",
"--backend=fake",
"--series=xenial",
- "--arch=amd64",
+ "--abi-tag=amd64",
+ "--isa-tag=amd64",
"1",
"--project=ubuntu",
]
@@ -499,7 +510,8 @@ class TestBuildLiveFS(TestCase):
"buildlivefs",
"--backend=fake",
"--series=xenial",
- "--arch=amd64",
+ "--abi-tag=amd64",
+ "--isa-tag=amd64",
"1",
"--project=ubuntu",
]
@@ -522,7 +534,8 @@ class TestBuildLiveFS(TestCase):
"buildlivefs",
"--backend=fake",
"--series=xenial",
- "--arch=amd64",
+ "--abi-tag=amd64",
+ "--isa-tag=amd64",
"1",
"--project=ubuntu",
]
diff --git a/lpbuildd/target/tests/test_build_oci.py b/lpbuildd/target/tests/test_build_oci.py
index 4ea5132..1b47c2d 100644
--- a/lpbuildd/target/tests/test_build_oci.py
+++ b/lpbuildd/target/tests/test_build_oci.py
@@ -32,7 +32,8 @@ class TestBuildOCI(TestCase):
"build-oci",
"--backend=fake",
"--series=xenial",
- "--arch=amd64",
+ "--abi-tag=amd64",
+ "--isa-tag=amd64",
"1",
"--branch",
"lp:foo",
@@ -56,7 +57,8 @@ class TestBuildOCI(TestCase):
"build-oci",
"--backend=fake",
"--series=xenial",
- "--arch=amd64",
+ "--abi-tag=amd64",
+ "--isa-tag=amd64",
"1",
"--branch",
"lp:foo",
@@ -84,7 +86,8 @@ class TestBuildOCI(TestCase):
"build-oci",
"--backend=fake",
"--series=xenial",
- "--arch=amd64",
+ "--abi-tag=amd64",
+ "--isa-tag=amd64",
"1",
"--branch",
"lp:foo",
@@ -114,7 +117,8 @@ class TestBuildOCI(TestCase):
"build-oci",
"--backend=fake",
"--series=xenial",
- "--arch=amd64",
+ "--abi-tag=amd64",
+ "--isa-tag=amd64",
"1",
"--git-repository",
"lp:foo",
@@ -163,7 +167,8 @@ class TestBuildOCI(TestCase):
"buildsnap",
"--backend=fake",
"--series=xenial",
- "--arch=amd64",
+ "--abi-tag=amd64",
+ "--isa-tag=amd64",
"1",
"--git-repository",
"lp:foo",
@@ -194,7 +199,8 @@ class TestBuildOCI(TestCase):
"build-oci",
"--backend=fake",
"--series=xenial",
- "--arch=amd64",
+ "--abi-tag=amd64",
+ "--isa-tag=amd64",
"1",
"--git-repository",
"lp:foo",
@@ -239,7 +245,8 @@ class TestBuildOCI(TestCase):
"build-oci",
"--backend=fake",
"--series=xenial",
- "--arch=amd64",
+ "--abi-tag=amd64",
+ "--isa-tag=amd64",
"1",
"--branch",
"lp:foo",
@@ -266,7 +273,8 @@ class TestBuildOCI(TestCase):
"build-oci",
"--backend=fake",
"--series=xenial",
- "--arch=amd64",
+ "--abi-tag=amd64",
+ "--isa-tag=amd64",
"1",
"--git-repository",
"lp:foo",
@@ -318,7 +326,8 @@ class TestBuildOCI(TestCase):
"build-oci",
"--backend=fake",
"--series=xenial",
- "--arch=amd64",
+ "--abi-tag=amd64",
+ "--isa-tag=amd64",
"1",
"--git-repository",
"lp:foo",
@@ -372,7 +381,8 @@ class TestBuildOCI(TestCase):
"build-oci",
"--backend=fake",
"--series=xenial",
- "--arch=amd64",
+ "--abi-tag=amd64",
+ "--isa-tag=amd64",
"1",
"--git-repository",
"lp:foo",
@@ -426,7 +436,8 @@ class TestBuildOCI(TestCase):
"build-oci",
"--backend=fake",
"--series=xenial",
- "--arch=amd64",
+ "--abi-tag=amd64",
+ "--isa-tag=amd64",
"1",
"--git-repository",
"lp:foo",
@@ -491,7 +502,8 @@ class TestBuildOCI(TestCase):
"build-oci",
"--backend=fake",
"--series=xenial",
- "--arch=amd64",
+ "--abi-tag=amd64",
+ "--isa-tag=amd64",
"1",
"--branch",
"lp:foo",
@@ -524,7 +536,8 @@ class TestBuildOCI(TestCase):
"build-oci",
"--backend=fake",
"--series=xenial",
- "--arch=amd64",
+ "--abi-tag=amd64",
+ "--isa-tag=amd64",
"1",
"--branch",
"lp:foo",
@@ -561,7 +574,8 @@ class TestBuildOCI(TestCase):
"build-oci",
"--backend=fake",
"--series=xenial",
- "--arch=amd64",
+ "--abi-tag=amd64",
+ "--isa-tag=amd64",
"1",
"--branch",
"lp:foo",
@@ -596,7 +610,8 @@ class TestBuildOCI(TestCase):
"build-oci",
"--backend=fake",
"--series=xenial",
- "--arch=amd64",
+ "--abi-tag=amd64",
+ "--isa-tag=amd64",
"1",
"--branch",
"lp:foo",
@@ -635,7 +650,8 @@ class TestBuildOCI(TestCase):
"build-oci",
"--backend=fake",
"--series=xenial",
- "--arch=amd64",
+ "--abi-tag=amd64",
+ "--isa-tag=amd64",
"1",
"--branch",
"lp:foo",
@@ -678,7 +694,8 @@ class TestBuildOCI(TestCase):
"build-oci",
"--backend=fake",
"--series=xenial",
- "--arch=amd64",
+ "--abi-tag=amd64",
+ "--isa-tag=amd64",
"1",
"--branch",
"lp:foo",
@@ -721,7 +738,8 @@ class TestBuildOCI(TestCase):
"build-oci",
"--backend=fake",
"--series=xenial",
- "--arch=amd64",
+ "--abi-tag=amd64",
+ "--isa-tag=amd64",
"1",
"--branch",
"lp:foo",
@@ -775,7 +793,8 @@ class TestBuildOCI(TestCase):
"build-oci",
"--backend=fake",
"--series=xenial",
- "--arch=amd64",
+ "--abi-tag=amd64",
+ "--isa-tag=amd64",
"1",
"--branch",
"lp:foo",
@@ -797,7 +816,8 @@ class TestBuildOCI(TestCase):
"build-oci",
"--backend=fake",
"--series=xenial",
- "--arch=amd64",
+ "--abi-tag=amd64",
+ "--isa-tag=amd64",
"1",
"--branch",
"lp:foo",
@@ -819,7 +839,8 @@ class TestBuildOCI(TestCase):
"build-oci",
"--backend=fake",
"--series=xenial",
- "--arch=amd64",
+ "--abi-tag=amd64",
+ "--isa-tag=amd64",
"1",
"--branch",
"lp:foo",
@@ -835,7 +856,8 @@ class TestBuildOCI(TestCase):
"build-oci",
"--backend=fake",
"--series=xenial",
- "--arch=amd64",
+ "--abi-tag=amd64",
+ "--isa-tag=amd64",
"1",
"--branch",
"lp:foo",
@@ -852,7 +874,8 @@ class TestBuildOCI(TestCase):
"build-oci",
"--backend=fake",
"--series=xenial",
- "--arch=amd64",
+ "--abi-tag=amd64",
+ "--isa-tag=amd64",
"1",
"--branch",
"lp:foo",
@@ -869,7 +892,8 @@ class TestBuildOCI(TestCase):
"build-oci",
"--backend=fake",
"--series=xenial",
- "--arch=amd64",
+ "--abi-tag=amd64",
+ "--isa-tag=amd64",
"1",
"--branch",
"lp:foo",
@@ -889,7 +913,8 @@ class TestBuildOCI(TestCase):
"build-oci",
"--backend=fake",
"--series=xenial",
- "--arch=amd64",
+ "--abi-tag=amd64",
+ "--isa-tag=amd64",
"1",
"--branch",
"lp:foo",
@@ -906,7 +931,8 @@ class TestBuildOCI(TestCase):
"build-oci",
"--backend=fake",
"--series=xenial",
- "--arch=amd64",
+ "--abi-tag=amd64",
+ "--isa-tag=amd64",
"1",
"--branch",
"lp:foo",
@@ -923,7 +949,8 @@ class TestBuildOCI(TestCase):
"build-oci",
"--backend=fake",
"--series=xenial",
- "--arch=amd64",
+ "--abi-tag=amd64",
+ "--isa-tag=amd64",
"1",
"--branch",
"lp:foo",
diff --git a/lpbuildd/target/tests/test_build_rock.py b/lpbuildd/target/tests/test_build_rock.py
index a79157e..5fa2b1b 100644
--- a/lpbuildd/target/tests/test_build_rock.py
+++ b/lpbuildd/target/tests/test_build_rock.py
@@ -31,7 +31,8 @@ class TestBuildRock(TestCase):
"build-rock",
"--backend=fake",
"--series=xenial",
- "--arch=amd64",
+ "--abi-tag=amd64",
+ "--isa-tag=amd64",
"1",
"--branch",
"lp:foo",
@@ -55,7 +56,8 @@ class TestBuildRock(TestCase):
"build-rock",
"--backend=fake",
"--series=xenial",
- "--arch=amd64",
+ "--abi-tag=amd64",
+ "--isa-tag=amd64",
"1",
"--branch",
"lp:foo",
@@ -83,7 +85,8 @@ class TestBuildRock(TestCase):
"build-rock",
"--backend=fake",
"--series=xenial",
- "--arch=amd64",
+ "--abi-tag=amd64",
+ "--isa-tag=amd64",
"1",
"--channel=core=candidate",
"--channel=core18=beta",
@@ -120,7 +123,8 @@ class TestBuildRock(TestCase):
"build-rock",
"--backend=fake",
"--series=xenial",
- "--arch=amd64",
+ "--abi-tag=amd64",
+ "--isa-tag=amd64",
"1",
"--branch",
"lp:foo",
@@ -150,7 +154,8 @@ class TestBuildRock(TestCase):
"build-rock",
"--backend=fake",
"--series=xenial",
- "--arch=amd64",
+ "--abi-tag=amd64",
+ "--isa-tag=amd64",
"1",
"--git-repository",
"lp:foo",
@@ -199,7 +204,8 @@ class TestBuildRock(TestCase):
"build-rock",
"--backend=fake",
"--series=xenial",
- "--arch=amd64",
+ "--abi-tag=amd64",
+ "--isa-tag=amd64",
"1",
"--git-repository",
"lp:foo",
@@ -238,7 +244,8 @@ class TestBuildRock(TestCase):
"build-rock",
"--backend=fake",
"--series=xenial",
- "--arch=amd64",
+ "--abi-tag=amd64",
+ "--isa-tag=amd64",
"1",
"--git-repository",
"lp:foo",
@@ -282,7 +289,8 @@ class TestBuildRock(TestCase):
"build-rock",
"--backend=fake",
"--series=xenial",
- "--arch=amd64",
+ "--abi-tag=amd64",
+ "--isa-tag=amd64",
"1",
"--git-repository",
"lp:foo",
@@ -378,7 +386,8 @@ class TestBuildRock(TestCase):
"build-rock",
"--backend=fake",
"--series=xenial",
- "--arch=amd64",
+ "--abi-tag=amd64",
+ "--isa-tag=amd64",
"1",
"--git-repository",
"lp:foo",
@@ -465,7 +474,8 @@ class TestBuildRock(TestCase):
"build-rock",
"--backend=fake",
"--series=xenial",
- "--arch=amd64",
+ "--abi-tag=amd64",
+ "--isa-tag=amd64",
"1",
"--git-repository",
"lp:foo",
@@ -509,7 +519,8 @@ class TestBuildRock(TestCase):
"build-rock",
"--backend=fake",
"--series=focal",
- "--arch=amd64",
+ "--abi-tag=amd64",
+ "--isa-tag=amd64",
"1",
"--git-repository",
"lp:foo",
@@ -545,7 +556,8 @@ class TestBuildRock(TestCase):
"build-rock",
"--backend=fake",
"--series=xenial",
- "--arch=amd64",
+ "--abi-tag=amd64",
+ "--isa-tag=amd64",
"1",
"--branch",
"lp:foo",
@@ -581,7 +593,8 @@ class TestBuildRock(TestCase):
"build-rock",
"--backend=fake",
"--series=xenial",
- "--arch=amd64",
+ "--abi-tag=amd64",
+ "--isa-tag=amd64",
"1",
"--git-repository",
"lp:foo",
@@ -631,7 +644,8 @@ class TestBuildRock(TestCase):
"build-rock",
"--backend=fake",
"--series=xenial",
- "--arch=amd64",
+ "--abi-tag=amd64",
+ "--isa-tag=amd64",
"1",
"--git-repository",
"lp:foo",
@@ -683,7 +697,8 @@ class TestBuildRock(TestCase):
"build-rock",
"--backend=fake",
"--series=xenial",
- "--arch=amd64",
+ "--abi-tag=amd64",
+ "--isa-tag=amd64",
"1",
"--git-repository",
"lp:foo",
@@ -735,7 +750,8 @@ class TestBuildRock(TestCase):
"build-rock",
"--backend=fake",
"--series=xenial",
- "--arch=amd64",
+ "--abi-tag=amd64",
+ "--isa-tag=amd64",
"1",
"--git-repository",
"lp:foo",
@@ -798,7 +814,8 @@ class TestBuildRock(TestCase):
"build-rock",
"--backend=fake",
"--series=xenial",
- "--arch=amd64",
+ "--abi-tag=amd64",
+ "--isa-tag=amd64",
"1",
"--git-repository",
"lp:foo",
@@ -880,7 +897,8 @@ class TestBuildRock(TestCase):
"build-rock",
"--backend=fake",
"--series=xenial",
- "--arch=amd64",
+ "--abi-tag=amd64",
+ "--isa-tag=amd64",
"1",
"--branch",
"lp:foo",
@@ -906,7 +924,8 @@ class TestBuildRock(TestCase):
"build-rock",
"--backend=fake",
"--series=xenial",
- "--arch=amd64",
+ "--abi-tag=amd64",
+ "--isa-tag=amd64",
"1",
"--branch",
"lp:foo",
@@ -936,7 +955,8 @@ class TestBuildRock(TestCase):
"build-rock",
"--backend=fake",
"--series=xenial",
- "--arch=amd64",
+ "--abi-tag=amd64",
+ "--isa-tag=amd64",
"1",
"--branch",
"lp:foo",
@@ -964,7 +984,8 @@ class TestBuildRock(TestCase):
"build-rock",
"--backend=fake",
"--series=xenial",
- "--arch=amd64",
+ "--abi-tag=amd64",
+ "--isa-tag=amd64",
"1",
"--branch",
"lp:foo",
@@ -1000,7 +1021,8 @@ class TestBuildRock(TestCase):
"build-rock",
"--backend=fake",
"--series=xenial",
- "--arch=amd64",
+ "--abi-tag=amd64",
+ "--isa-tag=amd64",
"1",
"--branch",
"lp:foo",
@@ -1047,7 +1069,8 @@ class TestBuildRock(TestCase):
"build-rock",
"--backend=fake",
"--series=xenial",
- "--arch=amd64",
+ "--abi-tag=amd64",
+ "--isa-tag=amd64",
"1",
"--branch",
"lp:foo",
@@ -1096,7 +1119,8 @@ class TestBuildRock(TestCase):
"build-rock",
"--backend=fake",
"--series=xenial",
- "--arch=amd64",
+ "--abi-tag=amd64",
+ "--isa-tag=amd64",
"1",
"--branch",
"lp:foo",
@@ -1118,7 +1142,8 @@ class TestBuildRock(TestCase):
"build-rock",
"--backend=fake",
"--series=xenial",
- "--arch=amd64",
+ "--abi-tag=amd64",
+ "--isa-tag=amd64",
"1",
"--branch",
"lp:foo",
@@ -1140,7 +1165,8 @@ class TestBuildRock(TestCase):
"build-rock",
"--backend=fake",
"--series=xenial",
- "--arch=amd64",
+ "--abi-tag=amd64",
+ "--isa-tag=amd64",
"1",
"--branch",
"lp:foo",
@@ -1156,7 +1182,8 @@ class TestBuildRock(TestCase):
"build-rock",
"--backend=fake",
"--series=xenial",
- "--arch=amd64",
+ "--abi-tag=amd64",
+ "--isa-tag=amd64",
"1",
"--branch",
"lp:foo",
@@ -1173,7 +1200,8 @@ class TestBuildRock(TestCase):
"build-rock",
"--backend=fake",
"--series=xenial",
- "--arch=amd64",
+ "--abi-tag=amd64",
+ "--isa-tag=amd64",
"1",
"--branch",
"lp:foo",
@@ -1190,7 +1218,8 @@ class TestBuildRock(TestCase):
"build-rock",
"--backend=fake",
"--series=xenial",
- "--arch=amd64",
+ "--abi-tag=amd64",
+ "--isa-tag=amd64",
"1",
"--branch",
"lp:foo",
diff --git a/lpbuildd/target/tests/test_build_snap.py b/lpbuildd/target/tests/test_build_snap.py
index 9f56b08..3a94727 100644
--- a/lpbuildd/target/tests/test_build_snap.py
+++ b/lpbuildd/target/tests/test_build_snap.py
@@ -59,7 +59,8 @@ class TestBuildSnap(TestCase):
"buildsnap",
"--backend=fake",
"--series=xenial",
- "--arch=amd64",
+ "--abi-tag=amd64",
+ "--isa-tag=amd64",
"1",
"--branch",
"lp:foo",
@@ -81,7 +82,8 @@ class TestBuildSnap(TestCase):
"buildsnap",
"--backend=fake",
"--series=xenial",
- "--arch=amd64",
+ "--abi-tag=amd64",
+ "--isa-tag=amd64",
"1",
"--git-repository",
"lp:foo",
@@ -122,7 +124,8 @@ class TestBuildSnap(TestCase):
"buildsnap",
"--backend=fake",
"--series=xenial",
- "--arch=amd64",
+ "--abi-tag=amd64",
+ "--isa-tag=amd64",
"1",
"--git-repository",
"lp:foo",
@@ -153,7 +156,8 @@ class TestBuildSnap(TestCase):
"buildsnap",
"--backend=fake",
"--series=xenial",
- "--arch=amd64",
+ "--abi-tag=amd64",
+ "--isa-tag=amd64",
"1",
"--git-repository",
"lp:foo",
@@ -199,7 +203,8 @@ class TestBuildSnap(TestCase):
"buildsnap",
"--backend=fake",
"--series=xenial",
- "--arch=amd64",
+ "--abi-tag=amd64",
+ "--isa-tag=amd64",
"1",
"--git-repository",
"lp:foo",
@@ -297,7 +302,8 @@ class TestBuildSnap(TestCase):
"buildsnap",
"--backend=fake",
"--series=xenial",
- "--arch=amd64",
+ "--abi-tag=amd64",
+ "--isa-tag=amd64",
"1",
"--git-repository",
"lp:foo",
@@ -386,7 +392,8 @@ class TestBuildSnap(TestCase):
"buildsnap",
"--backend=fake",
"--series=xenial",
- "--arch=amd64",
+ "--abi-tag=amd64",
+ "--isa-tag=amd64",
"1",
"--channel=core=candidate",
"--channel=core18=beta",
@@ -421,7 +428,8 @@ class TestBuildSnap(TestCase):
"buildsnap",
"--backend=fake",
"--series=xenial",
- "--arch=amd64",
+ "--abi-tag=amd64",
+ "--isa-tag=amd64",
"1",
"--branch",
"lp:foo",
@@ -457,7 +465,8 @@ class TestBuildSnap(TestCase):
"buildsnap",
"--backend=fake",
"--series=focal",
- "--arch=amd64",
+ "--abi-tag=amd64",
+ "--isa-tag=amd64",
"1",
"--branch",
"lp:foo",
@@ -485,7 +494,8 @@ class TestBuildSnap(TestCase):
"buildsnap",
"--backend=fake",
"--series=xenial",
- "--arch=amd64",
+ "--abi-tag=amd64",
+ "--isa-tag=amd64",
"1",
"--branch",
"lp:foo",
@@ -520,7 +530,8 @@ class TestBuildSnap(TestCase):
"buildsnap",
"--backend=fake",
"--series=xenial",
- "--arch=amd64",
+ "--abi-tag=amd64",
+ "--isa-tag=amd64",
"1",
"--git-repository",
"lp:foo",
@@ -570,7 +581,8 @@ class TestBuildSnap(TestCase):
"buildsnap",
"--backend=fake",
"--series=xenial",
- "--arch=amd64",
+ "--abi-tag=amd64",
+ "--isa-tag=amd64",
"1",
"--git-repository",
"lp:foo",
@@ -622,7 +634,8 @@ class TestBuildSnap(TestCase):
"buildsnap",
"--backend=fake",
"--series=xenial",
- "--arch=amd64",
+ "--abi-tag=amd64",
+ "--isa-tag=amd64",
"1",
"--git-repository",
"lp:foo",
@@ -674,7 +687,8 @@ class TestBuildSnap(TestCase):
"buildsnap",
"--backend=fake",
"--series=xenial",
- "--arch=amd64",
+ "--abi-tag=amd64",
+ "--isa-tag=amd64",
"1",
"--git-repository",
"lp:foo",
@@ -737,7 +751,8 @@ class TestBuildSnap(TestCase):
"buildsnap",
"--backend=fake",
"--series=xenial",
- "--arch=amd64",
+ "--abi-tag=amd64",
+ "--isa-tag=amd64",
"1",
"--git-repository",
"lp:foo",
@@ -819,7 +834,8 @@ class TestBuildSnap(TestCase):
"buildsnap",
"--backend=fake",
"--series=xenial",
- "--arch=amd64",
+ "--abi-tag=amd64",
+ "--isa-tag=amd64",
"1",
"--branch",
"lp:foo",
@@ -850,7 +866,8 @@ class TestBuildSnap(TestCase):
"buildsnap",
"--backend=fake",
"--series=xenial",
- "--arch=amd64",
+ "--abi-tag=amd64",
+ "--isa-tag=amd64",
"1",
"--build-url",
"https://launchpad.example/build";,
@@ -897,7 +914,8 @@ class TestBuildSnap(TestCase):
"buildsnap",
"--backend=fake",
"--series=xenial",
- "--arch=amd64",
+ "--abi-tag=amd64",
+ "--isa-tag=amd64",
"1",
"--build-url",
"https://launchpad.example/build";,
@@ -943,7 +961,8 @@ class TestBuildSnap(TestCase):
"buildsnap",
"--backend=fake",
"--series=xenial",
- "--arch=amd64",
+ "--abi-tag=amd64",
+ "--isa-tag=amd64",
"1",
"--build-url",
"https://launchpad.example/build";,
@@ -999,7 +1018,8 @@ class TestBuildSnap(TestCase):
"buildsnap",
"--backend=fake",
"--series=xenial",
- "--arch=amd64",
+ "--abi-tag=amd64",
+ "--isa-tag=amd64",
"1",
"--branch",
"lp:foo",
@@ -1046,7 +1066,8 @@ class TestBuildSnap(TestCase):
"buildsnap",
"--backend=fake",
"--series=xenial",
- "--arch=amd64",
+ "--abi-tag=amd64",
+ "--isa-tag=amd64",
"1",
"--branch",
"lp:foo",
@@ -1077,7 +1098,8 @@ class TestBuildSnap(TestCase):
"buildsnap",
"--backend=fake",
"--series=xenial",
- "--arch=amd64",
+ "--abi-tag=amd64",
+ "--isa-tag=amd64",
"1",
"--branch",
"lp:foo",
@@ -1112,7 +1134,8 @@ class TestBuildSnap(TestCase):
"buildsnap",
"--backend=fake",
"--series=xenial",
- "--arch=amd64",
+ "--abi-tag=amd64",
+ "--isa-tag=amd64",
"1",
"--branch",
"lp:foo",
@@ -1151,7 +1174,8 @@ class TestBuildSnap(TestCase):
"buildsnap",
"--backend=fake",
"--series=xenial",
- "--arch=amd64",
+ "--abi-tag=amd64",
+ "--isa-tag=amd64",
"1",
"--build-url",
"https://launchpad.example/build";,
@@ -1199,7 +1223,8 @@ class TestBuildSnap(TestCase):
"buildsnap",
"--backend=fake",
"--series=xenial",
- "--arch=amd64",
+ "--abi-tag=amd64",
+ "--isa-tag=amd64",
"1",
"--branch",
"lp:foo",
@@ -1230,7 +1255,8 @@ class TestBuildSnap(TestCase):
"buildsnap",
"--backend=fake",
"--series=xenial",
- "--arch=amd64",
+ "--abi-tag=amd64",
+ "--isa-tag=amd64",
"1",
"--branch",
"lp:foo",
@@ -1265,7 +1291,8 @@ class TestBuildSnap(TestCase):
"buildsnap",
"--backend=fake",
"--series=xenial",
- "--arch=amd64",
+ "--abi-tag=amd64",
+ "--isa-tag=amd64",
"1",
"--build-request-id",
"13",
@@ -1302,7 +1329,8 @@ class TestBuildSnap(TestCase):
"buildsnap",
"--backend=fake",
"--series=xenial",
- "--arch=amd64",
+ "--abi-tag=amd64",
+ "--isa-tag=amd64",
"1",
"--build-request-timestamp",
"2018-04-13T14:50:02Z",
@@ -1342,7 +1370,8 @@ class TestBuildSnap(TestCase):
"buildsnap",
"--backend=fake",
"--series=xenial",
- "--arch=amd64",
+ "--abi-tag=amd64",
+ "--isa-tag=amd64",
"1",
"--branch",
"lp:foo",
@@ -1378,7 +1407,8 @@ class TestBuildSnap(TestCase):
"buildsnap",
"--backend=fake",
"--series=xenial",
- "--arch=amd64",
+ "--abi-tag=amd64",
+ "--isa-tag=amd64",
"1",
"--build-request-id",
"13",
@@ -1442,7 +1472,8 @@ class TestBuildSnap(TestCase):
"buildsnap",
"--backend=fake",
"--series=xenial",
- "--arch=amd64",
+ "--abi-tag=amd64",
+ "--isa-tag=amd64",
"1",
"--branch",
"lp:foo",
@@ -1464,7 +1495,8 @@ class TestBuildSnap(TestCase):
"buildsnap",
"--backend=fake",
"--series=xenial",
- "--arch=amd64",
+ "--abi-tag=amd64",
+ "--isa-tag=amd64",
"1",
"--branch",
"lp:foo",
@@ -1488,7 +1520,8 @@ class TestBuildSnap(TestCase):
"buildsnap",
"--backend=fake",
"--series=xenial",
- "--arch=amd64",
+ "--abi-tag=amd64",
+ "--isa-tag=amd64",
"1",
"--branch",
"lp:foo",
@@ -1513,7 +1546,8 @@ class TestBuildSnap(TestCase):
"buildsnap",
"--backend=fake",
"--series=xenial",
- "--arch=amd64",
+ "--abi-tag=amd64",
+ "--isa-tag=amd64",
"1",
"--branch",
"lp:foo",
diff --git a/lpbuildd/target/tests/test_generate_translation_templates.py b/lpbuildd/target/tests/test_generate_translation_templates.py
index 147bc1c..00b247f 100644
--- a/lpbuildd/target/tests/test_generate_translation_templates.py
+++ b/lpbuildd/target/tests/test_generate_translation_templates.py
@@ -85,7 +85,8 @@ class TestGenerateTranslationTemplates(TestCase):
"generate-translation-templates",
"--backend=fake",
"--series=xenial",
- "--arch=amd64",
+ "--abi-tag=amd64",
+ "--isa-tag=amd64",
"1",
"--branch",
"lp:foo",
@@ -107,7 +108,8 @@ class TestGenerateTranslationTemplates(TestCase):
"generate-translation-templates",
"--backend=fake",
"--series=xenial",
- "--arch=amd64",
+ "--abi-tag=amd64",
+ "--isa-tag=amd64",
"1",
"--git-repository",
"lp:foo",
@@ -134,7 +136,8 @@ class TestGenerateTranslationTemplates(TestCase):
"generate-translation-templates",
"--backend=uncontained",
"--series=xenial",
- "--arch=amd64",
+ "--abi-tag=amd64",
+ "--isa-tag=amd64",
"1",
"--branch",
branch_path,
@@ -157,7 +160,8 @@ class TestGenerateTranslationTemplates(TestCase):
"generate-translation-templates",
"--backend=uncontained",
"--series=xenial",
- "--arch=amd64",
+ "--abi-tag=amd64",
+ "--isa-tag=amd64",
"1",
"--git-repository",
branch_path,
@@ -184,7 +188,8 @@ class TestGenerateTranslationTemplates(TestCase):
"generate-translation-templates",
"--backend=uncontained",
"--series=xenial",
- "--arch=amd64",
+ "--abi-tag=amd64",
+ "--isa-tag=amd64",
"1",
"--git-repository",
branch_path,
@@ -218,7 +223,8 @@ class TestGenerateTranslationTemplates(TestCase):
"generate-translation-templates",
"--backend=uncontained",
"--series=xenial",
- "--arch=amd64",
+ "--abi-tag=amd64",
+ "--isa-tag=amd64",
"1",
"--branch",
branchdir,
@@ -243,7 +249,8 @@ class TestGenerateTranslationTemplates(TestCase):
"generate-translation-templates",
"--backend=fake",
"--series=xenial",
- "--arch=amd64",
+ "--abi-tag=amd64",
+ "--isa-tag=amd64",
"1",
"--branch",
branch_url,
@@ -311,7 +318,8 @@ class TestGenerateTranslationTemplates(TestCase):
"generate-translation-templates",
"--backend=fake",
"--series=xenial",
- "--arch=amd64",
+ "--abi-tag=amd64",
+ "--isa-tag=amd64",
"1",
"--git-repository",
repository_url,
diff --git a/lpbuildd/target/tests/test_lifecycle.py b/lpbuildd/target/tests/test_lifecycle.py
index a96e6b8..a4935de 100644
--- a/lpbuildd/target/tests/test_lifecycle.py
+++ b/lpbuildd/target/tests/test_lifecycle.py
@@ -17,7 +17,8 @@ class TestCreate(TestCase):
"unpack-chroot",
"--backend=fake",
"--series=xenial",
- "--arch=amd64",
+ "--abi-tag=amd64",
+ "--isa-tag=amd64",
"1",
"/path/to/tarball",
]
@@ -32,7 +33,8 @@ class TestCreate(TestCase):
"unpack-chroot",
"--backend=fake",
"--series=xenial",
- "--arch=amd64",
+ "--abi-tag=amd64",
+ "--isa-tag=amd64",
"1",
"--image-type",
"lxd",
@@ -51,7 +53,8 @@ class TestStart(TestCase):
"mount-chroot",
"--backend=fake",
"--series=xenial",
- "--arch=amd64",
+ "--abi-tag=amd64",
+ "--isa-tag=amd64",
"1",
]
start = parse_args(args=args).operation
@@ -65,7 +68,8 @@ class TestKillProcesses(TestCase):
"scan-for-processes",
"--backend=fake",
"--series=xenial",
- "--arch=amd64",
+ "--abi-tag=amd64",
+ "--isa-tag=amd64",
"1",
]
kill_processes = parse_args(args=args).operation
@@ -81,7 +85,8 @@ class TestStop(TestCase):
"umount-chroot",
"--backend=fake",
"--series=xenial",
- "--arch=amd64",
+ "--abi-tag=amd64",
+ "--isa-tag=amd64",
"1",
]
stop = parse_args(args=args).operation
@@ -94,7 +99,8 @@ class TestStop(TestCase):
"umount-chroot",
"--backend=fake",
"--series=xenial",
- "--arch=amd64",
+ "--abi-tag=amd64",
+ "--isa-tag=amd64",
"1",
]
stop = parse_args(args=args).operation
@@ -121,7 +127,8 @@ class TestRemove(TestCase):
"remove-build",
"--backend=fake",
"--series=xenial",
- "--arch=amd64",
+ "--abi-tag=amd64",
+ "--isa-tag=amd64",
"1",
]
remove = parse_args(args=args).operation
diff --git a/lpbuildd/target/tests/test_operation.py b/lpbuildd/target/tests/test_operation.py
index 3264e8a..0ea39f6 100644
--- a/lpbuildd/target/tests/test_operation.py
+++ b/lpbuildd/target/tests/test_operation.py
@@ -14,7 +14,13 @@ class TestOperation(TestCase):
def test_run_build_command_no_env(self):
parser = ArgumentParser()
Operation.add_arguments(parser)
- args = ["--backend=fake", "--series=xenial", "--arch=amd64", "1"]
+ args = [
+ "--backend=fake",
+ "--series=xenial",
+ "--abi-tag=amd64",
+ "--isa-tag=amd64",
+ "1",
+ ]
operation = Operation(parser.parse_args(args=args), parser)
operation.run_build_command(["echo", "hello world"])
self.assertThat(
@@ -29,7 +35,13 @@ class TestOperation(TestCase):
def test_run_build_command_env(self):
parser = ArgumentParser()
Operation.add_arguments(parser)
- args = ["--backend=fake", "--series=xenial", "--arch=amd64", "1"]
+ args = [
+ "--backend=fake",
+ "--series=xenial",
+ "--abi-tag=amd64",
+ "--isa-tag=amd64",
+ "1",
+ ]
operation = Operation(parser.parse_args(args=args), parser)
operation.run_build_command(
["echo", "hello world"], env={"FOO": "bar baz"}
diff --git a/lpbuildd/target/tests/test_run_ci.py b/lpbuildd/target/tests/test_run_ci.py
index 3f5f837..8ea5eef 100644
--- a/lpbuildd/target/tests/test_run_ci.py
+++ b/lpbuildd/target/tests/test_run_ci.py
@@ -44,7 +44,8 @@ class TestRunCIPrepare(TestCase):
"run-ci-prepare",
"--backend=fake",
"--series=focal",
- "--arch=amd64",
+ "--abi-tag=amd64",
+ "--isa-tag=amd64",
"1",
"--git-repository",
"lp:foo",
@@ -87,7 +88,8 @@ class TestRunCIPrepare(TestCase):
"run-ci-prepare",
"--backend=fake",
"--series=focal",
- "--arch=amd64",
+ "--abi-tag=amd64",
+ "--isa-tag=amd64",
"1",
"--git-repository",
"lp:foo",
@@ -115,7 +117,8 @@ class TestRunCIPrepare(TestCase):
"run-ci-prepare",
"--backend=fake",
"--series=focal",
- "--arch=amd64",
+ "--abi-tag=amd64",
+ "--isa-tag=amd64",
"1",
"--git-repository",
"lp:foo",
@@ -153,7 +156,8 @@ class TestRunCIPrepare(TestCase):
"run-ci-prepare",
"--backend=fake",
"--series=focal",
- "--arch=amd64",
+ "--abi-tag=amd64",
+ "--isa-tag=amd64",
"1",
"--channel=core=candidate",
"--channel=core20=beta",
@@ -183,7 +187,8 @@ class TestRunCIPrepare(TestCase):
"run-ci-prepare",
"--backend=fake",
"--series=focal",
- "--arch=amd64",
+ "--abi-tag=amd64",
+ "--isa-tag=amd64",
"1",
"--git-repository",
"lp:foo",
@@ -209,7 +214,8 @@ class TestRunCIPrepare(TestCase):
"run-ci-prepare",
"--backend=fake",
"--series=focal",
- "--arch=amd64",
+ "--abi-tag=amd64",
+ "--isa-tag=amd64",
"1",
"--git-repository",
"lp:foo",
@@ -251,7 +257,8 @@ class TestRunCIPrepare(TestCase):
"run-ci-prepare",
"--backend=fake",
"--series=focal",
- "--arch=amd64",
+ "--abi-tag=amd64",
+ "--isa-tag=amd64",
"1",
"--git-repository",
"lp:foo",
@@ -289,7 +296,8 @@ class TestRunCIPrepare(TestCase):
"run-ci-prepare",
"--backend=fake",
"--series=focal",
- "--arch=amd64",
+ "--abi-tag=amd64",
+ "--isa-tag=amd64",
"1",
"--git-repository",
"lp:foo",
@@ -339,7 +347,8 @@ class TestRunCIPrepare(TestCase):
"run-ci-prepare",
"--backend=fake",
"--series=focal",
- "--arch=amd64",
+ "--abi-tag=amd64",
+ "--isa-tag=amd64",
"1",
"--git-repository",
"lp:foo",
@@ -391,7 +400,8 @@ class TestRunCIPrepare(TestCase):
"run-ci-prepare",
"--backend=fake",
"--series=focal",
- "--arch=amd64",
+ "--abi-tag=amd64",
+ "--isa-tag=amd64",
"1",
"--git-repository",
"lp:foo",
@@ -444,7 +454,8 @@ class TestRunCIPrepare(TestCase):
"run-ci-prepare",
"--backend=fake",
"--series=focal",
- "--arch=amd64",
+ "--abi-tag=amd64",
+ "--isa-tag=amd64",
"1",
"--git-repository",
"lp:foo",
@@ -509,7 +520,8 @@ class TestRunCIPrepare(TestCase):
"run-ci-prepare",
"--backend=fake",
"--series=focal",
- "--arch=amd64",
+ "--abi-tag=amd64",
+ "--isa-tag=amd64",
"1",
"--git-repository",
"lp:foo",
@@ -543,7 +555,8 @@ class TestRunCIPrepare(TestCase):
"run-ci-prepare",
"--backend=fake",
"--series=focal",
- "--arch=amd64",
+ "--abi-tag=amd64",
+ "--isa-tag=amd64",
"1",
"--git-repository",
"lp:foo",
@@ -564,7 +577,8 @@ class TestRunCIPrepare(TestCase):
"run-ci-prepare",
"--backend=fake",
"--series=focal",
- "--arch=amd64",
+ "--abi-tag=amd64",
+ "--isa-tag=amd64",
"1",
"--git-repository",
"lp:foo",
@@ -580,7 +594,8 @@ class TestRunCI(TestCase):
"run-ci",
"--backend=fake",
"--series=focal",
- "--arch=amd64",
+ "--abi-tag=amd64",
+ "--isa-tag=amd64",
"1",
"test",
"0",
@@ -623,7 +638,8 @@ class TestRunCI(TestCase):
"run-ci",
"--backend=fake",
"--series=focal",
- "--arch=amd64",
+ "--abi-tag=amd64",
+ "--isa-tag=amd64",
"1",
"--proxy-url",
"http://proxy.example:3128/";,
@@ -677,7 +693,8 @@ class TestRunCI(TestCase):
"run-ci",
"--backend=fake",
"--series=focal",
- "--arch=amd64",
+ "--abi-tag=amd64",
+ "--isa-tag=amd64",
"1",
"--environment-variable",
"PIP_INDEX_URL=http://example";,
@@ -728,7 +745,8 @@ class TestRunCI(TestCase):
"run-ci",
"--backend=fake",
"--series=focal",
- "--arch=amd64",
+ "--abi-tag=amd64",
+ "--isa-tag=amd64",
"1",
"--package-repository",
"deb http://archive.ubuntu.com/ubuntu/ focal main restricted",
@@ -779,7 +797,8 @@ class TestRunCI(TestCase):
"run-ci",
"--backend=fake",
"--series=focal",
- "--arch=amd64",
+ "--abi-tag=amd64",
+ "--isa-tag=amd64",
"1",
"test",
"0",
@@ -828,7 +847,8 @@ class TestRunCI(TestCase):
"run-ci",
"--backend=fake",
"--series=focal",
- "--arch=amd64",
+ "--abi-tag=amd64",
+ "--isa-tag=amd64",
"1",
"--secrets",
"/build/.launchpad-secrets.yaml",
@@ -876,7 +896,8 @@ class TestRunCI(TestCase):
"run-ci",
"--backend=fake",
"--series=focal",
- "--arch=amd64",
+ "--abi-tag=amd64",
+ "--isa-tag=amd64",
"1",
"--scan-malware",
"test",
@@ -945,7 +966,8 @@ class TestRunCI(TestCase):
"run-ci",
"--backend=fake",
"--series=focal",
- "--arch=amd64",
+ "--abi-tag=amd64",
+ "--isa-tag=amd64",
"1",
"--scan-malware",
"test",
@@ -960,7 +982,8 @@ class TestRunCI(TestCase):
"run-ci",
"--backend=fake",
"--series=focal",
- "--arch=amd64",
+ "--abi-tag=amd64",
+ "--isa-tag=amd64",
"--constraint=gpu-nvidia",
"1",
"test",
@@ -1007,7 +1030,8 @@ class TestRunCI(TestCase):
"run-ci",
"--backend=fake",
"--series=focal",
- "--arch=amd64",
+ "--abi-tag=amd64",
+ "--isa-tag=amd64",
"1",
"test",
"0",
@@ -1032,7 +1056,8 @@ class TestRunCI(TestCase):
"run-ci",
"--backend=fake",
"--series=focal",
- "--arch=amd64",
+ "--abi-tag=amd64",
+ "--isa-tag=amd64",
"1",
"test",
"0",
diff --git a/lpbuildd/tests/test_binarypackage.py b/lpbuildd/tests/test_binarypackage.py
index 77029d3..3e007fc 100644
--- a/lpbuildd/tests/test_binarypackage.py
+++ b/lpbuildd/tests/test_binarypackage.py
@@ -174,7 +174,8 @@ class TestBinaryPackageBuildManagerIteration(TestCase):
"scan-for-processes",
"--backend=chroot",
"--series=warty",
- "--arch=i386",
+ "--abi-tag=i386",
+ "--isa-tag=i386",
self.buildid,
],
final=False,
@@ -190,7 +191,8 @@ class TestBinaryPackageBuildManagerIteration(TestCase):
"umount-chroot",
"--backend=chroot",
"--series=warty",
- "--arch=i386",
+ "--abi-tag=i386",
+ "--isa-tag=i386",
self.buildid,
],
final=True,
@@ -364,7 +366,8 @@ class TestBinaryPackageBuildManagerIteration(TestCase):
"scan-for-processes",
"--backend=chroot",
"--series=warty",
- "--arch=i386",
+ "--abi-tag=i386",
+ "--isa-tag=i386",
self.buildid,
],
final=False,
@@ -393,7 +396,8 @@ class TestBinaryPackageBuildManagerIteration(TestCase):
"scan-for-processes",
"--backend=chroot",
"--series=warty",
- "--arch=i386",
+ "--abi-tag=i386",
+ "--isa-tag=i386",
self.buildid,
],
final=False,
@@ -429,7 +433,8 @@ class TestBinaryPackageBuildManagerIteration(TestCase):
"umount-chroot",
"--backend=chroot",
"--series=warty",
- "--arch=i386",
+ "--abi-tag=i386",
+ "--isa-tag=i386",
self.buildid,
],
final=True,
@@ -454,7 +459,8 @@ class TestBinaryPackageBuildManagerIteration(TestCase):
"scan-for-processes",
"--backend=chroot",
"--series=warty",
- "--arch=i386",
+ "--abi-tag=i386",
+ "--isa-tag=i386",
self.buildid,
],
final=False,
@@ -469,7 +475,8 @@ class TestBinaryPackageBuildManagerIteration(TestCase):
"remove-build",
"--backend=chroot",
"--series=warty",
- "--arch=i386",
+ "--abi-tag=i386",
+ "--isa-tag=i386",
self.buildid,
],
final=True,
diff --git a/lpbuildd/tests/test_charm.py b/lpbuildd/tests/test_charm.py
index 3944ab4..edefe2f 100644
--- a/lpbuildd/tests/test_charm.py
+++ b/lpbuildd/tests/test_charm.py
@@ -80,7 +80,8 @@ class TestCharmBuildManagerIteration(TestCase):
"build-charm",
"--backend=lxd",
"--series=xenial",
- "--arch=i386",
+ "--abi-tag=i386",
+ "--isa-tag=i386",
self.buildid,
]
if options is not None:
@@ -134,7 +135,8 @@ class TestCharmBuildManagerIteration(TestCase):
"scan-for-processes",
"--backend=lxd",
"--series=xenial",
- "--arch=i386",
+ "--abi-tag=i386",
+ "--isa-tag=i386",
self.buildid,
]
@@ -161,7 +163,8 @@ class TestCharmBuildManagerIteration(TestCase):
"umount-chroot",
"--backend=lxd",
"--series=xenial",
- "--arch=i386",
+ "--abi-tag=i386",
+ "--isa-tag=i386",
self.buildid,
]
self.assertEqual(CharmBuildState.UMOUNT, self.getState())
@@ -207,7 +210,8 @@ class TestCharmBuildManagerIteration(TestCase):
"scan-for-processes",
"--backend=lxd",
"--series=xenial",
- "--arch=i386",
+ "--abi-tag=i386",
+ "--isa-tag=i386",
self.buildid,
]
@@ -234,7 +238,8 @@ class TestCharmBuildManagerIteration(TestCase):
"umount-chroot",
"--backend=lxd",
"--series=xenial",
- "--arch=i386",
+ "--abi-tag=i386",
+ "--isa-tag=i386",
self.buildid,
]
self.assertEqual(CharmBuildState.UMOUNT, self.getState())
@@ -243,7 +248,7 @@ class TestCharmBuildManagerIteration(TestCase):
self.buildmanager.iterate, self.buildmanager.iterators[-1]
)
self.assertFalse(self.builder.wasCalled("buildFail"))
-
+
@defer.inlineCallbacks
def test_iterate_use_fetch_service(self):
# The build manager can be told to use the fetch service as its proxy.
@@ -290,7 +295,8 @@ class TestCharmBuildManagerIteration(TestCase):
"scan-for-processes",
"--backend=lxd",
"--series=xenial",
- "--arch=i386",
+ "--abi-tag=i386",
+ "--isa-tag=i386",
self.buildid,
]
@@ -317,7 +323,8 @@ class TestCharmBuildManagerIteration(TestCase):
"umount-chroot",
"--backend=lxd",
"--series=xenial",
- "--arch=i386",
+ "--abi-tag=i386",
+ "--isa-tag=i386",
self.buildid,
]
self.assertEqual(CharmBuildState.UMOUNT, self.getState())
diff --git a/lpbuildd/tests/test_ci.py b/lpbuildd/tests/test_ci.py
index 6aa00af..d7dfd90 100644
--- a/lpbuildd/tests/test_ci.py
+++ b/lpbuildd/tests/test_ci.py
@@ -87,7 +87,8 @@ class TestCIBuildManagerIteration(TestCase):
"run-ci-prepare",
"--backend=lxd",
"--series=focal",
- "--arch=amd64",
+ "--abi-tag=amd64",
+ "--isa-tag=amd64",
]
for constraint in constraints or []:
expected_command.append("--constraint=%s" % constraint)
@@ -112,7 +113,8 @@ class TestCIBuildManagerIteration(TestCase):
"run-ci",
"--backend=lxd",
"--series=focal",
- "--arch=amd64",
+ "--abi-tag=amd64",
+ "--isa-tag=amd64",
self.buildid,
]
if options is not None:
@@ -220,7 +222,8 @@ class TestCIBuildManagerIteration(TestCase):
"scan-for-processes",
"--backend=lxd",
"--series=focal",
- "--arch=amd64",
+ "--abi-tag=amd64",
+ "--isa-tag=amd64",
self.buildid,
]
self.assertEqual(CIBuildState.RUN_JOB, self.getState())
@@ -277,7 +280,8 @@ class TestCIBuildManagerIteration(TestCase):
"umount-chroot",
"--backend=lxd",
"--series=focal",
- "--arch=amd64",
+ "--abi-tag=amd64",
+ "--isa-tag=amd64",
self.buildid,
]
self.assertEqual(CIBuildState.UMOUNT, self.getState())
@@ -296,7 +300,8 @@ class TestCIBuildManagerIteration(TestCase):
"remove-build",
"--backend=lxd",
"--series=focal",
- "--arch=amd64",
+ "--abi-tag=amd64",
+ "--isa-tag=amd64",
self.buildid,
]
self.assertEqual(CIBuildState.CLEANUP, self.getState())
@@ -398,7 +403,8 @@ class TestCIBuildManagerIteration(TestCase):
"scan-for-processes",
"--backend=lxd",
"--series=focal",
- "--arch=amd64",
+ "--abi-tag=amd64",
+ "--isa-tag=amd64",
self.buildid,
]
self.assertEqual(CIBuildState.RUN_JOB, self.getState())
@@ -442,7 +448,8 @@ class TestCIBuildManagerIteration(TestCase):
"umount-chroot",
"--backend=lxd",
"--series=focal",
- "--arch=amd64",
+ "--abi-tag=amd64",
+ "--isa-tag=amd64",
self.buildid,
]
self.assertEqual(CIBuildState.UMOUNT, self.getState())
@@ -461,7 +468,8 @@ class TestCIBuildManagerIteration(TestCase):
"remove-build",
"--backend=lxd",
"--series=focal",
- "--arch=amd64",
+ "--abi-tag=amd64",
+ "--isa-tag=amd64",
self.buildid,
]
self.assertEqual(CIBuildState.CLEANUP, self.getState())
diff --git a/lpbuildd/tests/test_craft.py b/lpbuildd/tests/test_craft.py
index b9dfa40..9c2ddd5 100644
--- a/lpbuildd/tests/test_craft.py
+++ b/lpbuildd/tests/test_craft.py
@@ -75,7 +75,8 @@ class TestCraftBuildManagerIteration(TestCase):
"build-craft",
"--backend=lxd",
"--series=xenial",
- "--arch=i386",
+ "--abi-tag=i386",
+ "--isa-tag=i386",
self.buildid,
]
if options is not None:
@@ -130,7 +131,8 @@ class TestCraftBuildManagerIteration(TestCase):
"scan-for-processes",
"--backend=lxd",
"--series=xenial",
- "--arch=i386",
+ "--abi-tag=i386",
+ "--isa-tag=i386",
self.buildid,
]
@@ -157,7 +159,8 @@ class TestCraftBuildManagerIteration(TestCase):
"umount-chroot",
"--backend=lxd",
"--series=xenial",
- "--arch=i386",
+ "--abi-tag=i386",
+ "--isa-tag=i386",
self.buildid,
]
self.assertEqual(CraftBuildState.UMOUNT, self.getState())
@@ -203,7 +206,8 @@ class TestCraftBuildManagerIteration(TestCase):
"scan-for-processes",
"--backend=lxd",
"--series=xenial",
- "--arch=i386",
+ "--abi-tag=i386",
+ "--isa-tag=i386",
self.buildid,
]
@@ -230,7 +234,8 @@ class TestCraftBuildManagerIteration(TestCase):
"umount-chroot",
"--backend=lxd",
"--series=xenial",
- "--arch=i386",
+ "--abi-tag=i386",
+ "--isa-tag=i386",
self.buildid,
]
self.assertEqual(CraftBuildState.UMOUNT, self.getState())
diff --git a/lpbuildd/tests/test_debian.py b/lpbuildd/tests/test_debian.py
index 253e435..77b7245 100644
--- a/lpbuildd/tests/test_debian.py
+++ b/lpbuildd/tests/test_debian.py
@@ -125,7 +125,8 @@ class TestDebianBuildManagerIteration(TestCase):
"unpack-chroot",
"--backend=chroot",
"--series=xenial",
- "--arch=amd64",
+ "--abi-tag=amd64",
+ "--isa-tag=amd64",
self.buildid,
"--image-type",
"chroot",
@@ -151,7 +152,8 @@ class TestDebianBuildManagerIteration(TestCase):
"mount-chroot",
"--backend=chroot",
"--series=xenial",
- "--arch=amd64",
+ "--abi-tag=amd64",
+ "--isa-tag=amd64",
self.buildid,
],
None,
@@ -172,7 +174,8 @@ class TestDebianBuildManagerIteration(TestCase):
"override-sources-list",
"--backend=chroot",
"--series=xenial",
- "--arch=amd64",
+ "--abi-tag=amd64",
+ "--isa-tag=amd64",
self.buildid,
"deb http://ppa.launchpad.dev/owner/name/ubuntu xenial "
"main",
@@ -195,7 +198,8 @@ class TestDebianBuildManagerIteration(TestCase):
"update-debian-chroot",
"--backend=chroot",
"--series=xenial",
- "--arch=amd64",
+ "--abi-tag=amd64",
+ "--isa-tag=amd64",
self.buildid,
],
None,
@@ -225,7 +229,8 @@ class TestDebianBuildManagerIteration(TestCase):
"scan-for-processes",
"--backend=chroot",
"--series=xenial",
- "--arch=amd64",
+ "--abi-tag=amd64",
+ "--isa-tag=amd64",
self.buildid,
],
None,
@@ -246,7 +251,8 @@ class TestDebianBuildManagerIteration(TestCase):
"umount-chroot",
"--backend=chroot",
"--series=xenial",
- "--arch=amd64",
+ "--abi-tag=amd64",
+ "--isa-tag=amd64",
self.buildid,
],
None,
@@ -267,7 +273,8 @@ class TestDebianBuildManagerIteration(TestCase):
"remove-build",
"--backend=chroot",
"--series=xenial",
- "--arch=amd64",
+ "--abi-tag=amd64",
+ "--isa-tag=amd64",
self.buildid,
],
None,
@@ -309,7 +316,8 @@ class TestDebianBuildManagerIteration(TestCase):
"unpack-chroot",
"--backend=chroot",
"--series=xenial",
- "--arch=amd64",
+ "--abi-tag=amd64",
+ "--isa-tag=amd64",
self.buildid,
"--image-type",
"chroot",
@@ -335,7 +343,8 @@ class TestDebianBuildManagerIteration(TestCase):
"mount-chroot",
"--backend=chroot",
"--series=xenial",
- "--arch=amd64",
+ "--abi-tag=amd64",
+ "--isa-tag=amd64",
self.buildid,
],
None,
@@ -356,7 +365,8 @@ class TestDebianBuildManagerIteration(TestCase):
"override-sources-list",
"--backend=chroot",
"--series=xenial",
- "--arch=amd64",
+ "--abi-tag=amd64",
+ "--isa-tag=amd64",
self.buildid,
"deb http://ppa.launchpad.dev/owner/name/ubuntu xenial "
"main",
@@ -379,7 +389,8 @@ class TestDebianBuildManagerIteration(TestCase):
"add-trusted-keys",
"--backend=chroot",
"--series=xenial",
- "--arch=amd64",
+ "--abi-tag=amd64",
+ "--isa-tag=amd64",
self.buildid,
],
b"key material",
@@ -400,7 +411,8 @@ class TestDebianBuildManagerIteration(TestCase):
"update-debian-chroot",
"--backend=chroot",
"--series=xenial",
- "--arch=amd64",
+ "--abi-tag=amd64",
+ "--isa-tag=amd64",
self.buildid,
],
None,
@@ -430,7 +442,8 @@ class TestDebianBuildManagerIteration(TestCase):
"scan-for-processes",
"--backend=chroot",
"--series=xenial",
- "--arch=amd64",
+ "--abi-tag=amd64",
+ "--isa-tag=amd64",
self.buildid,
],
None,
@@ -451,7 +464,8 @@ class TestDebianBuildManagerIteration(TestCase):
"umount-chroot",
"--backend=chroot",
"--series=xenial",
- "--arch=amd64",
+ "--abi-tag=amd64",
+ "--isa-tag=amd64",
self.buildid,
],
None,
@@ -472,7 +486,8 @@ class TestDebianBuildManagerIteration(TestCase):
"remove-build",
"--backend=chroot",
"--series=xenial",
- "--arch=amd64",
+ "--abi-tag=amd64",
+ "--isa-tag=amd64",
self.buildid,
],
None,
@@ -516,7 +531,8 @@ class TestDebianBuildManagerIteration(TestCase):
"unpack-chroot",
"--backend=chroot",
"--series=xenial",
- "--arch=amd64",
+ "--abi-tag=amd64",
+ "--isa-tag=amd64",
self.buildid,
"--image-type",
"chroot",
@@ -542,7 +558,8 @@ class TestDebianBuildManagerIteration(TestCase):
"mount-chroot",
"--backend=chroot",
"--series=xenial",
- "--arch=amd64",
+ "--abi-tag=amd64",
+ "--isa-tag=amd64",
self.buildid,
],
None,
@@ -563,7 +580,8 @@ class TestDebianBuildManagerIteration(TestCase):
"override-sources-list",
"--backend=chroot",
"--series=xenial",
- "--arch=amd64",
+ "--abi-tag=amd64",
+ "--isa-tag=amd64",
self.buildid,
"deb http://ppa.launchpad.dev/owner/name/ubuntu xenial "
"main",
@@ -586,7 +604,8 @@ class TestDebianBuildManagerIteration(TestCase):
"update-debian-chroot",
"--backend=chroot",
"--series=xenial",
- "--arch=amd64",
+ "--abi-tag=amd64",
+ "--isa-tag=amd64",
self.buildid,
],
None,
@@ -616,7 +635,8 @@ class TestDebianBuildManagerIteration(TestCase):
"scan-for-processes",
"--backend=chroot",
"--series=xenial",
- "--arch=amd64",
+ "--abi-tag=amd64",
+ "--isa-tag=amd64",
self.buildid,
],
None,
@@ -663,7 +683,8 @@ class TestDebianBuildManagerIteration(TestCase):
"override-sources-list",
"--backend=chroot",
"--series=xenial",
- "--arch=amd64",
+ "--abi-tag=amd64",
+ "--isa-tag=amd64",
self.buildid,
"--apt-proxy-url",
"http://apt-proxy.example:3128/";,
@@ -699,7 +720,8 @@ class TestDebianBuildManagerIteration(TestCase):
"unpack-chroot",
"--backend=lxd",
"--series=xenial",
- "--arch=amd64",
+ "--abi-tag=amd64",
+ "--isa-tag=amd64",
self.buildid,
"--image-type",
"lxd",
@@ -734,7 +756,8 @@ class TestDebianBuildManagerIteration(TestCase):
"unpack-chroot",
"--backend=chroot",
"--series=xenial",
- "--arch=amd64",
+ "--abi-tag=amd64",
+ "--isa-tag=amd64",
self.buildid,
"--image-type",
"chroot",
@@ -770,7 +793,8 @@ class TestDebianBuildManagerIteration(TestCase):
"unpack-chroot",
"--backend=chroot",
"--series=xenial",
- "--arch=amd64",
+ "--abi-tag=amd64",
+ "--isa-tag=amd64",
self.buildid,
"--image-type",
"chroot",
@@ -806,7 +830,8 @@ class TestDebianBuildManagerIteration(TestCase):
"unpack-chroot",
"--backend=chroot",
"--series=xenial",
- "--arch=amd64",
+ "--abi-tag=amd64",
+ "--isa-tag=amd64",
"--constraint=gpu",
"--constraint=large",
self.buildid,
diff --git a/lpbuildd/tests/test_livefs.py b/lpbuildd/tests/test_livefs.py
index 1a7db8d..9b58a8a 100644
--- a/lpbuildd/tests/test_livefs.py
+++ b/lpbuildd/tests/test_livefs.py
@@ -84,7 +84,8 @@ class TestLiveFilesystemBuildManagerIteration(TestCase):
"buildlivefs",
"--backend=lxd",
"--series=saucy",
- "--arch=i386",
+ "--abi-tag=i386",
+ "--isa-tag=i386",
self.buildid,
"--project",
"ubuntu",
@@ -118,7 +119,8 @@ class TestLiveFilesystemBuildManagerIteration(TestCase):
"scan-for-processes",
"--backend=lxd",
"--series=saucy",
- "--arch=i386",
+ "--abi-tag=i386",
+ "--isa-tag=i386",
self.buildid,
]
self.assertEqual(
@@ -146,7 +148,8 @@ class TestLiveFilesystemBuildManagerIteration(TestCase):
"umount-chroot",
"--backend=lxd",
"--series=saucy",
- "--arch=i386",
+ "--abi-tag=i386",
+ "--isa-tag=i386",
self.buildid,
]
self.assertEqual(LiveFilesystemBuildState.UMOUNT, self.getState())
diff --git a/lpbuildd/tests/test_oci.py b/lpbuildd/tests/test_oci.py
index fe4ee23..466b32f 100644
--- a/lpbuildd/tests/test_oci.py
+++ b/lpbuildd/tests/test_oci.py
@@ -88,7 +88,8 @@ class TestOCIBuildManagerIteration(TestCase):
"build-oci",
"--backend=lxd",
"--series=xenial",
- "--arch=i386",
+ "--abi-tag=i386",
+ "--isa-tag=i386",
self.buildid,
]
if options is not None:
@@ -141,7 +142,8 @@ class TestOCIBuildManagerIteration(TestCase):
"scan-for-processes",
"--backend=lxd",
"--series=xenial",
- "--arch=i386",
+ "--abi-tag=i386",
+ "--isa-tag=i386",
self.buildid,
]
self.assertEqual(OCIBuildState.BUILD_OCI, self.getState())
@@ -194,7 +196,8 @@ class TestOCIBuildManagerIteration(TestCase):
"umount-chroot",
"--backend=lxd",
"--series=xenial",
- "--arch=i386",
+ "--abi-tag=i386",
+ "--isa-tag=i386",
self.buildid,
]
self.assertEqual(OCIBuildState.UMOUNT, self.getState())
@@ -254,7 +257,8 @@ class TestOCIBuildManagerIteration(TestCase):
"scan-for-processes",
"--backend=lxd",
"--series=xenial",
- "--arch=i386",
+ "--abi-tag=i386",
+ "--isa-tag=i386",
self.buildid,
]
self.assertEqual(OCIBuildState.BUILD_OCI, self.getState())
@@ -308,7 +312,8 @@ class TestOCIBuildManagerIteration(TestCase):
"umount-chroot",
"--backend=lxd",
"--series=xenial",
- "--arch=i386",
+ "--abi-tag=i386",
+ "--isa-tag=i386",
self.buildid,
]
self.assertEqual(OCIBuildState.UMOUNT, self.getState())
diff --git a/lpbuildd/tests/test_rock.py b/lpbuildd/tests/test_rock.py
index c58cee6..ee65642 100644
--- a/lpbuildd/tests/test_rock.py
+++ b/lpbuildd/tests/test_rock.py
@@ -75,7 +75,8 @@ class TestRockBuildManagerIteration(TestCase):
"build-rock",
"--backend=lxd",
"--series=xenial",
- "--arch=i386",
+ "--abi-tag=i386",
+ "--isa-tag=i386",
self.buildid,
]
if options is not None:
@@ -129,7 +130,8 @@ class TestRockBuildManagerIteration(TestCase):
"scan-for-processes",
"--backend=lxd",
"--series=xenial",
- "--arch=i386",
+ "--abi-tag=i386",
+ "--isa-tag=i386",
self.buildid,
]
@@ -156,7 +158,8 @@ class TestRockBuildManagerIteration(TestCase):
"umount-chroot",
"--backend=lxd",
"--series=xenial",
- "--arch=i386",
+ "--abi-tag=i386",
+ "--isa-tag=i386",
self.buildid,
]
self.assertEqual(RockBuildState.UMOUNT, self.getState())
@@ -202,7 +205,8 @@ class TestRockBuildManagerIteration(TestCase):
"scan-for-processes",
"--backend=lxd",
"--series=xenial",
- "--arch=i386",
+ "--abi-tag=i386",
+ "--isa-tag=i386",
self.buildid,
]
@@ -229,7 +233,8 @@ class TestRockBuildManagerIteration(TestCase):
"umount-chroot",
"--backend=lxd",
"--series=xenial",
- "--arch=i386",
+ "--abi-tag=i386",
+ "--isa-tag=i386",
self.buildid,
]
self.assertEqual(RockBuildState.UMOUNT, self.getState())
diff --git a/lpbuildd/tests/test_snap.py b/lpbuildd/tests/test_snap.py
index d234183..b713878 100644
--- a/lpbuildd/tests/test_snap.py
+++ b/lpbuildd/tests/test_snap.py
@@ -83,7 +83,8 @@ class TestSnapBuildManagerIteration(TestCase):
"buildsnap",
"--backend=lxd",
"--series=xenial",
- "--arch=i386",
+ "--abi-tag=i386",
+ "--isa-tag=i386",
self.buildid,
]
if options is not None:
@@ -146,7 +147,8 @@ class TestSnapBuildManagerIteration(TestCase):
"scan-for-processes",
"--backend=lxd",
"--series=xenial",
- "--arch=i386",
+ "--abi-tag=i386",
+ "--isa-tag=i386",
self.buildid,
]
self.assertEqual(SnapBuildState.BUILD_SNAP, self.getState())
@@ -172,7 +174,8 @@ class TestSnapBuildManagerIteration(TestCase):
"umount-chroot",
"--backend=lxd",
"--series=xenial",
- "--arch=i386",
+ "--abi-tag=i386",
+ "--isa-tag=i386",
self.buildid,
]
self.assertEqual(SnapBuildState.UMOUNT, self.getState())
@@ -217,7 +220,8 @@ class TestSnapBuildManagerIteration(TestCase):
"scan-for-processes",
"--backend=lxd",
"--series=xenial",
- "--arch=i386",
+ "--abi-tag=i386",
+ "--isa-tag=i386",
self.buildid,
]
self.assertEqual(SnapBuildState.BUILD_SNAP, self.getState())
@@ -244,7 +248,8 @@ class TestSnapBuildManagerIteration(TestCase):
"umount-chroot",
"--backend=lxd",
"--series=xenial",
- "--arch=i386",
+ "--abi-tag=i386",
+ "--isa-tag=i386",
self.buildid,
]
self.assertEqual(SnapBuildState.UMOUNT, self.getState())
@@ -295,7 +300,8 @@ class TestSnapBuildManagerIteration(TestCase):
"scan-for-processes",
"--backend=lxd",
"--series=xenial",
- "--arch=i386",
+ "--abi-tag=i386",
+ "--isa-tag=i386",
self.buildid,
]
self.assertEqual(SnapBuildState.BUILD_SNAP, self.getState())
@@ -322,7 +328,8 @@ class TestSnapBuildManagerIteration(TestCase):
"umount-chroot",
"--backend=lxd",
"--series=xenial",
- "--arch=i386",
+ "--abi-tag=i386",
+ "--isa-tag=i386",
self.buildid,
]
self.assertEqual(SnapBuildState.UMOUNT, self.getState())
@@ -367,7 +374,8 @@ class TestSnapBuildManagerIteration(TestCase):
"scan-for-processes",
"--backend=lxd",
"--series=xenial",
- "--arch=i386",
+ "--abi-tag=i386",
+ "--isa-tag=i386",
self.buildid,
]
self.assertEqual(SnapBuildState.BUILD_SNAP, self.getState())
@@ -394,7 +402,8 @@ class TestSnapBuildManagerIteration(TestCase):
"umount-chroot",
"--backend=lxd",
"--series=xenial",
- "--arch=i386",
+ "--abi-tag=i386",
+ "--isa-tag=i386",
self.buildid,
]
self.assertEqual(SnapBuildState.UMOUNT, self.getState())
@@ -442,7 +451,8 @@ class TestSnapBuildManagerIteration(TestCase):
"scan-for-processes",
"--backend=lxd",
"--series=xenial",
- "--arch=i386",
+ "--abi-tag=i386",
+ "--isa-tag=i386",
self.buildid,
]
self.assertEqual(SnapBuildState.BUILD_SNAP, self.getState())
@@ -482,7 +492,8 @@ class TestSnapBuildManagerIteration(TestCase):
"umount-chroot",
"--backend=lxd",
"--series=xenial",
- "--arch=i386",
+ "--abi-tag=i386",
+ "--isa-tag=i386",
self.buildid,
]
self.assertEqual(SnapBuildState.UMOUNT, self.getState())
@@ -535,7 +546,8 @@ class TestSnapBuildManagerIteration(TestCase):
"scan-for-processes",
"--backend=lxd",
"--series=xenial",
- "--arch=i386",
+ "--abi-tag=i386",
+ "--isa-tag=i386",
self.buildid,
]
self.assertEqual(SnapBuildState.BUILD_SNAP, self.getState())
@@ -561,7 +573,8 @@ class TestSnapBuildManagerIteration(TestCase):
"umount-chroot",
"--backend=lxd",
"--series=xenial",
- "--arch=i386",
+ "--abi-tag=i386",
+ "--isa-tag=i386",
self.buildid,
]
self.assertEqual(SnapBuildState.UMOUNT, self.getState())
@@ -608,7 +621,8 @@ class TestSnapBuildManagerIteration(TestCase):
"scan-for-processes",
"--backend=lxd",
"--series=xenial",
- "--arch=i386",
+ "--abi-tag=i386",
+ "--isa-tag=i386",
self.buildid,
]
self.assertEqual(SnapBuildState.BUILD_SNAP, self.getState())
@@ -635,7 +649,8 @@ class TestSnapBuildManagerIteration(TestCase):
"umount-chroot",
"--backend=lxd",
"--series=xenial",
- "--arch=i386",
+ "--abi-tag=i386",
+ "--isa-tag=i386",
self.buildid,
]
self.assertEqual(SnapBuildState.UMOUNT, self.getState())
@@ -678,7 +693,8 @@ class TestSnapBuildManagerIteration(TestCase):
"scan-for-processes",
"--backend=lxd",
"--series=xenial",
- "--arch=i386",
+ "--abi-tag=i386",
+ "--isa-tag=i386",
self.buildid,
]
self.assertEqual(SnapBuildState.BUILD_SNAP, self.getState())
@@ -704,7 +720,8 @@ class TestSnapBuildManagerIteration(TestCase):
"umount-chroot",
"--backend=lxd",
"--series=xenial",
- "--arch=i386",
+ "--abi-tag=i386",
+ "--isa-tag=i386",
self.buildid,
]
self.assertEqual(SnapBuildState.UMOUNT, self.getState())
@@ -975,7 +992,8 @@ class TestSnapBuildManagerIteration(TestCase):
"scan-for-processes",
"--backend=lxd",
"--series=xenial",
- "--arch=i386",
+ "--abi-tag=i386",
+ "--isa-tag=i386",
self.buildid,
]
self.assertEqual(SnapBuildState.BUILD_SNAP, self.getState())
@@ -1001,7 +1019,8 @@ class TestSnapBuildManagerIteration(TestCase):
"umount-chroot",
"--backend=lxd",
"--series=xenial",
- "--arch=i386",
+ "--abi-tag=i386",
+ "--isa-tag=i386",
self.buildid,
]
self.assertEqual(SnapBuildState.UMOUNT, self.getState())
diff --git a/lpbuildd/tests/test_sourcepackagerecipe.py b/lpbuildd/tests/test_sourcepackagerecipe.py
index 07490a3..2e3e4b1 100644
--- a/lpbuildd/tests/test_sourcepackagerecipe.py
+++ b/lpbuildd/tests/test_sourcepackagerecipe.py
@@ -169,7 +169,8 @@ class TestSourcePackageRecipeBuildManagerIteration(TestCase):
"scan-for-processes",
"--backend=chroot",
"--series=maverick",
- "--arch=i386",
+ "--abi-tag=i386",
+ "--isa-tag=i386",
self.buildid,
]
self.assertEqual(
@@ -198,7 +199,8 @@ class TestSourcePackageRecipeBuildManagerIteration(TestCase):
"umount-chroot",
"--backend=chroot",
"--series=maverick",
- "--arch=i386",
+ "--abi-tag=i386",
+ "--isa-tag=i386",
self.buildid,
]
self.assertEqual(SourcePackageRecipeBuildState.UMOUNT, self.getState())
@@ -230,7 +232,8 @@ class TestSourcePackageRecipeBuildManagerIteration(TestCase):
"scan-for-processes",
"--backend=chroot",
"--series=maverick",
- "--arch=i386",
+ "--abi-tag=i386",
+ "--isa-tag=i386",
self.buildid,
]
self.assertEqual(
@@ -253,7 +256,8 @@ class TestSourcePackageRecipeBuildManagerIteration(TestCase):
"umount-chroot",
"--backend=chroot",
"--series=maverick",
- "--arch=i386",
+ "--abi-tag=i386",
+ "--isa-tag=i386",
self.buildid,
]
self.assertEqual(SourcePackageRecipeBuildState.UMOUNT, self.getState())
@@ -281,7 +285,8 @@ class TestSourcePackageRecipeBuildManagerIteration(TestCase):
"scan-for-processes",
"--backend=chroot",
"--series=maverick",
- "--arch=i386",
+ "--abi-tag=i386",
+ "--isa-tag=i386",
self.buildid,
]
self.assertEqual(
@@ -302,7 +307,8 @@ class TestSourcePackageRecipeBuildManagerIteration(TestCase):
"umount-chroot",
"--backend=chroot",
"--series=maverick",
- "--arch=i386",
+ "--abi-tag=i386",
+ "--isa-tag=i386",
self.buildid,
]
self.assertEqual(SourcePackageRecipeBuildState.UMOUNT, self.getState())
diff --git a/lpbuildd/tests/test_translationtemplatesbuildmanager.py b/lpbuildd/tests/test_translationtemplatesbuildmanager.py
index 6dfa695..8c4e14c 100644
--- a/lpbuildd/tests/test_translationtemplatesbuildmanager.py
+++ b/lpbuildd/tests/test_translationtemplatesbuildmanager.py
@@ -87,7 +87,8 @@ class TestTranslationTemplatesBuildManagerIteration(TestCase):
"generate-translation-templates",
"--backend=chroot",
"--series=xenial",
- "--arch=i386",
+ "--abi-tag=i386",
+ "--isa-tag=i386",
self.buildid,
"--branch",
url,
@@ -114,7 +115,8 @@ class TestTranslationTemplatesBuildManagerIteration(TestCase):
"scan-for-processes",
"--backend=chroot",
"--series=xenial",
- "--arch=i386",
+ "--abi-tag=i386",
+ "--isa-tag=i386",
self.buildid,
]
self.assertEqual(
@@ -144,7 +146,8 @@ class TestTranslationTemplatesBuildManagerIteration(TestCase):
"umount-chroot",
"--backend=chroot",
"--series=xenial",
- "--arch=i386",
+ "--abi-tag=i386",
+ "--isa-tag=i386",
self.buildid,
]
self.assertEqual(
@@ -181,7 +184,8 @@ class TestTranslationTemplatesBuildManagerIteration(TestCase):
"scan-for-processes",
"--backend=chroot",
"--series=xenial",
- "--arch=i386",
+ "--abi-tag=i386",
+ "--isa-tag=i386",
self.buildid,
]
self.assertEqual(expected_command, self.buildmanager.commands[-1])
@@ -201,7 +205,8 @@ class TestTranslationTemplatesBuildManagerIteration(TestCase):
"umount-chroot",
"--backend=chroot",
"--series=xenial",
- "--arch=i386",
+ "--abi-tag=i386",
+ "--isa-tag=i386",
self.buildid,
]
self.assertEqual(expected_command, self.buildmanager.commands[-1])
@@ -231,7 +236,8 @@ class TestTranslationTemplatesBuildManagerIteration(TestCase):
"scan-for-processes",
"--backend=chroot",
"--series=xenial",
- "--arch=i386",
+ "--abi-tag=i386",
+ "--isa-tag=i386",
self.buildid,
]
self.assertEqual(
@@ -254,7 +260,8 @@ class TestTranslationTemplatesBuildManagerIteration(TestCase):
"umount-chroot",
"--backend=chroot",
"--series=xenial",
- "--arch=i386",
+ "--abi-tag=i386",
+ "--isa-tag=i386",
self.buildid,
]
self.assertEqual(expected_command, self.buildmanager.commands[-1])
