canonical-ubuntu-qa team mailing list archive

[Tim Andersson <mp+456171@xxxxxxxxxxxxxxxxxx>]

Tim Andersson has proposed merging ~andersson123/autopkgtest-cloud:update-deps-mojo-run-move-pkgs-to-basic into autopkgtest-cloud:master.

Requested reviews:
  Canonical's Ubuntu QA (canonical-ubuntu-qa)

For more details, see:
https://code.launchpad.net/~andersson123/autopkgtest-cloud/+git/autopkgtest-cloud/+merge/456171
-- 
Your team Canonical's Ubuntu QA is requested to review the proposed merge of ~andersson123/autopkgtest-cloud:update-deps-mojo-run-move-pkgs-to-basic into autopkgtest-cloud:master.

diff --git a/charms/focal/autopkgtest-cloud-worker/layer.yaml b/charms/focal/autopkgtest-cloud-worker/layer.yaml
index 4aeb04d..692d9af 100644
--- a/charms/focal/autopkgtest-cloud-worker/layer.yaml
+++ b/charms/focal/autopkgtest-cloud-worker/layer.yaml
@@ -10,9 +10,6 @@ options:
       - gir1.2-glib-2.0
       - python3-gi
       - python3-pygit2
-    include_system_packages: true
-  apt:
-    packages:
       - bsd-mailx
       - dctrl-tools
       - distro-info
@@ -32,3 +29,4 @@ options:
       - python3-openstackclient
       - python3-swiftclient
       - ssmtp
+    include_system_packages: true
diff --git a/charms/focal/autopkgtest-web/layer.yaml b/charms/focal/autopkgtest-web/layer.yaml
index 1afa35d..5c81bdb 100644
--- a/charms/focal/autopkgtest-web/layer.yaml
+++ b/charms/focal/autopkgtest-web/layer.yaml
@@ -6,7 +6,7 @@ includes:
   - 'interface:rabbitmq'
   - 'interface:apache-website'
 options:
-  apt:
+  basic:
     packages:
       - amqp-tools
       - distro-info
@@ -21,3 +21,4 @@ options:
       - python3-flask-openid
       - python3-swiftclient
       - python3-werkzeug
+    include_system_packages: true