From nobody Tue Feb 10 08:41:24 2026 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 1532017953188154.7599693392184; Thu, 19 Jul 2018 09:32:33 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.24]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id E928B5F7AA; Thu, 19 Jul 2018 16:32:30 +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 B2602308BDB9; Thu, 19 Jul 2018 16:32:30 +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 64D0314B0D; Thu, 19 Jul 2018 16:32:30 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w6JGWIvo003735 for ; Thu, 19 Jul 2018 12:32:18 -0400 Received: by smtp.corp.redhat.com (Postfix) id E97C71C5B7; Thu, 19 Jul 2018 16:32:17 +0000 (UTC) Received: from inaba.usersys.redhat.com (unknown [10.43.2.44]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 8AEA91C5B8 for ; Thu, 19 Jul 2018 16:32:17 +0000 (UTC) From: Andrea Bolognani To: libvir-list@redhat.com Date: Thu, 19 Jul 2018 18:32:04 +0200 Message-Id: <20180719163208.23126-5-abologna@redhat.com> In-Reply-To: <20180719163208.23126-1-abologna@redhat.com> References: <20180719163208.23126-1-abologna@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.11.54.5 X-loop: libvir-list@redhat.com Subject: [libvirt] [jenkins-ci PATCH 4/8] guests: Move update playbook and related resources 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.84 on 10.5.11.24 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.39]); Thu, 19 Jul 2018 16:32:31 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" This has two advantages: it unclutters the top-level directory, and opens the door for adding more playbooks down the line without turning it into a mess. Thanks to the changes made earlier, moving the playbook is almost entirely transparent to lcitool. Signed-off-by: Andrea Bolognani Reviewed-by: Erik Skultety --- guests/lcitool | 4 ++-- guests/{site.yml =3D> playbooks/update/main.yml} | 0 guests/{ =3D> playbooks/update}/tasks/base.yml | 0 guests/{ =3D> playbooks/update}/tasks/bootloader.yml | 0 guests/{ =3D> playbooks/update}/tasks/bootstrap.yml | 0 guests/{ =3D> playbooks/update}/tasks/jenkins.yml | 0 guests/{ =3D> playbooks/update}/tasks/kludges.yml | 0 guests/{ =3D> playbooks/update}/tasks/packages.yml | 0 guests/{ =3D> playbooks/update}/tasks/paths.yml | 0 guests/{ =3D> playbooks/update}/tasks/services.yml | 0 guests/{ =3D> playbooks/update}/tasks/users.yml | 0 guests/{ =3D> playbooks/update}/templates/bash_profile.j2 | 0 guests/{ =3D> playbooks/update}/templates/bashrc.j2 | 0 guests/{ =3D> playbooks/update}/templates/ccache.conf.j2 | 0 .../update}/templates/fedora-rawhide-kernel-nodebug.repo.j2 | 0 guests/{ =3D> playbooks/update}/templates/jenkins.service.j2 | 0 .../update}/templates/jessie-backports.preferences.j2 | 0 .../update}/templates/jessie-backports.sources.j2 | 0 18 files changed, 2 insertions(+), 2 deletions(-) rename guests/{site.yml =3D> playbooks/update/main.yml} (100%) rename guests/{ =3D> playbooks/update}/tasks/base.yml (100%) rename guests/{ =3D> playbooks/update}/tasks/bootloader.yml (100%) rename guests/{ =3D> playbooks/update}/tasks/bootstrap.yml (100%) rename guests/{ =3D> playbooks/update}/tasks/jenkins.yml (100%) rename guests/{ =3D> playbooks/update}/tasks/kludges.yml (100%) rename guests/{ =3D> playbooks/update}/tasks/packages.yml (100%) rename guests/{ =3D> playbooks/update}/tasks/paths.yml (100%) rename guests/{ =3D> playbooks/update}/tasks/services.yml (100%) rename guests/{ =3D> playbooks/update}/tasks/users.yml (100%) rename guests/{ =3D> playbooks/update}/templates/bash_profile.j2 (100%) rename guests/{ =3D> playbooks/update}/templates/bashrc.j2 (100%) rename guests/{ =3D> playbooks/update}/templates/ccache.conf.j2 (100%) rename guests/{ =3D> playbooks/update}/templates/fedora-rawhide-kernel-nod= ebug.repo.j2 (100%) rename guests/{ =3D> playbooks/update}/templates/jenkins.service.j2 (100%) rename guests/{ =3D> playbooks/update}/templates/jessie-backports.preferen= ces.j2 (100%) rename guests/{ =3D> playbooks/update}/templates/jessie-backports.sources.= j2 (100%) diff --git a/guests/lcitool b/guests/lcitool index 206a014..2cfb0e9 100755 --- a/guests/lcitool +++ b/guests/lcitool @@ -431,8 +431,8 @@ class Application: ansible_hosts =3D ",".join(self._inventory.expand_pattern(hosts)) =20 ansible_cfg_path =3D os.path.join(base, "ansible.cfg") - playbook_base =3D base - playbook_path =3D os.path.join(playbook_base, "site.yml") + playbook_base =3D os.path.join(base, "playbooks", "update") + playbook_path =3D os.path.join(playbook_base, "main.yml") =20 extra_vars =3D json.dumps({ "base": base, diff --git a/guests/site.yml b/guests/playbooks/update/main.yml similarity index 100% rename from guests/site.yml rename to guests/playbooks/update/main.yml diff --git a/guests/tasks/base.yml b/guests/playbooks/update/tasks/base.yml similarity index 100% rename from guests/tasks/base.yml rename to guests/playbooks/update/tasks/base.yml diff --git a/guests/tasks/bootloader.yml b/guests/playbooks/update/tasks/bo= otloader.yml similarity index 100% rename from guests/tasks/bootloader.yml rename to guests/playbooks/update/tasks/bootloader.yml diff --git a/guests/tasks/bootstrap.yml b/guests/playbooks/update/tasks/boo= tstrap.yml similarity index 100% rename from guests/tasks/bootstrap.yml rename to guests/playbooks/update/tasks/bootstrap.yml diff --git a/guests/tasks/jenkins.yml b/guests/playbooks/update/tasks/jenki= ns.yml similarity index 100% rename from guests/tasks/jenkins.yml rename to guests/playbooks/update/tasks/jenkins.yml diff --git a/guests/tasks/kludges.yml b/guests/playbooks/update/tasks/kludg= es.yml similarity index 100% rename from guests/tasks/kludges.yml rename to guests/playbooks/update/tasks/kludges.yml diff --git a/guests/tasks/packages.yml b/guests/playbooks/update/tasks/pack= ages.yml similarity index 100% rename from guests/tasks/packages.yml rename to guests/playbooks/update/tasks/packages.yml diff --git a/guests/tasks/paths.yml b/guests/playbooks/update/tasks/paths.y= ml similarity index 100% rename from guests/tasks/paths.yml rename to guests/playbooks/update/tasks/paths.yml diff --git a/guests/tasks/services.yml b/guests/playbooks/update/tasks/serv= ices.yml similarity index 100% rename from guests/tasks/services.yml rename to guests/playbooks/update/tasks/services.yml diff --git a/guests/tasks/users.yml b/guests/playbooks/update/tasks/users.y= ml similarity index 100% rename from guests/tasks/users.yml rename to guests/playbooks/update/tasks/users.yml diff --git a/guests/templates/bash_profile.j2 b/guests/playbooks/update/tem= plates/bash_profile.j2 similarity index 100% rename from guests/templates/bash_profile.j2 rename to guests/playbooks/update/templates/bash_profile.j2 diff --git a/guests/templates/bashrc.j2 b/guests/playbooks/update/templates= /bashrc.j2 similarity index 100% rename from guests/templates/bashrc.j2 rename to guests/playbooks/update/templates/bashrc.j2 diff --git a/guests/templates/ccache.conf.j2 b/guests/playbooks/update/temp= lates/ccache.conf.j2 similarity index 100% rename from guests/templates/ccache.conf.j2 rename to guests/playbooks/update/templates/ccache.conf.j2 diff --git a/guests/templates/fedora-rawhide-kernel-nodebug.repo.j2 b/guest= s/playbooks/update/templates/fedora-rawhide-kernel-nodebug.repo.j2 similarity index 100% rename from guests/templates/fedora-rawhide-kernel-nodebug.repo.j2 rename to guests/playbooks/update/templates/fedora-rawhide-kernel-nodebug.r= epo.j2 diff --git a/guests/templates/jenkins.service.j2 b/guests/playbooks/update/= templates/jenkins.service.j2 similarity index 100% rename from guests/templates/jenkins.service.j2 rename to guests/playbooks/update/templates/jenkins.service.j2 diff --git a/guests/templates/jessie-backports.preferences.j2 b/guests/play= books/update/templates/jessie-backports.preferences.j2 similarity index 100% rename from guests/templates/jessie-backports.preferences.j2 rename to guests/playbooks/update/templates/jessie-backports.preferences.j2 diff --git a/guests/templates/jessie-backports.sources.j2 b/guests/playbook= s/update/templates/jessie-backports.sources.j2 similarity index 100% rename from guests/templates/jessie-backports.sources.j2 rename to guests/playbooks/update/templates/jessie-backports.sources.j2 --=20 2.17.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list