summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFabien Boucher <fboucher@redhat.com>2020-02-26 22:45:37 +0100
committerFabien Boucher <fboucher@redhat.com>2020-02-26 22:47:46 +0100
commit30b06a7e89989f35048057f7c00fbda3bb9c8c58 (patch)
tree786af7cc8a50995a27a36fc4427636f973208647
parentd49258287e0b296d5d5c66de2996c252c3067d99 (diff)
Use dib-cmd for cloud-fedora-rawhide
- Also re-import extra packages list from the cloud-fedora-rawhide from virt-customize dib element. - Remove the cloud-fedora-rawhide from virt-customize dib element. Follow-up changes will be done to fully migrate to dib-cmd. Change-Id: I74b75485a307664b75db966dd20bc3676b1c439e
-rw-r--r--nodepool/elements/virt-customize/fedora-rawhide-cloud.yaml66
-rw-r--r--nodepool/rdo-cloud.yaml9
-rw-r--r--nodepool/virt_images/cloud-fedora-rawhide.yaml27
3 files changed, 28 insertions, 74 deletions
diff --git a/nodepool/elements/virt-customize/fedora-rawhide-cloud.yaml b/nodepool/elements/virt-customize/fedora-rawhide-cloud.yaml
deleted file mode 100644
index fbcb63b1..00000000
--- a/nodepool/elements/virt-customize/fedora-rawhide-cloud.yaml
+++ /dev/null
@@ -1,66 +0,0 @@
----
-- name: Build a fedora cloud image suitable for Zuul
- hosts: localhost
- vars:
- # Both url and checksum are going to be discovered thanks to the discover_rawhide role
- # image_url:
- # image_checksum:
- image: Fedora-Cloud-Base-Rawhide.x86_64.qcow2
- extra_packages:
- # Extra system tools
- - pigz
- - bridge-utils
- - wget
- - unzip
- # Basic CI tools
- - make
- - gcc
- - patch
- # RPM building tools
- - redhat-lsb-core
- - redhat-rpm-config
- - rpm-build
- - rpm-sign
- - rpmlint
- - createrepo
- - gnupg2
- - expect
- # Devel libraries
- - libffi-devel
- - libpcap-devel
- - libseccomp-devel
- - libxml2-devel
- - libxslt-devel
- - mariadb-devel
- - openldap-devel
- - openssl-devel
- - python-devel
- - readline-devel
- - ruby-devel
- - systemd-devel
- - zlib-devel
- # Python
- - python3-pyyaml
- # For add-build-sshkey
- - python3-libselinux
- tasks:
- - block:
- - import_role:
- name: discover-rawhide
- - import_role:
- name: base
- - import_role:
- name: sshd-config
- - import_role:
- name: network-config
- - import_role:
- name: zuul-user
- - import_role:
- name: base-install-packages
- - import_role:
- name: base-customize
- - import_role:
- name: base-finalize
- always:
- - import_role:
- name: base-cleanup
diff --git a/nodepool/rdo-cloud.yaml b/nodepool/rdo-cloud.yaml
index a5b128d3..74c1cf63 100644
--- a/nodepool/rdo-cloud.yaml
+++ b/nodepool/rdo-cloud.yaml
@@ -63,15 +63,8 @@ diskimages:
- raw
- name: cloud-fedora-rawhide
- username: zuul-worker
- elements:
- # This is a fake element to reference the playbook
- - fedora-rawhide-cloud
python-path: /usr/bin/python3
- env-vars:
- PATH: /etc/nodepool/elements/virt-customize:/bin:/sbin:/usr/bin:/usr/sbin
- formats:
- - raw
+ dib-cmd: /usr/bin/dib-virt-customize /etc/nodepool/virt_images/cloud-fedora-rawhide.yaml
- name: dib-fedora-27
formats:
diff --git a/nodepool/virt_images/cloud-fedora-rawhide.yaml b/nodepool/virt_images/cloud-fedora-rawhide.yaml
index 1f581ab4..9ec9b656 100644
--- a/nodepool/virt_images/cloud-fedora-rawhide.yaml
+++ b/nodepool/virt_images/cloud-fedora-rawhide.yaml
@@ -14,6 +14,33 @@
- make
- gcc
- patch
+ # RPM building tools
+ - redhat-lsb-core
+ - redhat-rpm-config
+ - rpm-build
+ - rpm-sign
+ - rpmlint
+ - createrepo
+ - gnupg2
+ - expect
+ # Devel libraries
+ - libffi-devel
+ - libpcap-devel
+ - libseccomp-devel
+ - libxml2-devel
+ - libxslt-devel
+ - mariadb-devel
+ - openldap-devel
+ - openssl-devel
+ - python-devel
+ - readline-devel
+ - ruby-devel
+ - systemd-devel
+ - zlib-devel
+ # Python
+ - python3-pyyaml
+ # For add-build-sshkey
+ - python3-libselinux
tasks:
- block:
- import_role: