update spread tests

canonical · Aug 3, 2023 · 0c11ac4 · 0c11ac4
1 parent 4a694e6
commit 0c11ac4
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 11 deletions.
diff --git a/tests/spread/core22/package-repo-archs/armhf.yaml b/tests/spread/core22/package-repo-archs/armhf.yaml
@@ -17,15 +17,15 @@ package-repositories:
     suites: [jammy]
     key-id: F23C5A6CF475977595C89F51BA6932366A755776
     url: https://ppa.launchpadcontent.net/deadsnakes/ppa/ubuntu
-  # Also add the armhf arch for the "ports" repo, to fetch python's deps
+  # Also add the armhf arch for the "ports" repo, to fetch python's deps. We
+  # need to do this because the default archives don't have armhf.
   - type: apt
     architectures: [ armhf ]
     components: [ main ]
     suites: [ jammy, jammy-security, jammy-updates ]
     key-id: F6ECB3762474EDA9D21B7022871920D1991BC93C
     url: http://ports.ubuntu.com/ubuntu-ports
 
-
 parts:
   mypart:
     plugin: nil

diff --git a/tests/spread/core22/package-repo-archs/i386.yaml b/tests/spread/core22/package-repo-archs/i386.yaml
@@ -17,15 +17,9 @@ package-repositories:
     suites: [jammy]
     key-id: F23C5A6CF475977595C89F51BA6932366A755776
     url: https://ppa.launchpadcontent.net/deadsnakes/ppa/ubuntu
-  # Also add the i386 arch for the official archives, to fetch python's deps
-  - type: apt
-    architectures: [i386]
-    key-id: F6ECB3762474EDA9D21B7022871920D1991BC93C
-    key-server: keyserver.ubuntu.com
-    formats: [deb]
-    components: [main]
-    suites: [jammy]
-    url: https://archive.ubuntu.com/ubuntu
+  # We don't need to add the i386 architecture for the official archives,
+  # because the host building this (amd64) is compatible and so we'll add the
+  # i386 platform "globally".
 
 parts:
   mypart: