From nobody Mon Apr 29 10:08:09 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1521563055448757.3421575143; Tue, 20 Mar 2018 09:24:15 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id B4B0726AC41; Tue, 20 Mar 2018 16:24:13 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 8E6867AF68; Tue, 20 Mar 2018 16:24:12 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 7FAD84CA9B; Tue, 20 Mar 2018 16:24:11 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w2KGO74Q022635 for ; Tue, 20 Mar 2018 12:24:08 -0400 Received: by smtp.corp.redhat.com (Postfix) id CC46510B0F3D; Tue, 20 Mar 2018 16:24:07 +0000 (UTC) Received: from inaba.usersys.redhat.com (unknown [10.43.2.44]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 7390510B0F2A for ; Tue, 20 Mar 2018 16:24:07 +0000 (UTC) From: Andrea Bolognani To: libvir-list@redhat.com Date: Tue, 20 Mar 2018 17:23:58 +0100 Message-Id: <20180320162400.5084-2-abologna@redhat.com> In-Reply-To: <20180320162400.5084-1-abologna@redhat.com> References: <20180320162400.5084-1-abologna@redhat.com> X-Scanned-By: MIMEDefang 2.78 on 10.11.54.3 X-loop: libvir-list@redhat.com Subject: [libvirt] [jenkins-ci PATCH 1/3] guests: Configure Jenkins agent based on secret availability X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.29]); Tue, 20 Mar 2018 16:24:14 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" We're going to remove the 'jenkins' pseudo-project from the list of per-guest projects soon, so we need another way of deciding whether to install and configure the Jenkins agent. The availability of the Jenkins secret in the vault is a perfect candidate, and using it improves things in general because we can now store the information about which guests are part of the Jenkins setup in a single place instead of duplicating it. Signed-off-by: Andrea Bolognani Reviewed-by: Pavel Hrdina --- guests/site.yml | 3 --- guests/tasks/jenkins.yml | 7 +++++++ 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/guests/site.yml b/guests/site.yml index 5f69cfd..8d32561 100644 --- a/guests/site.yml +++ b/guests/site.yml @@ -32,6 +32,3 @@ - include: tasks/jenkins.yml when: - flavor =3D=3D 'jenkins' - - projects is defined - # jenkins is a pseudo-project - - ( 'jenkins' in projects ) diff --git a/guests/tasks/jenkins.yml b/guests/tasks/jenkins.yml index 94c2404..10aeec7 100644 --- a/guests/tasks/jenkins.yml +++ b/guests/tasks/jenkins.yml @@ -6,6 +6,8 @@ - name: Look up Jenkins secret set_fact: jenkins_secret: '{{ vault.jenkins_secrets[inventory_hostname] }}' + when: + - vault.jenkins_secrets[inventory_hostname] is defined =20 - name: Download Jenkins agent get_url: @@ -14,6 +16,8 @@ owner: jenkins group: jenkins force: yes + when: + - jenkins_secret is defined =20 - name: Configure and enable Jenkins agent lineinfile: @@ -24,6 +28,7 @@ line: "nohup {{ su }} - jenkins -c '{{ java }} -jar /home/jenkins/slav= e.jar -jnlpUrl \"{{ jenkins_url }}\" -secret \"{{ jenkins_secret }}\"' >/va= r/log/jenkins.log 2>&1 &" insertbefore: '^exit .*$' when: + - jenkins_secret is defined - ansible_service_mgr !=3D 'systemd' =20 - name: Configure Jenkins agent @@ -31,6 +36,7 @@ src: templates/jenkins.service.j2 dest: /etc/systemd/system/jenkins.service when: + - jenkins_secret is defined - ansible_service_mgr =3D=3D 'systemd' =20 - name: Enable Jenkins agent @@ -39,4 +45,5 @@ enabled: yes daemon_reload: yes when: + - jenkins_secret is defined - ansible_service_mgr =3D=3D 'systemd' --=20 2.14.3 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Mon Apr 29 10:08:09 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1521563069794736.356444212481; Tue, 20 Mar 2018 09:24:29 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 4D5A42F30AD; Tue, 20 Mar 2018 16:24:28 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 28D6E620B3; Tue, 20 Mar 2018 16:24:28 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id EB98F4CAA0; Tue, 20 Mar 2018 16:24:27 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w2KGO8iI022642 for ; Tue, 20 Mar 2018 12:24:08 -0400 Received: by smtp.corp.redhat.com (Postfix) id 6AAAF11701C9; Tue, 20 Mar 2018 16:24:08 +0000 (UTC) Received: from inaba.usersys.redhat.com (unknown [10.43.2.44]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 1158611701C8 for ; Tue, 20 Mar 2018 16:24:07 +0000 (UTC) From: Andrea Bolognani To: libvir-list@redhat.com Date: Tue, 20 Mar 2018 17:23:59 +0100 Message-Id: <20180320162400.5084-3-abologna@redhat.com> In-Reply-To: <20180320162400.5084-1-abologna@redhat.com> References: <20180320162400.5084-1-abologna@redhat.com> X-Scanned-By: MIMEDefang 2.78 on 10.11.54.3 X-loop: libvir-list@redhat.com Subject: [libvirt] [jenkins-ci PATCH 2/3] guests: Don't expose 'jenkins' pseudo-package X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.29]); Tue, 20 Mar 2018 16:24:28 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" The 'jenkins' pseudo-package is an implementation detail, and as such is better not exposed. Moreover, with this change the JDK will only be installed when the 'jenkins' flavor is used, which means developers will have slightly smaller guests. Signed-off-by: Andrea Bolognani Reviewed-by: Pavel Hrdina --- 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-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/site.yml | 7 +++++++ 10 files changed, 7 insertions(+), 9 deletions(-) diff --git a/guests/host_vars/libvirt-centos-6/main.yml b/guests/host_vars/= libvirt-centos-6/main.yml index d717ae7..e959ecc 100644 --- a/guests/host_vars/libvirt-centos-6/main.yml +++ b/guests/host_vars/libvirt-centos-6/main.yml @@ -1,7 +1,6 @@ --- projects: - base - - jenkins - 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 8338f99..54a9e63 100644 --- a/guests/host_vars/libvirt-centos-7/main.yml +++ b/guests/host_vars/libvirt-centos-7/main.yml @@ -1,7 +1,6 @@ --- projects: - base - - jenkins - 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 ecf9cd3..6d2d24b 100644 --- a/guests/host_vars/libvirt-debian-8/main.yml +++ b/guests/host_vars/libvirt-debian-8/main.yml @@ -1,7 +1,6 @@ --- projects: - base - - jenkins - 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 cc7cfa6..ff28698 100644 --- a/guests/host_vars/libvirt-debian-9/main.yml +++ b/guests/host_vars/libvirt-debian-9/main.yml @@ -1,7 +1,6 @@ --- projects: - base - - jenkins - 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 539c111..8d3b26f 100644 --- a/guests/host_vars/libvirt-fedora-26/main.yml +++ b/guests/host_vars/libvirt-fedora-26/main.yml @@ -1,7 +1,6 @@ --- projects: - base - - jenkins - 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 539c111..8d3b26f 100644 --- a/guests/host_vars/libvirt-fedora-27/main.yml +++ b/guests/host_vars/libvirt-fedora-27/main.yml @@ -1,7 +1,6 @@ --- projects: - base - - jenkins - 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 539c111..8d3b26f 100644 --- a/guests/host_vars/libvirt-fedora-rawhide/main.yml +++ b/guests/host_vars/libvirt-fedora-rawhide/main.yml @@ -1,7 +1,6 @@ --- projects: - base - - jenkins - libosinfo - libvirt - libvirt-cim diff --git a/guests/host_vars/libvirt-freebsd-10/main.yml b/guests/host_var= s/libvirt-freebsd-10/main.yml index a83eed1..3848c3d 100644 --- a/guests/host_vars/libvirt-freebsd-10/main.yml +++ b/guests/host_vars/libvirt-freebsd-10/main.yml @@ -9,7 +9,6 @@ sudoers: /usr/local/etc/sudoers =20 projects: - base - - jenkins - libosinfo - libvirt - libvirt-glib diff --git a/guests/host_vars/libvirt-freebsd-11/main.yml b/guests/host_var= s/libvirt-freebsd-11/main.yml index a83eed1..3848c3d 100644 --- a/guests/host_vars/libvirt-freebsd-11/main.yml +++ b/guests/host_vars/libvirt-freebsd-11/main.yml @@ -9,7 +9,6 @@ sudoers: /usr/local/etc/sudoers =20 projects: - base - - jenkins - libosinfo - libvirt - libvirt-glib diff --git a/guests/site.yml b/guests/site.yml index 8d32561..509d31a 100644 --- a/guests/site.yml +++ b/guests/site.yml @@ -28,6 +28,13 @@ when: - projects is defined =20 + # Install packages needed for the Jenkins agent + - include: tasks/packages.yml + vars: + project: jenkins + when: + - flavor =3D=3D "jenkins" + # Configure the Jenkins agent - include: tasks/jenkins.yml when: --=20 2.14.3 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Mon Apr 29 10:08:09 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 152156307286915.497735455557745; Tue, 20 Mar 2018 09:24:32 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 499B981231; Tue, 20 Mar 2018 16:24:31 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 2341B5D724; Tue, 20 Mar 2018 16:24:31 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id D779B181BA01; Tue, 20 Mar 2018 16:24:30 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w2KGO9pU022647 for ; Tue, 20 Mar 2018 12:24:09 -0400 Received: by smtp.corp.redhat.com (Postfix) id 08AA811701C9; Tue, 20 Mar 2018 16:24:09 +0000 (UTC) Received: from inaba.usersys.redhat.com (unknown [10.43.2.44]) by smtp.corp.redhat.com (Postfix) with ESMTPS id A40DE11701C8 for ; Tue, 20 Mar 2018 16:24:08 +0000 (UTC) From: Andrea Bolognani To: libvir-list@redhat.com Date: Tue, 20 Mar 2018 17:24:00 +0100 Message-Id: <20180320162400.5084-4-abologna@redhat.com> In-Reply-To: <20180320162400.5084-1-abologna@redhat.com> References: <20180320162400.5084-1-abologna@redhat.com> X-Scanned-By: MIMEDefang 2.78 on 10.11.54.3 X-loop: libvir-list@redhat.com Subject: [libvirt] [jenkins-ci PATCH 3/3] guests: Don't expose 'base' pseudo-package X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.25]); Tue, 20 Mar 2018 16:24:31 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" The 'base' pseudo-package is an implementation detail, and as such is better not exposed. Signed-off-by: Andrea Bolognani --- 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_var= s/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_var= s/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 =20 projects: - - base - libosinfo - libvirt - libvirt-glib diff --git a/guests/host_vars/libvirt-freebsd-11/main.yml b/guests/host_var= s/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 =20 projects: - - base - libosinfo - libvirt - libvirt-glib diff --git a/guests/host_vars/libvirt-freebsd-current/main.yml b/guests/hos= t_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 =20 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 =20 + # Install base packages + - include: tasks/packages.yml + vars: + project: base + # Install build dependencies for each project - include: tasks/packages.yml with_items: --=20 2.14.3 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Mon Apr 29 10:08:09 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1521634821673139.52519517060398; Wed, 21 Mar 2018 05:20:21 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id F2FBA2820D; Wed, 21 Mar 2018 12:20:19 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 904603791; Wed, 21 Mar 2018 12:20:19 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 590D5181B9FF; Wed, 21 Mar 2018 12:20:18 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w2LCKH38021901 for ; Wed, 21 Mar 2018 08:20:17 -0400 Received: by smtp.corp.redhat.com (Postfix) id E7610215CDB7; Wed, 21 Mar 2018 12:20:16 +0000 (UTC) Received: from inaba.usersys.redhat.com (unknown [10.43.2.44]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 8CA532166BDA for ; Wed, 21 Mar 2018 12:20:16 +0000 (UTC) From: Andrea Bolognani To: libvir-list@redhat.com Date: Wed, 21 Mar 2018 13:19:57 +0100 Message-Id: <20180321122002.6605-1-abologna@redhat.com> In-Reply-To: <20180320162400.5084-1-abologna@redhat.com> References: <20180320162400.5084-1-abologna@redhat.com> X-Scanned-By: MIMEDefang 2.78 on 10.11.54.6 X-loop: libvir-list@redhat.com Subject: [libvirt] [jenkins-ci PATCH 4/3] guests: Remove ad-hoc package installation X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.30]); Wed, 21 Mar 2018 12:20:20 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" There is a small number of packages that we install as part of the 'base' task with an ad-hoc call to the package module. Since we have generic facilities for installing packages and a generic 'base' pseudo-project that we use for all packages that are not related to any specific project, we can fold everything into it and have a single source of truth. The change requires us to delay user creation, though, because as part of that we edit the sudoers file, which doesn't exist until the sudo package has been installed. Signed-off-by: Andrea Bolognani Reviewed-by: Pavel Hrdina --- guests/site.yml | 7 +++++-- guests/tasks/base.yml | 11 ----------- guests/vars/mappings.yml | 15 +++++++++++++++ guests/vars/projects/base.yml | 5 +++++ 4 files changed, 25 insertions(+), 13 deletions(-) diff --git a/guests/site.yml b/guests/site.yml index 4207d4e..d057116 100644 --- a/guests/site.yml +++ b/guests/site.yml @@ -14,16 +14,19 @@ =20 tasks: =20 - # Prepare the base environment + # Prepare environment. None of the actions performed here might + # depend on packages being installed - include: tasks/base.yml - include: tasks/compat.yml - - include: tasks/user.yml =20 # Install base packages - include: tasks/packages.yml vars: project: base =20 + # Create users. This needs to happen after installing base packages + - include: tasks/user.yml + # Install build dependencies for each project - include: tasks/packages.yml with_items: diff --git a/guests/tasks/base.yml b/guests/tasks/base.yml index 8d7ff44..5379bf6 100644 --- a/guests/tasks/base.yml +++ b/guests/tasks/base.yml @@ -115,17 +115,6 @@ when: - package_format =3D=3D 'pkg' =20 -- name: Install base packages - package: - name: '{{ item }}' - state: present - with_items: - - bash - - git - - screen - - sudo - - vim - - name: Remove unwanted packages package: name: '{{ item }}' diff --git a/guests/vars/mappings.yml b/guests/vars/mappings.yml index 190013e..f6ac801 100644 --- a/guests/vars/mappings.yml +++ b/guests/vars/mappings.yml @@ -53,6 +53,9 @@ mappings: pkg: avahi rpm: avahi-devel =20 + bash: + default: bash + bash-completion: default: bash-completion CentOS6: @@ -107,6 +110,9 @@ mappings: gettext: default: gettext =20 + git: + default: git + glib2: deb: libglib2.0-dev pkg: glib @@ -635,6 +641,9 @@ mappings: rpm: sanlock-devel Ubuntu12: =20 + screen: + default: screen + scrub: default: scrub FreeBSD: diskscrub @@ -654,6 +663,9 @@ mappings: rpm: spice-gtk3-devel CentOS6: =20 + sudo: + default: sudo + unzip: default: unzip FreeBSD: @@ -667,6 +679,9 @@ mappings: deb: valac CentOS6: =20 + vim: + default: vim + wget: default: wget =20 diff --git a/guests/vars/projects/base.yml b/guests/vars/projects/base.yml index d82f6b9..94644e4 100644 --- a/guests/vars/projects/base.yml +++ b/guests/vars/projects/base.yml @@ -3,10 +3,12 @@ packages: - autoconf - automake - autopoint + - bash - ccache - cppi - gcc - gettext + - git - glibc - libtool - libtoolize @@ -15,3 +17,6 @@ packages: - perl - pkg-config - rpmbuild + - screen + - sudo + - vim --=20 2.14.3 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list