[libvirt] [jenkins-ci PATCH 3/3] guests: Don't expose 'base' pseudo-package

Andrea Bolognani posted 3 patches 7 years, 3 months ago
[libvirt] [jenkins-ci PATCH 3/3] guests: Don't expose 'base' pseudo-package
Posted by Andrea Bolognani 7 years, 3 months ago
The 'base' pseudo-package is an implementation detail, and as
such is better not exposed.

Signed-off-by: Andrea Bolognani <abologna@redhat.com>
---
 guests/host_vars/libvirt-centos-6/main.yml        | 1 -
 guests/host_vars/libvirt-centos-7/main.yml        | 1 -
 guests/host_vars/libvirt-debian-8/main.yml        | 1 -
 guests/host_vars/libvirt-debian-9/main.yml        | 1 -
 guests/host_vars/libvirt-debian-sid/main.yml      | 1 -
 guests/host_vars/libvirt-fedora-26/main.yml       | 1 -
 guests/host_vars/libvirt-fedora-27/main.yml       | 1 -
 guests/host_vars/libvirt-fedora-rawhide/main.yml  | 1 -
 guests/host_vars/libvirt-freebsd-10/main.yml      | 1 -
 guests/host_vars/libvirt-freebsd-11/main.yml      | 1 -
 guests/host_vars/libvirt-freebsd-current/main.yml | 1 -
 guests/host_vars/libvirt-ubuntu-12/main.yml       | 1 -
 guests/host_vars/libvirt-ubuntu-14/main.yml       | 1 -
 guests/host_vars/libvirt-ubuntu-16/main.yml       | 1 -
 guests/site.yml                                   | 5 +++++
 15 files changed, 5 insertions(+), 14 deletions(-)

diff --git a/guests/host_vars/libvirt-centos-6/main.yml b/guests/host_vars/libvirt-centos-6/main.yml
index e959ecc..f7e383d 100644
--- a/guests/host_vars/libvirt-centos-6/main.yml
+++ b/guests/host_vars/libvirt-centos-6/main.yml
@@ -1,6 +1,5 @@
 ---
 projects:
-  - base
   - libvirt
   - libvirt-cim
   - libvirt-perl
diff --git a/guests/host_vars/libvirt-centos-7/main.yml b/guests/host_vars/libvirt-centos-7/main.yml
index 54a9e63..155da25 100644
--- a/guests/host_vars/libvirt-centos-7/main.yml
+++ b/guests/host_vars/libvirt-centos-7/main.yml
@@ -1,6 +1,5 @@
 ---
 projects:
-  - base
   - libosinfo
   - libvirt
   - libvirt-cim
diff --git a/guests/host_vars/libvirt-debian-8/main.yml b/guests/host_vars/libvirt-debian-8/main.yml
index 6d2d24b..43503ce 100644
--- a/guests/host_vars/libvirt-debian-8/main.yml
+++ b/guests/host_vars/libvirt-debian-8/main.yml
@@ -1,6 +1,5 @@
 ---
 projects:
-  - base
   - libosinfo
   - libvirt
   - libvirt-glib
diff --git a/guests/host_vars/libvirt-debian-9/main.yml b/guests/host_vars/libvirt-debian-9/main.yml
index ff28698..cde85bd 100644
--- a/guests/host_vars/libvirt-debian-9/main.yml
+++ b/guests/host_vars/libvirt-debian-9/main.yml
@@ -1,6 +1,5 @@
 ---
 projects:
-  - base
   - libosinfo
   - libvirt
   - libvirt-glib
diff --git a/guests/host_vars/libvirt-debian-sid/main.yml b/guests/host_vars/libvirt-debian-sid/main.yml
index ff28698..cde85bd 100644
--- a/guests/host_vars/libvirt-debian-sid/main.yml
+++ b/guests/host_vars/libvirt-debian-sid/main.yml
@@ -1,6 +1,5 @@
 ---
 projects:
-  - base
   - libosinfo
   - libvirt
   - libvirt-glib
diff --git a/guests/host_vars/libvirt-fedora-26/main.yml b/guests/host_vars/libvirt-fedora-26/main.yml
index 8d3b26f..1098d8a 100644
--- a/guests/host_vars/libvirt-fedora-26/main.yml
+++ b/guests/host_vars/libvirt-fedora-26/main.yml
@@ -1,6 +1,5 @@
 ---
 projects:
-  - base
   - libosinfo
   - libvirt
   - libvirt-cim
diff --git a/guests/host_vars/libvirt-fedora-27/main.yml b/guests/host_vars/libvirt-fedora-27/main.yml
index 8d3b26f..1098d8a 100644
--- a/guests/host_vars/libvirt-fedora-27/main.yml
+++ b/guests/host_vars/libvirt-fedora-27/main.yml
@@ -1,6 +1,5 @@
 ---
 projects:
-  - base
   - libosinfo
   - libvirt
   - libvirt-cim
diff --git a/guests/host_vars/libvirt-fedora-rawhide/main.yml b/guests/host_vars/libvirt-fedora-rawhide/main.yml
index 8d3b26f..1098d8a 100644
--- a/guests/host_vars/libvirt-fedora-rawhide/main.yml
+++ b/guests/host_vars/libvirt-fedora-rawhide/main.yml
@@ -1,6 +1,5 @@
 ---
 projects:
-  - base
   - libosinfo
   - libvirt
   - libvirt-cim
