setup f24 and branched compose mock configs

install pungi and compose-utils on compose boxes

Signed-off-by: Dennis Gilmore <ausil@fedoraproject.org>

roles/releng/tasks/main.yml

@@ -43,6 +43,13 @@
 - name: add masher koji ca upload cert
   copy: src="{{ private }}/files/koji/buildercerts/fedora-ca.cert" dest=/home/masher/.fedora-upload-ca.cert
 
+- name: add releng koji cert/key
+  copy: src="{{ private }}/files/releng_key_and_cert.pem" dest=/root/.fedora.cert mode=600 owner=root group=root
+- name: add masher koji ca cert
+  copy: src="{{ private }}/files/koji/buildercerts/fedora-ca.cert" dest=/root/.fedora-server-ca.cert
+- name: add masher koji ca upload cert
+  copy: src="{{ private }}/files/koji/buildercerts/fedora-ca.cert" dest=/root/.fedora-upload-ca.cert
+
 - name: add koji ca cert to central system ca-trust
   copy: src="{{ private }}/files/koji/buildercerts/fedora-ca.cert" dest=/etc/pki/ca-trust/source/anchors/fedora-server-ca.cert
 - name: update ca-trust
@@ -96,6 +103,8 @@
     - createrepo
     - pykickstart
     - pyliblzma
+    - pungi
+    - compose-utils
     - httpd
   when: ansible_distribution_major_version|int > 21
 
@@ -111,18 +120,22 @@
   with_items:
     - fedora-22-compose-armhfp.cfg
     - fedora-23-compose-armhfp.cfg
+    - fedora-24-compose-armhfp.cfg
     - fedora-branched-compose-armhfp.cfg
     - fedora-rawhide-compose-armhfp.cfg
     - fedora-22-compose-i386.cfg
     - fedora-23-compose-i386.cfg
+    - fedora-24-compose-i386.cfg
     - fedora-branched-compose-i386.cfg
     - fedora-rawhide-compose-i386.cfg
     - fedora-22-compose-x86_64.cfg
     - fedora-23-compose-x86_64.cfg
+    - fedora-24-compose-x86_64.cfg
     - fedora-branched-compose-x86_64.cfg
     - fedora-rawhide-compose-x86_64.cfg
     - fedora-22-compose-aarch64.cfg
     - fedora-23-compose-aarch64.cfg
+    - fedora-24-compose-aarch64.cfg
     - fedora-branched-compose-aarch64.cfg
     - fedora-rawhide-compose-aarch64.cfg
 

roles/releng/templates/fedora-24-compose-aarch64.cfg

@@ -0,0 +1,35 @@
+config_opts['root'] = 'fedora-24-compose-aarch64'
+config_opts['target_arch'] = 'aarch64'
+config_opts['chroot_setup_cmd'] = 'install @buildsys-build vim-enhanced pungi'
+config_opts['dist'] = 'fc16'  # only useful for --resultdir variable subst
+config_opts['plugin_conf']['root_cache_enable'] = False
+config_opts['internal_dev_setup'] = False
+config_opts['plugin_conf']['bind_mount_opts']['dirs'].append(('/dev', '/dev' ))
+config_opts['plugin_conf']['bind_mount_opts']['dirs'].append(('/mnt/koji', '/mnt/koji' ))
+
+
+config_opts['yum.conf'] = """
+[main]
+cachedir=/var/cache/yum
+debuglevel=2
+reposdir=/dev/null
+logfile=/var/log/yum.log
+retries=20
+obsoletes=1
+gpgcheck=0
+assumeyes=1
+
+# repos
+
+[fedora]
+name=fedora
+baseurl=https://{{kojipkgs_url}}/compose/branched/latest-Fedora-/compose/Everything/aarch64/os
+enabled=1
+cost=5000
+
+[static]
+name=static
+baseurl=https://{{kojipkgs_url}}/repos/f24-build/latest/aarch64
+enabled=1
+#cost=2000
+"""

roles/releng/templates/fedora-24-compose-armhfp.cfg

