Merge branch 'more-chroots' into 'master'

Allow to build custom chroot

See merge request Librem5/ansible-librem!13

README.md

@@ -24,7 +24,7 @@ Deploy
 ------
 To deploy e.g. the jenkins master user:
 ```
-$ ansible-playbook -i ./inventory.yml ./playbook.yml -s --check -l jenkinsmaster
+$ ansible-playbook -i ./inventory.yml ./playbook.yml -s --check -l jenkinsmaster --diff
 ```
 If everything looks o.k. rerun without *--check*.
 

install_jenkins.yml

@@ -33,20 +33,23 @@
       certbot_create_method: standalone
       certbot_create_standalone_stop_services:
         - nginx
+    - role: gbp_keyrings
+      gbp_pbuilder_keyrings:
+        - key: /DATA/aptly/public/ci-repo.key
+          keyring: ci-repo
+      tags:
+        - gbp_keyrings
     - role: gbp
       gbp_cowbuilder_targets:
-        - dist: sid
         - dist: buster
-        - dist: stretch
-        - dist: sid
-          arch: armhf
-          foreign: true
         - dist: buster
-          arch: armhf
-          foreign: true
+          autoconf: False
+          basepath: /var/cache/pbuilder/base-buster+ci.cow
+          pbuilder_options: "--dist=buster --keyring=/etc/pbuilder/keyrings/ci-repo.gpg --othermirror='deb http://ci.puri.sm/ plamoci librem5'"
         - dist: buster
-          arch: amd64
-          foreign: true
+          autoconf: False
+          basepath: /var/cache/pbuilder/base-buster+plamo.cow
+          pbuilder_options: "--dist=buster --keyring=/etc/pbuilder/keyrings/ci-repo.gpg --othermirror='deb http://ci.puri.sm/ plamoci librem5'"
       tags:
         - gbp
     - role: scratchrepo

requirements.yml

@@ -4,5 +4,6 @@
 - src: geerlingguy.certbot
   version: 3.0.0
 
-- src: agx.gbp
-  version: 0.0.1
+- src: git+https://github.com/agx/ansible-role-gbp.git
+  name: agx.gbp
+  version: 662e19bcb93e6ffef7f403644183cc2955cbc4f4

roles/gbp_keyrings/tasks/main.yml

+- name: Ensure gpg is installed
+  apt:
+    name: gpg
+    state: latest
+
+- set_fact:
+    pbuilder_keyring_dir: /etc/pbuilder/keyrings
+
+- name: Ensure keyring directory
+  file:
+     name: /etc/pbuilder/keyrings
+     state: directory
+
+- name: Create a GPG keyring from a key
+  shell: >
+     gpg --no-options                   \
+         --no-default-keyring           \
+         --no-auto-check-trustdb        \
+         --trustdb-name ./trustdb.gpg   \
+         --no-keyring                   \
+         --import-options import-export \
+         --import                       \
+         < {{ item.key }}               \
+         > {{ pbuilder_keyring_dir}}/{{ item.keyring }}.gpg
+  args:
+    creates: "{{ pbuilder_keyring_dir}}/{{ item.keyring }}.gpg"
+  with_items:
+     "{{ gbp_pbuilder_keyrings }}"