diff --git a/guests/host_vars/libvirt-freebsd-10/main.yml b/guests/host_vars/libvirt-freebsd-10/main.yml
index 3848c3d..2f7bced 100644
--- a/guests/host_vars/libvirt-freebsd-10/main.yml
+++ b/guests/host_vars/libvirt-freebsd-10/main.yml
@@ -8,7 +8,6 @@ su: /usr/bin/su
 sudoers: /usr/local/etc/sudoers
 
 projects:
-  - base
   - libosinfo
   - libvirt
   - libvirt-glib
diff --git a/guests/host_vars/libvirt-freebsd-11/main.yml b/guests/host_vars/libvirt-freebsd-11/main.yml
index 3848c3d..2f7bced 100644
--- a/guests/host_vars/libvirt-freebsd-11/main.yml
+++ b/guests/host_vars/libvirt-freebsd-11/main.yml
@@ -8,7 +8,6 @@ su: /usr/bin/su
 sudoers: /usr/local/etc/sudoers
 
 projects:
-  - base
   - libosinfo
   - libvirt
   - libvirt-glib
diff --git a/guests/host_vars/libvirt-freebsd-current/main.yml b/guests/host_vars/libvirt-freebsd-current/main.yml
index 3848c3d..2f7bced 100644
--- a/guests/host_vars/libvirt-freebsd-current/main.yml
+++ b/guests/host_vars/libvirt-freebsd-current/main.yml
@@ -8,7 +8,6 @@ su: /usr/bin/su
 sudoers: /usr/local/etc/sudoers
 
 projects:
-  - base
   - libosinfo
   - libvirt
   - libvirt-glib
diff --git a/guests/host_vars/libvirt-ubuntu-12/main.yml b/guests/host_vars/libvirt-ubuntu-12/main.yml
index 4d53bb3..2d21f14 100644
--- a/guests/host_vars/libvirt-ubuntu-12/main.yml
+++ b/guests/host_vars/libvirt-ubuntu-12/main.yml
@@ -1,4 +1,3 @@
 ---
 projects:
-  - base
   - libvirt
diff --git a/guests/host_vars/libvirt-ubuntu-14/main.yml b/guests/host_vars/libvirt-ubuntu-14/main.yml
index c11dd5b..4a58ee7 100644
--- a/guests/host_vars/libvirt-ubuntu-14/main.yml
+++ b/guests/host_vars/libvirt-ubuntu-14/main.yml
@@ -1,6 +1,5 @@
 ---
 projects:
-  - base
   - libosinfo
   - libvirt
   - libvirt-perl
diff --git a/guests/host_vars/libvirt-ubuntu-16/main.yml b/guests/host_vars/libvirt-ubuntu-16/main.yml
index 190f174..9794467 100644
--- a/guests/host_vars/libvirt-ubuntu-16/main.yml
+++ b/guests/host_vars/libvirt-ubuntu-16/main.yml
@@ -1,6 +1,5 @@
 ---
 projects:
-  - base
   - libosinfo
   - libvirt
   - libvirt-glib
diff --git a/guests/site.yml b/guests/site.yml
index 509d31a..4207d4e 100644
--- a/guests/site.yml
+++ b/guests/site.yml
@@ -19,6 +19,11 @@
     - include: tasks/compat.yml
     - include: tasks/user.yml
 
+    # Install base packages
+    - include: tasks/packages.yml
+      vars:
+        project: base
+
     # Install build dependencies for each project
     - include: tasks/packages.yml
       with_items:
-- 
2.14.3

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list
Re: [libvirt] [jenkins-ci PATCH 3/3] guests: Don't expose 'base' pseudo-package
Posted by Pavel Hrdina 7 years, 3 months ago
On Tue, Mar 20, 2018 at 05:24:00PM +0100, Andrea Bolognani wrote:
> The 'base' pseudo-package is an implementation detail, and as
> such is better not exposed.
> 
> Signed-off-by: Andrea Bolognani <abologna@redhat.com>
> ---
>  guests/host_vars/libvirt-centos-6/main.yml        | 1 -
>  guests/host_vars/libvirt-centos-7/main.yml        | 1 -
>  guests/host_vars/libvirt-debian-8/main.yml        | 1 -
>  guests/host_vars/libvirt-debian-9/main.yml        | 1 -
>  guests/host_vars/libvirt-debian-sid/main.yml      | 1 -
>  guests/host_vars/libvirt-fedora-26/main.yml       | 1 -
>  guests/host_vars/libvirt-fedora-27/main.yml       | 1 -
>  guests/host_vars/libvirt-fedora-rawhide/main.yml  | 1 -
>  guests/host_vars/libvirt-freebsd-10/main.yml      | 1 -
>  guests/host_vars/libvirt-freebsd-11/main.yml      | 1 -
>  guests/host_vars/libvirt-freebsd-current/main.yml | 1 -
>  guests/host_vars/libvirt-ubuntu-12/main.yml       | 1 -
>  guests/host_vars/libvirt-ubuntu-14/main.yml       | 1 -
>  guests/host_vars/libvirt-ubuntu-16/main.yml       | 1 -
>  guests/site.yml                                   | 5 +++++
>  15 files changed, 5 insertions(+), 14 deletions(-)
>
> diff --git a/guests/site.yml b/guests/site.yml
> index 509d31a..4207d4e 100644
> --- a/guests/site.yml
> +++ b/guests/site.yml
> @@ -19,6 +19,11 @@
>      - include: tasks/compat.yml
>      - include: tasks/user.yml
>  
> +    # Install base packages
> +    - include: tasks/packages.yml
> +      vars:
> +        project: base
> +

The same question as for the jenkins packages, would it make sense to
move it into the base.yml task?

Otherwise looks good.

Pavel
--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list