@@ -0,0 +1,38 @@
+config_opts['root'] = 'fedora-24-compose-armhfp'
+config_opts['target_arch'] = 'armv7hl'
+config_opts['chroot_setup_cmd'] = 'install @buildsys-build vim-enhanced pungi uboot-tools'
+config_opts['dist'] = 'fc16'  # only useful for --resultdir variable subst
+config_opts['plugin_conf']['root_cache_enable'] = False
+config_opts['internal_dev_setup'] = False
+config_opts['plugin_conf']['bind_mount_opts']['dirs'].append(('/srv/pungi', '/srv/pungi' ))
+config_opts['plugin_conf']['bind_mount_opts']['dirs'].append(('/dev', '/dev' ))
+config_opts['plugin_conf']['bind_mount_opts']['dirs'].append(('/mnt/koji', '/mnt/koji' ))
+config_opts['plugin_conf']['bind_mount_opts']['dirs'].append(('/mnt/fedora_koji', '/mnt/fedora_koji' ))
+config_opts['plugin_conf']['bind_mount_opts']['dirs'].append(('/pub/fedora', '/pub/fedora' ))
+
+
+config_opts['yum.conf'] = """
+[main]
+cachedir=/var/cache/yum
+debuglevel=2
+reposdir=/dev/null
+logfile=/var/log/yum.log
+retries=20
+obsoletes=1
+gpgcheck=0
+assumeyes=1
+
+# repos
+
+[fedora]
+name=fedora
+baseurl=https://{{kojipkgs_url}}/compose/branched/latest-Fedora-/compose/Everything/armhfp/os
+enabled=1
+cost=5000
+
+[static]
+name=static
+baseurl=https://{{kojipkgs_url}}/repos/f24-build/latest/armhfp
+enabled=1
+#cost=2000
+"""

roles/releng/templates/fedora-24-compose-i386.cfg

@@ -0,0 +1,38 @@
+config_opts['root'] = 'fedora-24-compose-i386'
+config_opts['target_arch'] = 'i386'
+config_opts['chroot_setup_cmd'] = 'install @buildsys-build vim-enhanced pungi'
+config_opts['dist'] = 'fc16'  # only useful for --resultdir variable subst
+config_opts['plugin_conf']['root_cache_enable'] = False
+config_opts['internal_dev_setup'] = False
+config_opts['plugin_conf']['bind_mount_opts']['dirs'].append(('/srv/pungi', '/srv/pungi' ))
+config_opts['plugin_conf']['bind_mount_opts']['dirs'].append(('/dev', '/dev' ))
+config_opts['plugin_conf']['bind_mount_opts']['dirs'].append(('/mnt/koji', '/mnt/koji' ))
+config_opts['plugin_conf']['bind_mount_opts']['dirs'].append(('/mnt/fedora_koji', '/mnt/fedora_koji' ))
+config_opts['plugin_conf']['bind_mount_opts']['dirs'].append(('/pub/fedora', '/pub/fedora' ))
+
+
+config_opts['yum.conf'] = """
+[main]
+cachedir=/var/cache/yum
+debuglevel=2
+reposdir=/dev/null
+logfile=/var/log/yum.log
+retries=20
+obsoletes=1
+gpgcheck=0
+assumeyes=1
+
+# repos
+
+[fedora]
+name=fedora
+baseurl=https://{{kojipkgs_url}}/compose/branched/latest-Fedora-/compose/Everything/i386/os
+enabled=1
+cost=5000
+
+[static]
+name=static
+baseurl=https://{{kojipkgs_url}}/repos/f24-build/latest/i386
+enabled=1
+#cost=2000
+"""

roles/releng/templates/fedora-24-compose-x86_64.cfg

