set proper craft-archives version

requirements-devel.txt

@@ -25,7 +25,7 @@ codespell==2.3.0
 colorama==0.4.6
 coverage==7.6.1
 craft-application==4.2.7
-craft-archives @ git+https://github.com/canonical/craft-archives@work/CRAFT-3538-noble-key-conflict
+craft-archives==2.0.1
 craft-cli==2.7.0
 craft-grammar==2.0.1
 craft-parts==2.1.2

requirements-docs.txt

@@ -20,7 +20,7 @@ charset-normalizer==3.3.2
 click==8.1.7
 colorama==0.4.6
 craft-application==4.2.7
-craft-archives @ git+https://github.com/canonical/craft-archives@work/CRAFT-3538-noble-key-conflict
+craft-archives==2.0.1
 craft-cli==2.7.0
 craft-grammar==2.0.1
 craft-parts==2.1.2

requirements.txt

@@ -8,7 +8,7 @@ chardet==5.2.0
 charset-normalizer==3.3.2
 click==8.1.7
 craft-application==4.2.7
-craft-archives @ git+https://github.com/canonical/craft-archives@work/CRAFT-3538-noble-key-conflict
+craft-archives==2.0.1
 craft-cli==2.7.0
 craft-grammar==2.0.1
 craft-parts==2.1.2

tests/spread/core24/package-repositories/test-key-conflict/snapcraft.yaml

@@ -8,7 +8,7 @@ platforms:
   amd64:
 
 package-repositories:
-  # In core24 this pair of url + suite is already listed in
+  # In core24+ this pair of url + suite is already listed in
   # /etc/apt/sources.list.d/ubuntu.sources. Add it here to make sure this setup
   # is working.
   - type: apt
@@ -18,12 +18,21 @@ package-repositories:
     architectures: [i386]
     key-id: F6ECB3762474EDA9D21B7022871920D1991BC93C
     key-server: keyserver.ubuntu.com
+  # This ports.ubuntu.com repo is not affected by the bug, but add it here to
+  # ensure that a different repo with the same key-id still works.
+  - type: apt
+    url: http://ports.ubuntu.com/ubuntu-ports
+    suites: [noble]
+    architectures: [armhf]
+    components: [main]
+    key-id: F6ECB3762474EDA9D21B7022871920D1991BC93C
 
 parts:
   mypart:
     plugin: nil
     stage-packages:
       - zlib1g:i386 # To ensure the package-repo is setup correctly
+      - zlib1g:armhf
       - hello       # there is no hello:i386 in the archives
 
 apps: