Merge branch 'main' into sgmoore/update_content_version

canonical · Mar 25, 2023 · 3c81696 · 3c81696
2 parents 7cc0a37 + 71ed1a3
commit 3c81696
Show file tree

Hide file tree

Showing 8 changed files with 76 additions and 10 deletions.
diff --git a/requirements-devel.txt b/requirements-devel.txt
@@ -11,7 +11,7 @@ click==8.1.3
 codespell==2.2.2
 colorama==0.4.6
 coverage==7.0.4
-craft-archives==0.0.1
+craft-archives==0.0.3
 craft-cli==1.2.0
 craft-grammar==1.1.1
 craft-parts==1.18.3

diff --git a/requirements.txt b/requirements.txt
@@ -5,7 +5,7 @@ cffi==1.15.1
 chardet==5.1.0
 charset-normalizer==2.1.1
 click==8.1.3
-craft-archives==0.0.1
+craft-archives==0.0.3
 craft-cli==1.2.0
 craft-grammar==1.1.1
 craft-parts==1.18.3

diff --git a/setup.py b/setup.py
@@ -96,7 +96,7 @@ def recursive_data_files(directory, install_directory):
 install_requires = [
     "attrs",
     "click",
-    "craft-archives==0.0.1",
+    "craft-archives==0.0.3",
     "craft-cli",
     "craft-grammar",
     "craft-parts",

diff --git a/tests/spread/core22/package-repositories/task.yaml b/tests/spread/core22/package-repositories/task.yaml
@@ -5,15 +5,14 @@ environment:
   SNAP/test_apt_key_name: test-apt-key-name
   SNAP/test_apt_keyserver: test-apt-keyserver
   SNAP/test_apt_ppa: test-apt-ppa
+  SNAP/test_pin: test-pin
   SNAPCRAFT_BUILD_ENVIRONMENT: ""
 
 restore: |
   cd "$SNAP"
   rm -f ./*.snap
   snapcraft clean
   snapcraft clean --destructive-mode
-  ls -l /etc/apt/sources.list.d/
-  rm /etc/apt/sources.list.d/snapcraft-*
   snap remove "${SNAP}"
 
 execute: |

diff --git a/tests/spread/core22/package-repositories/test-pin/snap/keys/FC42E99D.asc b/tests/spread/core22/package-repositories/test-pin/snap/keys/FC42E99D.asc
@@ -0,0 +1,29 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+xsFNBFRt70cBEADH/8JgKzFnwQQqtllZ3nqxYQ1cZguLCbyu9s1AwRDNu0P2oWOR
+UN9YoUS15kuWtTuneVlLbdbda3N/S/HApvOWu7Q1oIrRRkpO4Jv4xN+1KaSpaTy1
+vG+HepH1D0tCSV0dmbX0S07yd0Ml7o4gMx2svBXeX41RHzjwCNkMUQJGuMF/w0hC
+/Wqz6Sbki6QcqQx+YAjwVyUU1KdDRlm9efelQOskDwdr1j9Vk6ky8q+p29dEX5q2
+FApKnwJb7YPwgRDMT/kCMJzHpLxW9Zj0OLkY4epADRi+eNiMblJsWRULs5l7T5oj
+yEaXFrGHzOi2HaxidUTUUro2Mb0qZUXRYoEnZV0ntmFxUPIS75sFapJdRbLF0mqy
+aMFe9PtmKyFOJXC/MfMaqhMxChWRZm0f8d12zDcVe5LTnVgZaeYr+vPnhqRaDI7w
+WZBtCdeMGd4BLa1b3fwY0id2Ti6egFbJzVu2v4GGojBTRkZmlw+Srdzm3w9FA/oj
+mAQV/R7snK6bc2o9gtIvPGlZceUTSOtySwlOBCd50YpL2K4GdT1GlEm/DAPSPAWP
+Zn9gtZOe8XLxyWd2Qca/NTU0sYeG5xdQGes7pdHz9Mqb0vN14ojE8VdqS8qZx74v
+qhnN3+xJ7BDNOjAjjhOAcn1mulX4N9u/WlUw7O67Ht5V/8ODwVTh2L3lLQARAQAB
+zSNMYXVuY2hwYWQgUFBBIGZvciBTbmFwcHkgRGV2ZWxvcGVyc8LBeAQTAQIAIgUC
+VG3vRwIbAwYLCQgHAwIGFQgCCQoLBBYCAwECHgECF4AACgkQ8YMd2vxC6Z2y1RAA
+w7jFWZomYHUkUmm0FNEeRko6kv5iDNGqQXpp0JaZz06kC3dW7vjE3kNgwmgMdcA+
+/a+Jgf3ii8AHyplUQXuopHAXvZyz6YS6r17B2TuKt47MtMkWSk56UZ6av0VnE1Ms
+yf6FeBEtQwojLW7ZHNZPq0BlwcvK3/H+qNHitDaIdCmCDDu9mwuerd0ZoNwbW0A1
+RPPl+Jw3uJ+tZWBAkJV+5dGzT/FJlCL28NjywktGjduhGE2nM5Q/Kd0S+kovwf9q
+wmPMF8BLwUwshZoHKjLmalu08DzoyO6Bfcl6SThlO1iHoSayFnP6hJZeWkTaF/L+
+Uzbbfnjz+fWAutUoZSxHsK50VfykqgUiG9t7Kv4q5B/3s7X42O4270yEc4OSZM+Y
+Ij3EOKWCgHkR3YH9/wk3w1jPiVKjO+jfZnX7FV77vVxbsR/+ibzEPEo51nWcp64q
+bBf+bSSGotGv5ef6ETWw4k0cOF9Dws/zmLs9g9CYpuv5DG5d/pvSUKVmqcb2iEc2
+bymJDuKD3kE9MNCqdtnCbwVUpyRauzKhjzY8vmYlFzhlJB5WU0tR6VMMQZNcmXst
+1T/RVTcIlXZUYfgbUwvPX6SOLERX1do9vtbD+XvWAYQ/J7G4knHRtf5RpiW1xQkp
+FSbrQ9ACQFlqN49Ogbl47J6TZ7BrjDpROote55ixmrU=
+=PEEJ
+-----END PGP PUBLIC KEY BLOCK-----
+
diff --git a/tests/spread/core22/package-repositories/test-pin/snap/snapcraft.yaml b/tests/spread/core22/package-repositories/test-pin/snap/snapcraft.yaml
@@ -0,0 +1,30 @@
+name: test-pin
+version: '1.0'
+summary: test
+description: test
+grade: stable
+confinement: strict
+base: core22
+
+parts:
+  test-ppa:
+    plugin: nil
+    stage-packages:
+      - test-ppa
+    override-build: |
+      apt-cache policy test-ppa
+      apt-cache policy test-ppa | grep -F "999 http://ppa.launchpad.net/snappy-dev/snapcraft-daily/ubuntu"
+      craftctl default
+
+package-repositories:
+  - type: apt
+    formats: [deb, deb-src]
+    components: [main]
+    suites: [focal]
+    key-id: 78E1918602959B9C59103100F1831DDAFC42E99D
+    url: http://ppa.launchpad.net/snappy-dev/snapcraft-daily/ubuntu
+    priority: 999
+
+apps:
+    test-ppa:
+      command: usr/bin/test-ppa
diff --git a/tests/spread/tools/restore.sh b/tests/spread/tools/restore.sh
@@ -1,10 +1,12 @@
 #!/bin/sh -e
 
-# Remove any snapcraft-configured apt GPG keys.
-rm -f /etc/apt/trusted.gpg.d/snapcraft.gpg
-
-# Remove any snapcraft-configured apt sources.
-rm -f /etc/apt/sources.list.d/snapcraft-*
+# Remove any snapcraft-configured apt keys and sources.
+# Remove keyrings
+rm -f /etc/apt/keyrings/craft-*
+# Remove repo source files
+rm -f /etc/apt/sources.list.d/craft-*
+# Remove pin preferences
+rm -f /etc/apt/preferences.d/craft-archives
 
 # Remove all auto-installed packages
 apt-get autoremove --purge -y

diff --git a/tests/unit/parts/test_parts.py b/tests/unit/parts/test_parts.py
@@ -214,6 +214,9 @@ def test_parts_lifecycle_initialize_with_package_repositories_deps_not_installed
         "craft_archives.repo.apt_sources_manager."
         "AptSourcesManager.install_package_repository_sources"
     )
+    mocker.patch(
+        "craft_archives.repo.apt_preferences_manager.AptPreferencesManager.write"
+    )
     mocker.patch("craft_parts.packages.Repository.refresh_packages_list")
 
     parts_lifecycle = PartsLifecycle(
@@ -266,6 +269,9 @@ def test_parts_lifecycle_initialize_with_package_repositories_deps_installed(
         "craft_archives.repo.apt_sources_manager."
         "AptSourcesManager.install_package_repository_sources"
     )
+    mocker.patch(
+        "craft_archives.repo.apt_preferences_manager.AptPreferencesManager.write"
+    )
     mocker.patch("craft_parts.packages.Repository.refresh_packages_list")
 
     parts_lifecycle = PartsLifecycle(