@@ -0,0 +1,38 @@
+config_opts['root'] = 'fedora-24-compose-x86_64'
+config_opts['target_arch'] = 'x86_64'
+config_opts['chroot_setup_cmd'] = 'install @buildsys-build vim-enhanced pungi'
+config_opts['dist'] = 'fc16'  # only useful for --resultdir variable subst
+config_opts['plugin_conf']['root_cache_enable'] = False
+config_opts['internal_dev_setup'] = False
+config_opts['plugin_conf']['bind_mount_opts']['dirs'].append(('/srv/pungi', '/srv/pungi' ))
+config_opts['plugin_conf']['bind_mount_opts']['dirs'].append(('/dev', '/dev' ))
+config_opts['plugin_conf']['bind_mount_opts']['dirs'].append(('/mnt/koji', '/mnt/koji' ))
+config_opts['plugin_conf']['bind_mount_opts']['dirs'].append(('/mnt/fedora_koji', '/mnt/fedora_koji' ))
+config_opts['plugin_conf']['bind_mount_opts']['dirs'].append(('/pub/fedora', '/pub/fedora' ))
+
+
+config_opts['yum.conf'] = """
+[main]
+cachedir=/var/cache/yum
+debuglevel=2
+reposdir=/dev/null
+logfile=/var/log/yum.log
+retries=20
+obsoletes=1
+gpgcheck=0
+assumeyes=1
+
+# repos
+
+[fedora]
+name=fedora
+baseurl=https://{{kojipkgs_url}}/compose/branched/latest-Fedora-/compose/Everything/x86_64/os
+enabled=1
+cost=5000
+
+[static]
+name=static
+baseurl=https://{{kojipkgs_url}}/repos/f24-build/latest/x86_64
+enabled=1
+#cost=2000
+"""

roles/releng/templates/fedora-branched-compose-aarch64.cfg

@@ -23,13 +23,13 @@ assumeyes=1
 
 [fedora]
 name=fedora
-baseurl=https://{{kojipkgs_url}}/mash/branched/aarch64/os
+baseurl=https://{{kojipkgs_url}}/compose/branched/latest-Fedora-/compose/Everything/aarch64/os
 enabled=1
 cost=5000
 
 [static]
 name=static
-baseurl=https://{{kojipkgs_url}}/repos/f23-build/latest/aarch64
+baseurl=https://{{kojipkgs_url}}/repos/f24-build/latest/aarch64
 enabled=1
 #cost=2000
 """

roles/releng/templates/fedora-branched-compose-armhfp.cfg

@@ -26,13 +26,13 @@ assumeyes=1
 
 [fedora]
 name=fedora
-baseurl=https://{{kojipkgs_url}}/mash/branched/armhfp/os
+baseurl=https://{{kojipkgs_url}}/compose/branched/latest-Fedora-/compose/Everything/armhfp/os
 enabled=1
 cost=5000
 
 [static]
 name=static
-baseurl=https://{{kojipkgs_url}}/repos/f23-build/latest/armhfp
+baseurl=https://{{kojipkgs_url}}/repos/f24-build/latest/armhfp
 enabled=1
 #cost=2000
 """

roles/releng/templates/fedora-branched-compose-i386.cfg

@@ -26,13 +26,13 @@ assumeyes=1
 
 [fedora]
 name=fedora
-baseurl=https://{{kojipkgs_url}}/mash/branched/i386/os
+baseurl=https://{{kojipkgs_url}}/compose/branched/latest-Fedora-/compose/Everything/i386/os
 enabled=1
 cost=5000
 
 [static]
 name=static
-baseurl=https://{{kojipkgs_url}}/repos/f23-build/latest/i386
+baseurl=https://{{kojipkgs_url}}/repos/f24-build/latest/i386
 enabled=1
 #cost=2000
 """

roles/releng/templates/fedora-branched-compose-x86_64.cfg

@@ -26,13 +26,13 @@ assumeyes=1
 
 [fedora]
 name=fedora
-baseurl=https://{{kojipkgs_url}}/mash/branched/x86_64/os
+baseurl=https://{{kojipkgs_url}}/compose/branched/latest-Fedora-/compose/Everything/x86_64/os
 enabled=1
 cost=5000
 
 [static]
 name=static
-baseurl=https://{{kojipkgs_url}}/repos/f23-build/latest/x86_64
+baseurl=https://{{kojipkgs_url}}/repos/f24-build/latest/x86_64
 enabled=1
 #cost=2000
 """