9:38 a.m.
In order to add CentOS 8 to jenkins-ci, we had to:
- Adjust lcitool to generate unattended scripts based on templates
instead of using the templates themselves, as a new parameter is
expected on kickstart files for RHEL / CentOS 8 (or newer);
- Enable the EPEL and PowerTools repos;
Then, the following projects have been added:
- libvirt
- Some adjustments had to be done as some dependencies got removed from
CentOS 8;
- libvirt-glib
- libvirt-dbus
- Some adjustments had to be done as flake8 doesn't pull all the needed
dependencies when installed on CentOS 8;
- libvirt-go
- libvirt-go-xml
- libvirt-ocaml
- libvirt-perl
- libvirt-python
- virt-viewer
- Some adjustments had to be done as libgovirt-devel and gtk-vnc2-devel
are not present anymore on CentOS 8;
- osinfo-db-tools
- oisnfo-db
- libosinfo
- virt-manager
The projects which were not added due to missing dependencies are:
- libvirt-cim
- libvirt-sandbox
- libvirt-tck
Fabiano Fidêncio (8):
lcitool: Generate the unattended script file
lcitool: Use install_url in the unattended install files
guests: Add CentOS 8
mappings: Adjustments for CentOS 8
guests: Install EPEL repo on all CentOS guests
guests: Enable PowerTools repo on CentOS 8 guests
guests: Add projects to CentOS 8
guests: Build projects on CentOS 8
guests/configs/kickstart.cfg | 6 +++++
guests/host_vars/libvirt-centos-8/docker.yml | 2 ++
guests/host_vars/libvirt-centos-8/install.yml | 2 ++
guests/host_vars/libvirt-centos-8/main.yml | 22 ++++++++++++++++
guests/inventory | 1 +
guests/lcitool | 26 ++++++++++++++++++-
guests/playbooks/build/jobs/defaults.yml | 2 ++
guests/playbooks/build/projects/libosinfo.yml | 1 +
.../playbooks/build/projects/libvirt-dbus.yml | 2 ++
guests/playbooks/build/projects/libvirt.yml | 1 +
.../build/projects/osinfo-db-tools.yml | 1 +
.../playbooks/build/projects/virt-manager.yml | 3 +++
guests/playbooks/update/tasks/base.yml | 9 ++++++-
guests/vars/mappings.yml | 4 +++
jenkins/jobs/defaults.yaml | 2 ++
jenkins/projects/libosinfo.yaml | 1 +
jenkins/projects/libvirt-dbus.yaml | 2 ++
jenkins/projects/libvirt.yaml | 1 +
jenkins/projects/osinfo-db-tools.yaml | 1 +
jenkins/projects/virt-manager.yaml | 3 +++
20 files changed, 90 insertions(+), 2 deletions(-)
create mode 100644 guests/host_vars/libvirt-centos-8/docker.yml
create mode 100644 guests/host_vars/libvirt-centos-8/install.yml
create mode 100644 guests/host_vars/libvirt-centos-8/main.yml
--
2.23.0
9:38 a.m.
New subject: [libvirt] [jenkins-ci PATCH v2 1/8] lcitool: Generate the unattended script file
Let's always generate the unattended script file as, by doing this, we
can treat the files we have as templates, being able to change them
accordingly to whatever is needed by specific distros.
It's important to note that we *must* be careful and keep generating
those files using their "expected" filename, preferably using the same
name of the template, as some of the distros require that.
Signed-off-by: Fabiano Fidêncio <fidencio(a)redhat.com>
Reviewed-by: Andrea Bolognani <abologna(a)redhat.com>
---
guests/lcitool | 17 ++++++++++++++++-
1 file changed, 16 insertions(+), 1 deletion(-)
diff --git a/guests/lcitool b/guests/lcitool
index 8436ce7..379fecc 100755
--- a/guests/lcitool
+++ b/guests/lcitool
@@ -23,9 +23,11 @@ import json
import os
import platform
import random
+import shutil
import string
import subprocess
import sys
+import tempfile
import textwrap
import yaml
@@ -537,7 +539,18 @@ class Application:
raise Exception(
"Host {} doesn't support installation".format(host)
)
- initrd_inject = os.path.join(base, "configs", install_config)
+
+ # Unattended install scripts are being generated on the fly, based
+ # on the templates present in guests/configs/
+ initrd_template = os.path.join(base, "configs", install_config)
+ with open(initrd_template, 'r') as template:
+ content = template.read()
+
+ tempdir = tempfile.mkdtemp()
+ initrd_inject = os.path.join(tempdir, install_config)
+
+ with open(initrd_inject, "w") as inject:
+ inject.write(content)
# preseed files must use a well-known name to be picked up by
# d-i; for kickstart files, we can use whatever name we please
@@ -587,6 +600,8 @@ class Application:
except Exception as ex:
raise Exception("Failed to install '{}':
{}".format(host, ex))
+ shutil.rmtree(tempdir, ignore_errors=True)
+
def _action_update(self, args):
self._execute_playbook("update", args.hosts, args.projects,
args.git_revision)
--
2.23.0
9:38 a.m.
New subject: [libvirt] [jenkins-ci PATCH v2 2/8] lcitool: Use install_url in the unattended install files
Passing `url --url={{ install_url }}` to a kickstart file is, according
to Red Hat official documentation[0], mandatory for RHEL 8 and onwards
(which includes CentOS 8).
Using it for RHEL 7, CentOS 7, and Fedora does not cause any issue.
[0]:
https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/8/...
Signed-off-by: Fabiano Fidêncio <fidencio(a)redhat.com>
Reviewed-by: Andrea Bolognani <abologna(a)redhat.com>
---
guests/configs/kickstart.cfg | 6 ++++++
guests/lcitool | 9 +++++++++
2 files changed, 15 insertions(+)
diff --git a/guests/configs/kickstart.cfg b/guests/configs/kickstart.cfg
index 713557a..76b7b65 100644
--- a/guests/configs/kickstart.cfg
+++ b/guests/configs/kickstart.cfg
@@ -1,3 +1,9 @@
+# Installation source
+#
+# The operating system will be installed from the following URL
+url --url={{ install_url }}
+
+
# Installer configuration
#
# Perform a text based installation followed by a reboot, and disable
diff --git a/guests/lcitool b/guests/lcitool
index 379fecc..803477e 100755
--- a/guests/lcitool
+++ b/guests/lcitool
@@ -542,9 +542,18 @@ class Application:
# Unattended install scripts are being generated on the fly, based
# on the templates present in guests/configs/
+ unattended_options = [
+ "install_url",
+ ]
+
initrd_template = os.path.join(base, "configs", install_config)
with open(initrd_template, 'r') as template:
content = template.read()
+ for option in unattended_options:
+ content = content.replace(
+ "{{ " + option + " }}",
+ facts[option]
+ )
tempdir = tempfile.mkdtemp()
initrd_inject = os.path.join(tempdir, install_config)
--
2.23.0
9:38 a.m.
New subject: [libvirt] [jenkins-ci PATCH v2 3/8] guests: Add CentOS 8
This commit allows calling `lcitool install libvirt-centos-8`.
`lcitool update libvirt-centos-8 $project` does *not* work as:
- EPEL repository is only enabled for CentOS 7;
- The reason EPEL is needed because of some base packages (as screen);
- There's no task to enable PowerTools repository;
- PowerTools is needed because the development packages are
distributed via this repo;
- There's *no* project supported;
Signed-off-by: Fabiano Fidêncio <fidencio(a)redhat.com>
---
guests/host_vars/libvirt-centos-8/docker.yml | 2 ++
guests/host_vars/libvirt-centos-8/install.yml | 2 ++
guests/host_vars/libvirt-centos-8/main.yml | 7 +++++++
guests/inventory | 1 +
4 files changed, 12 insertions(+)
create mode 100644 guests/host_vars/libvirt-centos-8/docker.yml
create mode 100644 guests/host_vars/libvirt-centos-8/install.yml
create mode 100644 guests/host_vars/libvirt-centos-8/main.yml
diff --git a/guests/host_vars/libvirt-centos-8/docker.yml
b/guests/host_vars/libvirt-centos-8/docker.yml
new file mode 100644
index 0000000..10c2a50
--- /dev/null
+++ b/guests/host_vars/libvirt-centos-8/docker.yml
@@ -0,0 +1,2 @@
+---
+docker_base: centos:centos8
diff --git a/guests/host_vars/libvirt-centos-8/install.yml
b/guests/host_vars/libvirt-centos-8/install.yml
new file mode 100644
index 0000000..46facc1
--- /dev/null
+++ b/guests/host_vars/libvirt-centos-8/install.yml
@@ -0,0 +1,2 @@
+---
+install_url: http://mirror.centos.org/centos-8/8/BaseOS/x86_64/os/
diff --git a/guests/host_vars/libvirt-centos-8/main.yml
b/guests/host_vars/libvirt-centos-8/main.yml
new file mode 100644
index 0000000..a147183
--- /dev/null
+++ b/guests/host_vars/libvirt-centos-8/main.yml
@@ -0,0 +1,7 @@
+---
+package_format: 'rpm'
+package_manager: 'dnf'
+os_name: 'CentOS'
+os_version: '8'
+
+ansible_python_interpreter: /usr/bin/python3
diff --git a/guests/inventory b/guests/inventory
index ecdcc34..f062310 100644
--- a/guests/inventory
+++ b/guests/inventory
@@ -1,4 +1,5 @@
libvirt-centos-7
+libvirt-centos-8
libvirt-debian-9
libvirt-debian-10
libvirt-debian-sid
--
2.23.0
10:12 a.m.
New subject: [libvirt] [jenkins-ci PATCH v2 3/8] guests: Add CentOS 8
On Tue, 2019-12-10 at 16:38 +0100, Fabiano Fidêncio wrote:
This commit allows calling `lcitool install libvirt-centos-8`.
`lcitool update libvirt-centos-8 $project` does *not* work as:
- EPEL repository is only enabled for CentOS 7;
- The reason EPEL is needed because of some base packages (as screen);
- There's no task to enable PowerTools repository;
- PowerTools is needed because the development packages are
distributed via this repo;
- There's *no* project supported;
Signed-off-by: Fabiano Fidêncio <fidencio(a)redhat.com>
---
guests/host_vars/libvirt-centos-8/docker.yml | 2 ++
guests/host_vars/libvirt-centos-8/install.yml | 2 ++
guests/host_vars/libvirt-centos-8/main.yml | 7 +++++++
guests/inventory | 1 +
4 files changed, 12 insertions(+)
create mode 100644 guests/host_vars/libvirt-centos-8/docker.yml
create mode 100644 guests/host_vars/libvirt-centos-8/install.yml
create mode 100644 guests/host_vars/libvirt-centos-8/main.yml
Reviewed-by: Andrea Bolognani <abologna(a)redhat.com>
--
Andrea Bolognani / Red Hat / Virtualization
9:38 a.m.
New subject: [libvirt] [jenkins-ci PATCH v2 4/8] mappings: Adjustments for CentOS 8
In order to build our projects on a CentOS 8 machine / container, some
changes will be required:
- libssh2, libvirt dependency, is not longer present:
-
https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/8/...
- librbd1-devel, libvirt dependency, has been replaced by librdb-devel:
-
https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/8/...
- libgovirt-devel and gtk-vnc2-devel, virt-viewer dependencies, are not
present anymore:
-
https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/8/...
Signed-off-by: Fabiano Fidêncio <fidencio(a)redhat.com>
---
guests/vars/mappings.yml | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/guests/vars/mappings.yml b/guests/vars/mappings.yml
index 56310f0..07ab6db 100644
--- a/guests/vars/mappings.yml
+++ b/guests/vars/mappings.yml
@@ -238,6 +238,7 @@ mappings:
deb: libgtk-vnc-2.0-dev
pkg: gtk-vnc
rpm: gtk-vnc2-devel
+ CentOS8:
cross-policy-deb: foreign
hal:
@@ -332,6 +333,7 @@ mappings:
libgovirt:
rpm: libgovirt-devel
+ CentOS8:
Debian: libgovirt-dev
cross-policy-deb: foreign
@@ -379,6 +381,7 @@ mappings:
deb: librbd-dev
Fedora: librbd-devel
CentOS7: librbd1-devel
+ CentOS8: librbd-devel
OpenSUSE: librbd-devel
cross-policy-deb: foreign
@@ -404,6 +407,7 @@ mappings:
deb: libssh2-1-dev
pkg: libssh2
rpm: libssh2-devel
+ CentOS8:
cross-policy-deb: foreign
libtirpc:
--
2.23.0
10:13 a.m.
New subject: [libvirt] [jenkins-ci PATCH v2 4/8] mappings: Adjustments for CentOS 8
On Tue, 2019-12-10 at 16:38 +0100, Fabiano Fidêncio wrote:
In order to build our projects on a CentOS 8 machine / container,
some
changes will be required:
- libssh2, libvirt dependency, is not longer present:
-
https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/8/...
- librbd1-devel, libvirt dependency, has been replaced by librdb-devel:
-
https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/8/...
- libgovirt-devel and gtk-vnc2-devel, virt-viewer dependencies, are not
present anymore:
-
https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/8/...
Signed-off-by: Fabiano Fidêncio <fidencio(a)redhat.com>
---
guests/vars/mappings.yml | 4 ++++
1 file changed, 4 insertions(+)
Reviewed-by: Andrea Bolognani <abologna(a)redhat.com>
--
Andrea Bolognani / Red Hat / Virtualization
9:38 a.m.
New subject: [libvirt] [jenkins-ci PATCH v2 5/8] guests: Install EPEL repo on all CentOS guests
EPEL repository should be enabled on all supported CentOS guests as it
brings in packages which are part of the "base packages" for
libvirt-jenkins-ci.
Signed-off-by: Fabiano Fidêncio <fidencio(a)redhat.com>
Reviewed-by: Andrea Bolognani <abologna(a)redhat.com>
---
guests/playbooks/update/tasks/base.yml | 1 -
1 file changed, 1 deletion(-)
diff --git a/guests/playbooks/update/tasks/base.yml
b/guests/playbooks/update/tasks/base.yml
index 5153917..965e442 100644
--- a/guests/playbooks/update/tasks/base.yml
+++ b/guests/playbooks/update/tasks/base.yml
@@ -15,7 +15,6 @@
state: latest
when:
- os_name == 'CentOS'
- - os_version == '7'
- name: Update installed packages
package:
--
2.23.0
3:30 a.m.
New subject: [libvirt] [jenkins-ci PATCH v2 5/8] guests: Install EPEL repo on all CentOS guests
On Tue, 2019-12-10 at 16:38 +0100, Fabiano Fidêncio wrote:
+++ b/guests/playbooks/update/tasks/base.yml
@@ -15,7 +15,6 @@
state: latest
when:
- os_name == 'CentOS'
- - os_version == '7'
Welp, I just realized you need to apply the same change to the
_action_dockerfile() function in lcitool too... Up to you whether
to respin or fix Dockerfile generation in a follow-up patch.
--
Andrea Bolognani / Red Hat / Virtualization
3:44 a.m.
New subject: [libvirt] [jenkins-ci PATCH v2 5/8] guests: Install EPEL repo on all CentOS guests
On Wed, Dec 11, 2019 at 10:31 AM Andrea Bolognani <abologna(a)redhat.com> wrote:
On Tue, 2019-12-10 at 16:38 +0100, Fabiano Fidêncio wrote:
> +++ b/guests/playbooks/update/tasks/base.yml
> @@ -15,7 +15,6 @@
> state: latest
> when:
> - os_name == 'CentOS'
> - - os_version == '7'
Welp, I just realized you need to apply the same change to the
_action_dockerfile() function in lcitool too... Up to you whether
to respin or fix Dockerfile generation in a follow-up patch.
I will respin the series as it may need an extra patch between those
this one and the PowerTools one.
Nice catch!
Best Regards,
--
Fabiano Fidêncio
6:25 a.m.
New subject: [libvirt] [jenkins-ci PATCH v2 5/8] guests: Install EPEL repo on all CentOS guests
On Wed, Dec 11, 2019 at 10:44 AM Fabiano Fidêncio <fidencio(a)redhat.com> wrote:
On Wed, Dec 11, 2019 at 10:31 AM Andrea Bolognani <abologna(a)redhat.com> wrote:
>
> On Tue, 2019-12-10 at 16:38 +0100, Fabiano Fidêncio wrote:
> > +++ b/guests/playbooks/update/tasks/base.yml
> > @@ -15,7 +15,6 @@
> > state: latest
> > when:
> > - os_name == 'CentOS'
> > - - os_version == '7'
>
> Welp, I just realized you need to apply the same change to the
> _action_dockerfile() function in lcitool too... Up to you whether
> to respin or fix Dockerfile generation in a follow-up patch.
I will respin the series as it may need an extra patch between those
this one and the PowerTools one.
Actually, I will not.
This is the fixup for this patch:
```
diff --git a/guests/lcitool b/guests/lcitool
index 803477e..059b789 100755
--- a/guests/lcitool
+++ b/guests/lcitool
@@ -748,7 +748,7 @@ class Application:
{package_manager} autoremove -y && \\
{package_manager} clean all -y
""").format(**varmap))
- elif os_name == "CentOS" and os_version == "7":
+ elif os_name == "CentOS":
sys.stdout.write(textwrap.dedent("""
RUN {package_manager} update -y && \\
{package_manager} install -y epel-release && \\
```
Best Regards,
--
Fabiano Fidêncio
6:31 a.m.
New subject: [libvirt] [jenkins-ci PATCH v2 5/8] guests: Install EPEL repo on all CentOS guests
On Wed, 2019-12-11 at 13:25 +0100, Fabiano Fidêncio wrote:
This is the fixup for this patch:
```
diff --git a/guests/lcitool b/guests/lcitool
index 803477e..059b789 100755
--- a/guests/lcitool
+++ b/guests/lcitool
@@ -748,7 +748,7 @@ class Application:
{package_manager} autoremove -y && \\
{package_manager} clean all -y
""").format(**varmap))
- elif os_name == "CentOS" and os_version == "7":
+ elif os_name == "CentOS":
sys.stdout.write(textwrap.dedent("""
RUN {package_manager} update -y && \\
{package_manager} install -y epel-release && \\
```
Looks good!
(Note that our mailing list doesn't support Markdown syntax ;)
--
Andrea Bolognani / Red Hat / Virtualization
9:38 a.m.
New subject: [libvirt] [jenkins-ci PATCH v2 6/8] guests: Enable PowerTools repo on CentOS 8 guests
This is needed as all the development packages will come from the
PowerTools repository, which is not enabled by default.
Signed-off-by: Fabiano Fidêncio <fidencio(a)redhat.com>
Reviewed-by: Andrea Bolognani <abologna(a)redhat.com>
---
guests/playbooks/update/tasks/base.yml | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/guests/playbooks/update/tasks/base.yml
b/guests/playbooks/update/tasks/base.yml
index 965e442..b3ab738 100644
--- a/guests/playbooks/update/tasks/base.yml
+++ b/guests/playbooks/update/tasks/base.yml
@@ -9,6 +9,14 @@
- os_name == 'Fedora'
- os_version == 'Rawhide'
+- name: Enable PowerTools repository
+ command: '{{ package_manager }} config-manager --set-enabled PowerTools -y'
+ args:
+ warn: no
+ when:
+ - os_name == 'CentOS'
+ - os_version == '8'
+
- name: Enable EPEL repository
package:
name: epel-release
--
2.23.0
3:32 a.m.
New subject: [libvirt] [jenkins-ci PATCH v2 6/8] guests: Enable PowerTools repo on CentOS 8 guests
On Tue, 2019-12-10 at 16:38 +0100, Fabiano Fidêncio wrote:
+++ b/guests/playbooks/update/tasks/base.yml
+- name: Enable PowerTools repository
+ command: '{{ package_manager }} config-manager --set-enabled PowerTools -y'
+ args:
+ warn: no
+ when:
+ - os_name == 'CentOS'
+ - os_version == '8'
Same comment as the one I just made for EPEL: you need to make sure
this line ends up in the generated Dockerfile too.
--
Andrea Bolognani / Red Hat / Virtualization
6:26 a.m.
New subject: [libvirt] [jenkins-ci PATCH v2 6/8] guests: Enable PowerTools repo on CentOS 8 guests
On Wed, Dec 11, 2019 at 10:32 AM Andrea Bolognani <abologna(a)redhat.com> wrote:
On Tue, 2019-12-10 at 16:38 +0100, Fabiano Fidêncio wrote:
> +++ b/guests/playbooks/update/tasks/base.yml
> +- name: Enable PowerTools repository
> + command: '{{ package_manager }} config-manager --set-enabled PowerTools
-y'
> + args:
> + warn: no
> + when:
> + - os_name == 'CentOS'
> + - os_version == '8'
Same comment as the one I just made for EPEL: you need to make sure
this line ends up in the generated Dockerfile too.
And this is the fixup for this one:
```
diff --git a/guests/lcitool b/guests/lcitool
index 059b789..c28c414 100755
--- a/guests/lcitool
+++ b/guests/lcitool
@@ -749,13 +749,23 @@ class Application:
{package_manager} clean all -y
""").format(**varmap))
elif os_name == "CentOS":
- sys.stdout.write(textwrap.dedent("""
- RUN {package_manager} update -y && \\
- {package_manager} install -y epel-release && \\
- {package_manager} install -y {pkgs} && \\
- {package_manager} autoremove -y && \\
- {package_manager} clean all -y
- """).format(**varmap))
+ if os_version == "7":
+ sys.stdout.write(textwrap.dedent("""
+ RUN {package_manager} update -y && \\
+ {package_manager} install -y epel-release && \\
+ {package_manager} install -y {pkgs} && \\
+ {package_manager} autoremove -y && \\
+ {package_manager} clean all -y
+ """).format(**varmap))
+ else:
+ sys.stdout.write(textwrap.dedent("""
+ RUN {package_manager} update -y && \\
+ {package_manager} config-manager
--set-enabled PowerTools -y && \\
+ {package_manager} install -y epel-release && \\
+ {package_manager} install -y {pkgs} && \\
+ {package_manager} autoremove -y && \\
+ {package_manager} clean all -y
+ """).format(**varmap))
else:
sys.stdout.write(textwrap.dedent("""
RUN {package_manager} update -y && \\
```
We (Andrea and I) agree that this function has to be ungrossified
sooner than later. But it'll be done in the future.
Best Regards,
--
Fabiano Fidêncio
6:33 a.m.
New subject: [libvirt] [jenkins-ci PATCH v2 6/8] guests: Enable PowerTools repo on CentOS 8 guests
On Wed, 2019-12-11 at 13:26 +0100, Fabiano Fidêncio wrote:
And this is the fixup for this one:
```
diff --git a/guests/lcitool b/guests/lcitool
index 059b789..c28c414 100755
--- a/guests/lcitool
+++ b/guests/lcitool
@@ -749,13 +749,23 @@ class Application:
{package_manager} clean all -y
""").format(**varmap))
elif os_name == "CentOS":
- sys.stdout.write(textwrap.dedent("""
- RUN {package_manager} update -y && \\
- {package_manager} install -y epel-release && \\
- {package_manager} install -y {pkgs} && \\
- {package_manager} autoremove -y && \\
- {package_manager} clean all -y
- """).format(**varmap))
+ if os_version == "7":
+ sys.stdout.write(textwrap.dedent("""
+ RUN {package_manager} update -y && \\
+ {package_manager} install -y epel-release && \\
+ {package_manager} install -y {pkgs} && \\
+ {package_manager} autoremove -y && \\
+ {package_manager} clean all -y
+ """).format(**varmap))
+ else:
+ sys.stdout.write(textwrap.dedent("""
+ RUN {package_manager} update -y && \\
+ {package_manager} config-manager
--set-enabled PowerTools -y && \\
+ {package_manager} install -y epel-release && \\
+ {package_manager} install -y {pkgs} && \\
+ {package_manager} autoremove -y && \\
+ {package_manager} clean all -y
+ """).format(**varmap))
else:
sys.stdout.write(textwrap.dedent("""
RUN {package_manager} update -y && \\
```
Also looks good!
We (Andrea and I) agree that this function has to be ungrossified
sooner than later. But it'll be done in the future.
Absolutely fair.
--
Andrea Bolognani / Red Hat / Virtualization
6:53 a.m.
New subject: [libvirt] [jenkins-ci PATCH v2 6/8] guests: Enable PowerTools repo on CentOS 8 guests
On Wed, Dec 11, 2019 at 1:33 PM Andrea Bolognani <abologna(a)redhat.com> wrote:
On Wed, 2019-12-11 at 13:26 +0100, Fabiano Fidêncio wrote:
> And this is the fixup for this one:
> ```
> diff --git a/guests/lcitool b/guests/lcitool
> index 059b789..c28c414 100755
> --- a/guests/lcitool
> +++ b/guests/lcitool
> @@ -749,13 +749,23 @@ class Application:
> {package_manager} clean all -y
> """).format(**varmap))
> elif os_name == "CentOS":
> - sys.stdout.write(textwrap.dedent("""
> - RUN {package_manager} update -y && \\
> - {package_manager} install -y epel-release && \\
> - {package_manager} install -y {pkgs} && \\
> - {package_manager} autoremove -y && \\
> - {package_manager} clean all -y
> - """).format(**varmap))
> + if os_version == "7":
> + sys.stdout.write(textwrap.dedent("""
> + RUN {package_manager} update -y && \\
> + {package_manager} install -y epel-release &&
\\
> + {package_manager} install -y {pkgs} && \\
> + {package_manager} autoremove -y && \\
> + {package_manager} clean all -y
> + """).format(**varmap))
> + else:
> + sys.stdout.write(textwrap.dedent("""
> + RUN {package_manager} update -y && \\
+ {package_manager} install
'dnf-command(config-manager)' -y && \\
This is also needed: ^
> + {package_manager} config-manager
> --set-enabled PowerTools -y && \\
> + {package_manager} install -y epel-release &&
\\
> + {package_manager} install -y {pkgs} && \\
> + {package_manager} autoremove -y && \\
> + {package_manager} clean all -y
> + """).format(**varmap))
> else:
> sys.stdout.write(textwrap.dedent("""
> RUN {package_manager} update -y && \\
>
> ```
Also looks good!
I'll push the patches when python3-flakes8 update reaches EPEL.
Best Regards,
--
Fabiano Fidêncio
9:38 a.m.
New subject: [libvirt] [jenkins-ci PATCH v2 7/8] guests: Add projects to CentOS 8
Signed-off-by: Fabiano Fidêncio <fidencio(a)redhat.com>
---
guests/host_vars/libvirt-centos-8/main.yml | 15 +++++++++++++++
1 file changed, 15 insertions(+)
diff --git a/guests/host_vars/libvirt-centos-8/main.yml
b/guests/host_vars/libvirt-centos-8/main.yml
index a147183..aae2313 100644
--- a/guests/host_vars/libvirt-centos-8/main.yml
+++ b/guests/host_vars/libvirt-centos-8/main.yml
@@ -1,4 +1,19 @@
---
+projects:
+ - libosinfo
+ - libvirt
+ - libvirt-dbus
+ - libvirt-glib
+ - libvirt-go
+ - libvirt-go-xml
+ - libvirt-ocaml
+ - libvirt-perl
+ - libvirt-python
+ - osinfo-db
+ - osinfo-db-tools
+ - virt-manager
+ - virt-viewer
+
package_format: 'rpm'
package_manager: 'dnf'
os_name: 'CentOS'
--
2.23.0
10:17 a.m.
New subject: [libvirt] [jenkins-ci PATCH v2 7/8] guests: Add projects to CentOS 8
On Tue, 2019-12-10 at 16:38 +0100, Fabiano Fidêncio wrote:
Signed-off-by: Fabiano Fidêncio <fidencio(a)redhat.com>
---
guests/host_vars/libvirt-centos-8/main.yml | 15 +++++++++++++++
1 file changed, 15 insertions(+)
The cover letter contained the following remark:
The projects which were not added due to missing dependencies are:
- libvirt-cim
- libvirt-sandbox
- libvirt-tck
I think it would make perfect sense to include that remark in the
commit message, so that it remains as part of the git history.
With that added,
Reviewed-by: Andrea Bolognani <abologna(a)redhat.com>
--
Andrea Bolognani / Red Hat / Virtualization
9:38 a.m.
New subject: [libvirt] [jenkins-ci PATCH v2 8/8] guests: Build projects on CentOS 8
Signed-off-by: Fabiano Fidêncio <fidencio(a)redhat.com>
---
guests/playbooks/build/jobs/defaults.yml | 2 ++
guests/playbooks/build/projects/libosinfo.yml | 1 +
guests/playbooks/build/projects/libvirt-dbus.yml | 2 ++
guests/playbooks/build/projects/libvirt.yml | 1 +
guests/playbooks/build/projects/osinfo-db-tools.yml | 1 +
guests/playbooks/build/projects/virt-manager.yml | 3 +++
jenkins/jobs/defaults.yaml | 2 ++
jenkins/projects/libosinfo.yaml | 1 +
jenkins/projects/libvirt-dbus.yaml | 2 ++
jenkins/projects/libvirt.yaml | 1 +
jenkins/projects/osinfo-db-tools.yaml | 1 +
jenkins/projects/virt-manager.yaml | 3 +++
12 files changed, 20 insertions(+)
diff --git a/guests/playbooks/build/jobs/defaults.yml
b/guests/playbooks/build/jobs/defaults.yml
index 0175a05..5e4ec03 100644
--- a/guests/playbooks/build/jobs/defaults.yml
+++ b/guests/playbooks/build/jobs/defaults.yml
@@ -1,6 +1,7 @@
---
all_machines:
- libvirt-centos-7
+ - libvirt-centos-8
- libvirt-debian-9
- libvirt-debian-10
- libvirt-debian-sid
@@ -15,6 +16,7 @@ all_machines:
- libvirt-ubuntu-1804
rpm_machines:
- libvirt-centos-7
+ - libvirt-centos-8
- libvirt-fedora-30
- libvirt-fedora-31
- libvirt-fedora-rawhide
diff --git a/guests/playbooks/build/projects/libosinfo.yml
b/guests/playbooks/build/projects/libosinfo.yml
index a759204..6391323 100644
--- a/guests/playbooks/build/projects/libosinfo.yml
+++ b/guests/playbooks/build/projects/libosinfo.yml
@@ -13,6 +13,7 @@
# RPM build is still not possible on CentOS7 as it does not
# have the needed RPM macros for meson.
machines:
+ - libvirt-centos-8
- libvirt-fedora-30
- libvirt-fedora-31
- libvirt-fedora-rawhide
diff --git a/guests/playbooks/build/projects/libvirt-dbus.yml
b/guests/playbooks/build/projects/libvirt-dbus.yml
index 8c946af..66bc1fa 100644
--- a/guests/playbooks/build/projects/libvirt-dbus.yml
+++ b/guests/playbooks/build/projects/libvirt-dbus.yml
@@ -14,6 +14,7 @@
# Python3 version in Ubuntu 16.04 and python3-pytest version
# in CentOS 7 are too old.
machines:
+ - libvirt-centos-8
- libvirt-debian-9
- libvirt-debian-10
- libvirt-debian-sid
@@ -25,6 +26,7 @@
# RPM build is still not possible on CentOS7 as it does not
# have the needed RPM macros for meson.
machines:
+ - libvirt-centos-8
- libvirt-fedora-30
- libvirt-fedora-31
- libvirt-fedora-rawhide
diff --git a/guests/playbooks/build/projects/libvirt.yml
b/guests/playbooks/build/projects/libvirt.yml
index e0f2f7c..654d16c 100644
--- a/guests/playbooks/build/projects/libvirt.yml
+++ b/guests/playbooks/build/projects/libvirt.yml
@@ -13,6 +13,7 @@
# commands with more arguments than FreeBSD supports
machines:
- libvirt-centos-7
+ - libvirt-centos-8
- libvirt-debian-9
- libvirt-debian-10
- libvirt-debian-sid
diff --git a/guests/playbooks/build/projects/osinfo-db-tools.yml
b/guests/playbooks/build/projects/osinfo-db-tools.yml
index 18f0f0f..b5024ae 100644
--- a/guests/playbooks/build/projects/osinfo-db-tools.yml
+++ b/guests/playbooks/build/projects/osinfo-db-tools.yml
@@ -13,6 +13,7 @@
# RPM build is still not possible on CentOS7 as it does not
# have the needed RPM macros for meson.
machines:
+ - libvirt-centos-8
- libvirt-fedora-30
- libvirt-fedora-31
- libvirt-fedora-rawhide
diff --git a/guests/playbooks/build/projects/virt-manager.yml
b/guests/playbooks/build/projects/virt-manager.yml
index c0d4294..886cb73 100644
--- a/guests/playbooks/build/projects/virt-manager.yml
+++ b/guests/playbooks/build/projects/virt-manager.yml
@@ -5,6 +5,7 @@
# Ubuntu 16.04 has Python 3 but not the libxml2 bindings, so it can't
# build the project either
machines:
+ - libvirt-centos-8
- libvirt-debian-9
- libvirt-debian-10
- libvirt-debian-sid
@@ -29,6 +30,7 @@
# so skip the test suite there for the time being. See
# https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=224902
machines:
+ - libvirt-centos-8
- libvirt-debian-9
- libvirt-debian-10
- libvirt-debian-sid
@@ -39,6 +41,7 @@
- include: '{{ playbook_base }}/jobs/python-distutils-rpm-job.yml'
vars:
machines:
+ - libvirt-centos-8
- libvirt-fedora-30
- libvirt-fedora-31
- libvirt-fedora-rawhide
diff --git a/jenkins/jobs/defaults.yaml b/jenkins/jobs/defaults.yaml
index 676ecbf..9232d42 100644
--- a/jenkins/jobs/defaults.yaml
+++ b/jenkins/jobs/defaults.yaml
@@ -4,6 +4,7 @@
node: libvirt
all_machines:
- libvirt-centos-7
+ - libvirt-centos-8
- libvirt-debian-9
- libvirt-debian-10
- libvirt-fedora-30
@@ -13,6 +14,7 @@
- libvirt-freebsd-12
rpm_machines:
- libvirt-centos-7
+ - libvirt-centos-8
- libvirt-fedora-30
- libvirt-fedora-31
- libvirt-fedora-rawhide
diff --git a/jenkins/projects/libosinfo.yaml b/jenkins/projects/libosinfo.yaml
index 819c5ac..cc7e024 100644
--- a/jenkins/projects/libosinfo.yaml
+++ b/jenkins/projects/libosinfo.yaml
@@ -15,6 +15,7 @@
# RPM build is still not possible on CentOS7 as it does not
# have the needed RPM macros for meson.
machines:
+ - libvirt-centos-8
- libvirt-fedora-30
- libvirt-fedora-31
- libvirt-fedora-rawhide
diff --git a/jenkins/projects/libvirt-dbus.yaml b/jenkins/projects/libvirt-dbus.yaml
index dfc159c..e71e2f9 100644
--- a/jenkins/projects/libvirt-dbus.yaml
+++ b/jenkins/projects/libvirt-dbus.yaml
@@ -15,6 +15,7 @@
# Python3 version in Ubuntu 16.04 and python3-pytest version
# in CentOS 7 are too old.
machines:
+ - libvirt-centos-8
- libvirt-debian-9
- libvirt-debian-10
- libvirt-fedora-30
@@ -25,6 +26,7 @@
# RPM build is still not possible on CentOS7 as it does not
# have the needed RPM macros for meson.
machines:
+ - libvirt-centos-8
- libvirt-fedora-30
- libvirt-fedora-31
- libvirt-fedora-rawhide
diff --git a/jenkins/projects/libvirt.yaml b/jenkins/projects/libvirt.yaml
index fdc24bc..fa8fb89 100644
--- a/jenkins/projects/libvirt.yaml
+++ b/jenkins/projects/libvirt.yaml
@@ -14,6 +14,7 @@
# commands with more arguments than FreeBSD supports
machines:
- libvirt-centos-7
+ - libvirt-centos-8
- libvirt-debian-9
- libvirt-debian-10
- libvirt-fedora-30
diff --git a/jenkins/projects/osinfo-db-tools.yaml
b/jenkins/projects/osinfo-db-tools.yaml
index f28e72f..7831df4 100644
--- a/jenkins/projects/osinfo-db-tools.yaml
+++ b/jenkins/projects/osinfo-db-tools.yaml
@@ -15,6 +15,7 @@
# RPM build is still not possible on CentOS7 as it does not
# have the needed RPM macros for meson.
machines:
+ - libvirt-centos-8
- libvirt-fedora-30
- libvirt-fedora-31
- libvirt-fedora-rawhide
diff --git a/jenkins/projects/virt-manager.yaml b/jenkins/projects/virt-manager.yaml
index 3dc8e2e..7106471 100644
--- a/jenkins/projects/virt-manager.yaml
+++ b/jenkins/projects/virt-manager.yaml
@@ -5,6 +5,7 @@
# Ubuntu 16.04 has Python 3 but not the libxml2 bindings, so it can't
# build the project either
machines:
+ - libvirt-centos-8
- libvirt-debian-9
- libvirt-debian-10
- libvirt-fedora-30
@@ -28,6 +29,7 @@
# so skip the test suite there for the time being. See
# https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=224902
machines:
+ - libvirt-centos-8
- libvirt-debian-9
- libvirt-debian-10
- libvirt-fedora-30
@@ -36,6 +38,7 @@
- python-distutils-rpm-job:
parent_jobs: 'virt-manager-check'
machines:
+ - libvirt-centos-8
- libvirt-fedora-30
- libvirt-fedora-31
- libvirt-fedora-rawhide
--
2.23.0
11:20 a.m.
New subject: [libvirt] [jenkins-ci PATCH v2 8/8] guests: Build projects on CentOS 8
On Tue, 2019-12-10 at 16:38 +0100, Fabiano Fidêncio wrote:
Signed-off-by: Fabiano Fidêncio <fidencio(a)redhat.com>
---
guests/playbooks/build/jobs/defaults.yml | 2 ++
guests/playbooks/build/projects/libosinfo.yml | 1 +
guests/playbooks/build/projects/libvirt-dbus.yml | 2 ++
guests/playbooks/build/projects/libvirt.yml | 1 +
guests/playbooks/build/projects/osinfo-db-tools.yml | 1 +
guests/playbooks/build/projects/virt-manager.yml | 3 +++
jenkins/jobs/defaults.yaml | 2 ++
jenkins/projects/libosinfo.yaml | 1 +
jenkins/projects/libvirt-dbus.yaml | 2 ++
jenkins/projects/libvirt.yaml | 1 +
jenkins/projects/osinfo-db-tools.yaml | 1 +
jenkins/projects/virt-manager.yaml | 3 +++
12 files changed, 20 insertions(+)
Reviewed-by: Andrea Bolognani <abologna(a)redhat.com>
--
Andrea Bolognani / Red Hat / Virtualization
1812
days inactive
1813
days old
20 comments
2 participants
participants (2)
-
Andrea Bolognani -
Fabiano Fidêncio