From nobody Wed May 8 01:50:05 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 1536058909810643.7457558695387; Tue, 4 Sep 2018 04:01:49 -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 C9B1CC049D5B; Tue, 4 Sep 2018 11:01:47 +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 A668E5D6B3; Tue, 4 Sep 2018 11:01:46 +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 1F30B4BB7F; Tue, 4 Sep 2018 11:01:45 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w84B1gpg011738 for ; Tue, 4 Sep 2018 07:01:43 -0400 Received: by smtp.corp.redhat.com (Postfix) id B824C2027069; Tue, 4 Sep 2018 11:01:42 +0000 (UTC) Received: from inaba.usersys.redhat.com (unknown [10.43.2.44]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 3BB70202704B for ; Tue, 4 Sep 2018 11:01:41 +0000 (UTC) From: Andrea Bolognani To: libvir-list@redhat.com Date: Tue, 4 Sep 2018 13:01:33 +0200 Message-Id: <20180904110135.11232-2-abologna@redhat.com> In-Reply-To: <20180904110135.11232-1-abologna@redhat.com> References: <20180904110135.11232-1-abologna@redhat.com> X-Scanned-By: MIMEDefang 2.78 on 10.11.54.4 X-loop: libvir-list@redhat.com Subject: [libvirt] [jenkins-ci PATCH 1/3] guests: Split MinGW projects 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.31]); Tue, 04 Sep 2018 11:01:48 +0000 (UTC) X-ZohoMail: RDMRC_0 RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" The 32-bit and 64-bit MinGW builds require almost completely different sets of packages, so it makes sense to split them off into separate pseudo-projects in order to have more control over what gets installed on each host. Signed-off-by: Andrea Bolognani Reviewed-by: Erik Skultety --- guests/host_vars/libvirt-fedora-rawhide/main.yml | 15 ++++++++++----- ...{libosinfo+mingw.yml =3D> libosinfo+mingw32.yml} | 4 ---- ...{libosinfo+mingw.yml =3D> libosinfo+mingw64.yml} | 4 ---- .../{libvirt+mingw.yml =3D> libvirt+mingw32.yml} | 12 ------------ .../{libvirt+mingw.yml =3D> libvirt+mingw64.yml} | 12 ------------ ...rt-glib+mingw.yml =3D> libvirt-glib+mingw32.yml} | 2 -- ...rt-glib+mingw.yml =3D> libvirt-glib+mingw64.yml} | 2 -- ...ools+mingw.yml =3D> osinfo-db-tools+mingw32.yml} | 4 ---- ...glib+mingw.yml =3D> osinfo-db-tools+mingw64.yml} | 4 ++-- ...t-viewer+mingw.yml =3D> virt-viewer+mingw32.yml} | 11 ----------- ...t-viewer+mingw.yml =3D> virt-viewer+mingw64.yml} | 11 ----------- 11 files changed, 12 insertions(+), 69 deletions(-) copy guests/vars/projects/{libosinfo+mingw.yml =3D> libosinfo+mingw32.yml}= (56%) rename guests/vars/projects/{libosinfo+mingw.yml =3D> libosinfo+mingw64.ym= l} (56%) copy guests/vars/projects/{libvirt+mingw.yml =3D> libvirt+mingw32.yml} (51= %) rename guests/vars/projects/{libvirt+mingw.yml =3D> libvirt+mingw64.yml} (= 51%) copy guests/vars/projects/{libvirt-glib+mingw.yml =3D> libvirt-glib+mingw3= 2.yml} (57%) copy guests/vars/projects/{libvirt-glib+mingw.yml =3D> libvirt-glib+mingw6= 4.yml} (57%) rename guests/vars/projects/{osinfo-db-tools+mingw.yml =3D> osinfo-db-tool= s+mingw32.yml} (53%) rename guests/vars/projects/{libvirt-glib+mingw.yml =3D> osinfo-db-tools+m= ingw64.yml} (54%) copy guests/vars/projects/{virt-viewer+mingw.yml =3D> virt-viewer+mingw32.= yml} (52%) rename guests/vars/projects/{virt-viewer+mingw.yml =3D> virt-viewer+mingw6= 4.yml} (52%) diff --git a/guests/host_vars/libvirt-fedora-rawhide/main.yml b/guests/host= _vars/libvirt-fedora-rawhide/main.yml index 1bd3332..4318653 100644 --- a/guests/host_vars/libvirt-fedora-rawhide/main.yml +++ b/guests/host_vars/libvirt-fedora-rawhide/main.yml @@ -1,13 +1,16 @@ --- projects: - libosinfo - - libosinfo+mingw + - libosinfo+mingw32 + - libosinfo+mingw64 - libvirt - - libvirt+mingw + - libvirt+mingw32 + - libvirt+mingw64 - libvirt-cim - libvirt-dbus - libvirt-glib - - libvirt-glib+mingw + - libvirt-glib+mingw32 + - libvirt-glib+mingw64 - libvirt-go - libvirt-go-xml - libvirt-perl @@ -16,10 +19,12 @@ projects: - libvirt-tck - osinfo-db - osinfo-db-tools - - osinfo-db-tools+mingw + - osinfo-db-tools+mingw32 + - osinfo-db-tools+mingw64 - virt-manager - virt-viewer - - virt-viewer+mingw + - virt-viewer+mingw32 + - virt-viewer+mingw64 =20 package_format: rpm os_name: Fedora diff --git a/guests/vars/projects/libosinfo+mingw.yml b/guests/vars/project= s/libosinfo+mingw32.yml similarity index 56% copy from guests/vars/projects/libosinfo+mingw.yml copy to guests/vars/projects/libosinfo+mingw32.yml index 0eb27af..9435d1f 100644 --- a/guests/vars/projects/libosinfo+mingw.yml +++ b/guests/vars/projects/libosinfo+mingw32.yml @@ -4,8 +4,4 @@ packages: - mingw32-glib2 - mingw32-libxml2 - mingw32-libxslt - - mingw64-curl - - mingw64-glib2 - - mingw64-libxml2 - - mingw64-libxslt - wget diff --git a/guests/vars/projects/libosinfo+mingw.yml b/guests/vars/project= s/libosinfo+mingw64.yml similarity index 56% rename from guests/vars/projects/libosinfo+mingw.yml rename to guests/vars/projects/libosinfo+mingw64.yml index 0eb27af..b71664e 100644 --- a/guests/vars/projects/libosinfo+mingw.yml +++ b/guests/vars/projects/libosinfo+mingw64.yml @@ -1,9 +1,5 @@ --- packages: - - mingw32-curl - - mingw32-glib2 - - mingw32-libxml2 - - mingw32-libxslt - mingw64-curl - mingw64-glib2 - mingw64-libxml2 diff --git a/guests/vars/projects/libvirt+mingw.yml b/guests/vars/projects/= libvirt+mingw32.yml similarity index 51% copy from guests/vars/projects/libvirt+mingw.yml copy to guests/vars/projects/libvirt+mingw32.yml index 063e6a4..2fc6603 100644 --- a/guests/vars/projects/libvirt+mingw.yml +++ b/guests/vars/projects/libvirt+mingw32.yml @@ -12,15 +12,3 @@ packages: - mingw32-pkg-config - mingw32-portablexdr - mingw32-readline - - mingw64-curl - - mingw64-dbus - - mingw64-dlfcn - - mingw64-gcc - - mingw64-gettext - - mingw64-gnutls - - mingw64-libssh2 - - mingw64-libxml2 - - mingw64-openssl - - mingw64-pkg-config - - mingw64-portablexdr - - mingw64-readline diff --git a/guests/vars/projects/libvirt+mingw.yml b/guests/vars/projects/= libvirt+mingw64.yml similarity index 51% rename from guests/vars/projects/libvirt+mingw.yml rename to guests/vars/projects/libvirt+mingw64.yml index 063e6a4..615ecec 100644 --- a/guests/vars/projects/libvirt+mingw.yml +++ b/guests/vars/projects/libvirt+mingw64.yml @@ -1,17 +1,5 @@ --- packages: - - mingw32-curl - - mingw32-dbus - - mingw32-dlfcn - - mingw32-gcc - - mingw32-gettext - - mingw32-gnutls - - mingw32-libssh2 - - mingw32-libxml2 - - mingw32-openssl - - mingw32-pkg-config - - mingw32-portablexdr - - mingw32-readline - mingw64-curl - mingw64-dbus - mingw64-dlfcn diff --git a/guests/vars/projects/libvirt-glib+mingw.yml b/guests/vars/proj= ects/libvirt-glib+mingw32.yml similarity index 57% copy from guests/vars/projects/libvirt-glib+mingw.yml copy to guests/vars/projects/libvirt-glib+mingw32.yml index 49b9c6a..7e355c0 100644 --- a/guests/vars/projects/libvirt-glib+mingw.yml +++ b/guests/vars/projects/libvirt-glib+mingw32.yml @@ -1,6 +1,4 @@ --- packages: - mingw32-glib2 - - mingw64-glib2 - mingw32-libxml2 - - mingw64-libxml2 diff --git a/guests/vars/projects/libvirt-glib+mingw.yml b/guests/vars/proj= ects/libvirt-glib+mingw64.yml similarity index 57% copy from guests/vars/projects/libvirt-glib+mingw.yml copy to guests/vars/projects/libvirt-glib+mingw64.yml index 49b9c6a..452f82f 100644 --- a/guests/vars/projects/libvirt-glib+mingw.yml +++ b/guests/vars/projects/libvirt-glib+mingw64.yml @@ -1,6 +1,4 @@ --- packages: - - mingw32-glib2 - mingw64-glib2 - - mingw32-libxml2 - mingw64-libxml2 diff --git a/guests/vars/projects/osinfo-db-tools+mingw.yml b/guests/vars/p= rojects/osinfo-db-tools+mingw32.yml similarity index 53% rename from guests/vars/projects/osinfo-db-tools+mingw.yml rename to guests/vars/projects/osinfo-db-tools+mingw32.yml index 578e185..b133331 100644 --- a/guests/vars/projects/osinfo-db-tools+mingw.yml +++ b/guests/vars/projects/osinfo-db-tools+mingw32.yml @@ -4,7 +4,3 @@ packages: - mingw32-libxml2 - mingw32-libxslt - mingw32-libarchive - - mingw64-glib2 - - mingw64-libxml2 - - mingw64-libxslt - - mingw64-libarchive diff --git a/guests/vars/projects/libvirt-glib+mingw.yml b/guests/vars/proj= ects/osinfo-db-tools+mingw64.yml similarity index 54% rename from guests/vars/projects/libvirt-glib+mingw.yml rename to guests/vars/projects/osinfo-db-tools+mingw64.yml index 49b9c6a..049418c 100644 --- a/guests/vars/projects/libvirt-glib+mingw.yml +++ b/guests/vars/projects/osinfo-db-tools+mingw64.yml @@ -1,6 +1,6 @@ --- packages: - - mingw32-glib2 - mingw64-glib2 - - mingw32-libxml2 - mingw64-libxml2 + - mingw64-libxslt + - mingw64-libarchive diff --git a/guests/vars/projects/virt-viewer+mingw.yml b/guests/vars/proje= cts/virt-viewer+mingw32.yml similarity index 52% copy from guests/vars/projects/virt-viewer+mingw.yml copy to guests/vars/projects/virt-viewer+mingw32.yml index 5499dfe..2b914c3 100644 --- a/guests/vars/projects/virt-viewer+mingw.yml +++ b/guests/vars/projects/virt-viewer+mingw32.yml @@ -12,14 +12,3 @@ packages: - mingw32-rest - mingw32-spice-gtk3 - mingw32-usbredir - - mingw64-glib2 - - mingw64-glib-networking - - mingw64-gstreamer1-plugins-bad-free - - mingw64-gstreamer1-plugins-good - - mingw64-gtk3 - - mingw64-gtk-vnc2 - - mingw64-libgovirt - - mingw64-libusbx - - mingw64-rest - - mingw64-spice-gtk3 - - mingw64-usbredir diff --git a/guests/vars/projects/virt-viewer+mingw.yml b/guests/vars/proje= cts/virt-viewer+mingw64.yml similarity index 52% rename from guests/vars/projects/virt-viewer+mingw.yml rename to guests/vars/projects/virt-viewer+mingw64.yml index 5499dfe..6b42a7f 100644 --- a/guests/vars/projects/virt-viewer+mingw.yml +++ b/guests/vars/projects/virt-viewer+mingw64.yml @@ -1,17 +1,6 @@ --- packages: - icoutils - - mingw32-glib2 - - mingw32-glib-networking - - mingw32-gstreamer1-plugins-bad-free - - mingw32-gstreamer1-plugins-good - - mingw32-gtk3 - - mingw32-gtk-vnc2 - - mingw32-libgovirt - - mingw32-libusbx - - mingw32-rest - - mingw32-spice-gtk3 - - mingw32-usbredir - mingw64-glib2 - mingw64-glib-networking - mingw64-gstreamer1-plugins-bad-free --=20 2.17.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Wed May 8 01:50:05 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 1536058931029907.5993383389045; Tue, 4 Sep 2018 04:02:11 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.25]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 2D9A7CFFB; Tue, 4 Sep 2018 11:02:09 +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 95EB32015880; Tue, 4 Sep 2018 11:02:08 +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 33FBF4A460; Tue, 4 Sep 2018 11:02:08 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w84B1htM011754 for ; Tue, 4 Sep 2018 07:01:43 -0400 Received: by smtp.corp.redhat.com (Postfix) id 963312027069; Tue, 4 Sep 2018 11:01:43 +0000 (UTC) Received: from inaba.usersys.redhat.com (unknown [10.43.2.44]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 18E5F202704B for ; Tue, 4 Sep 2018 11:01:42 +0000 (UTC) From: Andrea Bolognani To: libvir-list@redhat.com Date: Tue, 4 Sep 2018 13:01:34 +0200 Message-Id: <20180904110135.11232-3-abologna@redhat.com> In-Reply-To: <20180904110135.11232-1-abologna@redhat.com> References: <20180904110135.11232-1-abologna@redhat.com> X-Scanned-By: MIMEDefang 2.78 on 10.11.54.4 X-loop: libvir-list@redhat.com Subject: [libvirt] [jenkins-ci PATCH 2/3] Split off MinGW builds 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.25 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.30]); Tue, 04 Sep 2018 11:02:10 +0000 (UTC) X-ZohoMail: RDMRC_0 RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Up until now, we've been considering MinGW builds as part of the respective project, at least when it comes to grouping them. This, however, does not quite work for a number of reasons: * MinGW builds have their own workspace, separate from the native one. It goes further than that: even the 32-bit and 64-bit builds use a workspace each, which goes to show that grouping all three together is inaccurate; * when using lcitool to perform builds, grouping all variants together has the annoying side-effect of potentially causing extra computation to happen: even if you only care about the native build, the MinGW builds will be automatically started after that, and even if you only care about the MinGW build you still have to sit through the native before you can get to it; * it causes asymmetry in lcitool usage, since you have to use eg. '-p libvirt+mingw64' when updating but '-p libvirt' when building. Making MinGW builds their own pseudo-projects solves all of the above. Signed-off-by: Andrea Bolognani Reviewed-by: Erik Skultety --- .../build/projects/libosinfo+mingw32.yml | 12 ++++++++++ .../build/projects/libosinfo+mingw64.yml | 12 ++++++++++ guests/playbooks/build/projects/libosinfo.yml | 22 ------------------- .../build/projects/libvirt+mingw32.yml | 12 ++++++++++ .../build/projects/libvirt+mingw64.yml | 12 ++++++++++ .../build/projects/libvirt-glib+mingw32.yml | 12 ++++++++++ .../build/projects/libvirt-glib+mingw64.yml | 12 ++++++++++ .../playbooks/build/projects/libvirt-glib.yml | 22 ------------------- guests/playbooks/build/projects/libvirt.yml | 22 ------------------- .../projects/osinfo-db-tools+mingw32.yml | 12 ++++++++++ .../projects/osinfo-db-tools+mingw64.yml | 13 +++++++++++ .../build/projects/osinfo-db-tools.yml | 22 ------------------- .../build/projects/virt-viewer+mingw32.yml | 12 ++++++++++ .../build/projects/virt-viewer+mingw64.yml | 12 ++++++++++ .../playbooks/build/projects/virt-viewer.yml | 22 ------------------- projects/libosinfo+mingw32.yaml | 12 ++++++++++ projects/libosinfo+mingw64.yaml | 12 ++++++++++ projects/libosinfo.yaml | 12 ---------- projects/libvirt+mingw32.yaml | 12 ++++++++++ projects/libvirt+mingw64.yaml | 12 ++++++++++ projects/libvirt-glib+mingw32.yaml | 12 ++++++++++ projects/libvirt-glib+mingw64.yaml | 12 ++++++++++ projects/libvirt-glib.yaml | 12 ---------- projects/libvirt.yaml | 12 ---------- projects/osinfo-db-tools+mingw32.yaml | 12 ++++++++++ projects/osinfo-db-tools+mingw64.yaml | 12 ++++++++++ projects/osinfo-db-tools.yaml | 12 ---------- projects/virt-viewer+mingw32.yaml | 12 ++++++++++ projects/virt-viewer+mingw64.yaml | 12 ++++++++++ projects/virt-viewer.yaml | 12 ---------- 30 files changed, 241 insertions(+), 170 deletions(-) create mode 100644 guests/playbooks/build/projects/libosinfo+mingw32.yml create mode 100644 guests/playbooks/build/projects/libosinfo+mingw64.yml create mode 100644 guests/playbooks/build/projects/libvirt+mingw32.yml create mode 100644 guests/playbooks/build/projects/libvirt+mingw64.yml create mode 100644 guests/playbooks/build/projects/libvirt-glib+mingw32.yml create mode 100644 guests/playbooks/build/projects/libvirt-glib+mingw64.yml create mode 100644 guests/playbooks/build/projects/osinfo-db-tools+mingw32= .yml create mode 100644 guests/playbooks/build/projects/osinfo-db-tools+mingw64= .yml create mode 100644 guests/playbooks/build/projects/virt-viewer+mingw32.yml create mode 100644 guests/playbooks/build/projects/virt-viewer+mingw64.yml create mode 100644 projects/libosinfo+mingw32.yaml create mode 100644 projects/libosinfo+mingw64.yaml create mode 100644 projects/libvirt+mingw32.yaml create mode 100644 projects/libvirt+mingw64.yaml create mode 100644 projects/libvirt-glib+mingw32.yaml create mode 100644 projects/libvirt-glib+mingw64.yaml create mode 100644 projects/osinfo-db-tools+mingw32.yaml create mode 100644 projects/osinfo-db-tools+mingw64.yaml create mode 100644 projects/virt-viewer+mingw32.yaml create mode 100644 projects/virt-viewer+mingw64.yaml diff --git a/guests/playbooks/build/projects/libosinfo+mingw32.yml b/guests= /playbooks/build/projects/libosinfo+mingw32.yml new file mode 100644 index 0000000..4979f5f --- /dev/null +++ b/guests/playbooks/build/projects/libosinfo+mingw32.yml @@ -0,0 +1,12 @@ +--- +- set_fact: + name: libosinfo+mingw32 + machines: '{{ mingw_machines }}' + archive_format: gz + git_url: '{{ git_urls["libosinfo"][git_remote] }}' + +- include: '{{ playbook_base }}/jobs/prepare.yml' +- include: '{{ playbook_base }}/jobs/autotools-build-job.yml' + vars: + local_env: '{{ mingw32_local_env }}' + autogen_args: '{{ mingw32_autogen_args }}' diff --git a/guests/playbooks/build/projects/libosinfo+mingw64.yml b/guests= /playbooks/build/projects/libosinfo+mingw64.yml new file mode 100644 index 0000000..64b6dc1 --- /dev/null +++ b/guests/playbooks/build/projects/libosinfo+mingw64.yml @@ -0,0 +1,12 @@ +--- +- set_fact: + name: libosinfo+mingw64 + machines: '{{ mingw_machines }}' + archive_format: gz + git_url: '{{ git_urls["libosinfo"][git_remote] }}' + +- include: '{{ playbook_base }}/jobs/prepare.yml' +- include: '{{ playbook_base }}/jobs/autotools-build-job.yml' + vars: + local_env: '{{ mingw64_local_env }}' + autogen_args: '{{ mingw64_autogen_args }}' diff --git a/guests/playbooks/build/projects/libosinfo.yml b/guests/playboo= ks/build/projects/libosinfo.yml index bd59c58..311a52b 100644 --- a/guests/playbooks/build/projects/libosinfo.yml +++ b/guests/playbooks/build/projects/libosinfo.yml @@ -12,25 +12,3 @@ - include: '{{ playbook_base }}/jobs/autotools-rpm-job.yml' vars: machines: '{{ rpm_machines }}' - -- include: '{{ playbook_base }}/jobs/prepare.yml' - vars: - variant: -mingw32 - machines: '{{ mingw_machines }}' -- include: '{{ playbook_base }}/jobs/autotools-build-job.yml' - vars: - variant: -mingw32 - local_env: '{{ mingw32_local_env }}' - autogen_args: '{{ mingw32_autogen_args }}' - machines: '{{ mingw_machines }}' - -- include: '{{ playbook_base }}/jobs/prepare.yml' - vars: - variant: -mingw64 - machines: '{{ mingw_machines }}' -- include: '{{ playbook_base }}/jobs/autotools-build-job.yml' - vars: - variant: -mingw64 - local_env: '{{ mingw64_local_env }}' - autogen_args: '{{ mingw64_autogen_args }}' - machines: '{{ mingw_machines }}' diff --git a/guests/playbooks/build/projects/libvirt+mingw32.yml b/guests/p= laybooks/build/projects/libvirt+mingw32.yml new file mode 100644 index 0000000..a3b8bbc --- /dev/null +++ b/guests/playbooks/build/projects/libvirt+mingw32.yml @@ -0,0 +1,12 @@ +--- +- set_fact: + name: libvirt+mingw32 + machines: '{{ mingw_machines }}' + archive_format: xz + git_url: '{{ git_urls["libvirt"][git_remote] }}' + +- include: '{{ playbook_base }}/jobs/prepare.yml' +- include: '{{ playbook_base }}/jobs/autotools-build-job.yml' + vars: + local_env: '{{ mingw32_local_env }}' + autogen_args: '{{ mingw32_autogen_args }}' diff --git a/guests/playbooks/build/projects/libvirt+mingw64.yml b/guests/p= laybooks/build/projects/libvirt+mingw64.yml new file mode 100644 index 0000000..8597fe4 --- /dev/null +++ b/guests/playbooks/build/projects/libvirt+mingw64.yml @@ -0,0 +1,12 @@ +--- +- set_fact: + name: libvirt+mingw64 + machines: '{{ mingw_machines }}' + archive_format: xz + git_url: '{{ git_urls["libvirt"][git_remote] }}' + +- include: '{{ playbook_base }}/jobs/prepare.yml' +- include: '{{ playbook_base }}/jobs/autotools-build-job.yml' + vars: + local_env: '{{ mingw64_local_env }}' + autogen_args: '{{ mingw64_autogen_args }}' diff --git a/guests/playbooks/build/projects/libvirt-glib+mingw32.yml b/gue= sts/playbooks/build/projects/libvirt-glib+mingw32.yml new file mode 100644 index 0000000..f8d1424 --- /dev/null +++ b/guests/playbooks/build/projects/libvirt-glib+mingw32.yml @@ -0,0 +1,12 @@ +--- +- set_fact: + name: libvirt-glib+mingw32 + machines: '{{ mingw_machines }}' + archive_format: gz + git_url: '{{ git_urls["libvirt-glib"][git_remote] }}' + +- include: '{{ playbook_base }}/jobs/prepare.yml' +- include: '{{ playbook_base }}/jobs/autotools-build-job.yml' + vars: + local_env: '{{ mingw32_local_env }}' + autogen_args: '{{ mingw32_autogen_args }}' diff --git a/guests/playbooks/build/projects/libvirt-glib+mingw64.yml b/gue= sts/playbooks/build/projects/libvirt-glib+mingw64.yml new file mode 100644 index 0000000..e0ecfc1 --- /dev/null +++ b/guests/playbooks/build/projects/libvirt-glib+mingw64.yml @@ -0,0 +1,12 @@ +--- +- set_fact: + name: libvirt-glib+mingw64 + machines: '{{ mingw_machines }}' + archive_format: gz + git_url: '{{ git_urls["libvirt-glib"][git_remote] }}' + +- include: '{{ playbook_base }}/jobs/prepare.yml' +- include: '{{ playbook_base }}/jobs/autotools-build-job.yml' + vars: + local_env: '{{ mingw64_local_env }}' + autogen_args: '{{ mingw64_autogen_args }}' diff --git a/guests/playbooks/build/projects/libvirt-glib.yml b/guests/play= books/build/projects/libvirt-glib.yml index 2a5170e..ec1b251 100644 --- a/guests/playbooks/build/projects/libvirt-glib.yml +++ b/guests/playbooks/build/projects/libvirt-glib.yml @@ -14,25 +14,3 @@ - include: '{{ playbook_base }}/jobs/autotools-rpm-job.yml' vars: machines: '{{ rpm_machines }}' - -- include: '{{ playbook_base }}/jobs/prepare.yml' - vars: - variant: -mingw32 - machines: '{{ mingw_machines }}' -- include: '{{ playbook_base }}/jobs/autotools-build-job.yml' - vars: - variant: -mingw32 - local_env: '{{ mingw32_local_env }}' - autogen_args: '{{ mingw32_autogen_args }}' - machines: '{{ mingw_machines }}' - -- include: '{{ playbook_base }}/jobs/prepare.yml' - vars: - variant: -mingw64 - machines: '{{ mingw_machines }}' -- include: '{{ playbook_base }}/jobs/autotools-build-job.yml' - vars: - variant: -mingw64 - local_env: '{{ mingw64_local_env }}' - autogen_args: '{{ mingw64_autogen_args }}' - machines: '{{ mingw_machines }}' diff --git a/guests/playbooks/build/projects/libvirt.yml b/guests/playbooks= /build/projects/libvirt.yml index a9d3397..59635f5 100644 --- a/guests/playbooks/build/projects/libvirt.yml +++ b/guests/playbooks/build/projects/libvirt.yml @@ -33,25 +33,3 @@ - include: '{{ playbook_base }}/jobs/autotools-rpm-job.yml' vars: machines: '{{ rpm_machines }}' - -- include: '{{ playbook_base }}/jobs/prepare.yml' - vars: - variant: -mingw32 - machines: '{{ mingw_machines }}' -- include: '{{ playbook_base }}/jobs/autotools-build-job.yml' - vars: - variant: -mingw32 - local_env: '{{ mingw32_local_env }}' - autogen_args: '{{ mingw32_autogen_args }}' - machines: '{{ mingw_machines }}' - -- include: '{{ playbook_base }}/jobs/prepare.yml' - vars: - variant: -mingw64 - machines: '{{ mingw_machines }}' -- include: '{{ playbook_base }}/jobs/autotools-build-job.yml' - vars: - variant: -mingw64 - local_env: '{{ mingw64_local_env }}' - autogen_args: '{{ mingw64_autogen_args }}' - machines: '{{ mingw_machines }}' diff --git a/guests/playbooks/build/projects/osinfo-db-tools+mingw32.yml b/= guests/playbooks/build/projects/osinfo-db-tools+mingw32.yml new file mode 100644 index 0000000..5bf12ad --- /dev/null +++ b/guests/playbooks/build/projects/osinfo-db-tools+mingw32.yml @@ -0,0 +1,12 @@ +--- +- set_fact: + name: osinfo-db-tools+mingw32 + machines: '{{ mingw_machines }}' + archive_format: gz + git_url: '{{ git_urls["osinfo-db-tools"][git_remote] }}' + +- include: '{{ playbook_base }}/jobs/prepare.yml' +- include: '{{ playbook_base }}/jobs/autotools-build-job.yml' + vars: + local_env: '{{ mingw32_local_env }}' + autogen_args: '{{ mingw32_autogen_args }}' diff --git a/guests/playbooks/build/projects/osinfo-db-tools+mingw64.yml b/= guests/playbooks/build/projects/osinfo-db-tools+mingw64.yml new file mode 100644 index 0000000..c75a7c2 --- /dev/null +++ b/guests/playbooks/build/projects/osinfo-db-tools+mingw64.yml @@ -0,0 +1,13 @@ +--- +- set_fact: + name: osinfo-db-tools+mingw64 + machines: '{{ mingw_machines }}' + archive_format: gz + git_url: '{{ git_urls["osinfo-db-tools"][git_remote] }}' + +- include: '{{ playbook_base }}/jobs/prepare.yml' +- include: '{{ playbook_base }}/jobs/autotools-build-job.yml' + vars: + local_env: '{{ mingw64_local_env }}' + autogen_args: '{{ mingw64_autogen_args }}' + diff --git a/guests/playbooks/build/projects/osinfo-db-tools.yml b/guests/p= laybooks/build/projects/osinfo-db-tools.yml index 0da981e..c5aef9d 100644 --- a/guests/playbooks/build/projects/osinfo-db-tools.yml +++ b/guests/playbooks/build/projects/osinfo-db-tools.yml @@ -12,25 +12,3 @@ - include: '{{ playbook_base }}/jobs/autotools-rpm-job.yml' vars: machines: '{{ rpm_machines }}' - -- include: '{{ playbook_base }}/jobs/prepare.yml' - vars: - variant: -mingw32 - machines: '{{ mingw_machines }}' -- include: '{{ playbook_base }}/jobs/autotools-build-job.yml' - vars: - variant: -mingw32 - local_env: '{{ mingw32_local_env }}' - autogen_args: '{{ mingw32_autogen_args }}' - machines: '{{ mingw_machines }}' - -- include: '{{ playbook_base }}/jobs/prepare.yml' - vars: - variant: -mingw64 - machines: '{{ mingw_machines }}' -- include: '{{ playbook_base }}/jobs/autotools-build-job.yml' - vars: - variant: -mingw64 - local_env: '{{ mingw64_local_env }}' - autogen_args: '{{ mingw64_autogen_args }}' - machines: '{{ mingw_machines }}' diff --git a/guests/playbooks/build/projects/virt-viewer+mingw32.yml b/gues= ts/playbooks/build/projects/virt-viewer+mingw32.yml new file mode 100644 index 0000000..b46ec2c --- /dev/null +++ b/guests/playbooks/build/projects/virt-viewer+mingw32.yml @@ -0,0 +1,12 @@ +--- +- set_fact: + name: virt-viewer+mingw32 + machines: '{{ mingw_machines }}' + archive_format: gz + git_url: '{{ git_urls["virt-viewer"][git_remote] }}' + +- include: '{{ playbook_base }}/jobs/prepare.yml' +- include: '{{ playbook_base }}/jobs/autotools-build-job.yml' + vars: + local_env: '{{ mingw32_local_env }}' + autogen_args: '{{ mingw32_autogen_args }}' diff --git a/guests/playbooks/build/projects/virt-viewer+mingw64.yml b/gues= ts/playbooks/build/projects/virt-viewer+mingw64.yml new file mode 100644 index 0000000..9189549 --- /dev/null +++ b/guests/playbooks/build/projects/virt-viewer+mingw64.yml @@ -0,0 +1,12 @@ +--- +- set_fact: + name: virt-viewer+mingw64 + machines: '{{ mingw_machines }}' + archive_format: gz + git_url: '{{ git_urls["virt-viewer"][git_remote] }}' + +- include: '{{ playbook_base }}/jobs/prepare.yml' +- include: '{{ playbook_base }}/jobs/autotools-build-job.yml' + vars: + local_env: '{{ mingw64_local_env }}' + autogen_args: '{{ mingw64_autogen_args }}' diff --git a/guests/playbooks/build/projects/virt-viewer.yml b/guests/playb= ooks/build/projects/virt-viewer.yml index fe1e140..19b5669 100644 --- a/guests/playbooks/build/projects/virt-viewer.yml +++ b/guests/playbooks/build/projects/virt-viewer.yml @@ -16,25 +16,3 @@ machines: - libvirt-fedora-28 - libvirt-fedora-rawhide - -- include: '{{ playbook_base }}/jobs/prepare.yml' - vars: - variant: -mingw32 - machines: '{{ mingw_machines }}' -- include: '{{ playbook_base }}/jobs/autotools-build-job.yml' - vars: - variant: -mingw32 - local_env: '{{ mingw32_local_env }}' - autogen_args: '{{ mingw32_autogen_args }}' - machines: '{{ mingw_machines }}' - -- include: '{{ playbook_base }}/jobs/prepare.yml' - vars: - variant: -mingw64 - machines: '{{ mingw_machines }}' -- include: '{{ playbook_base }}/jobs/autotools-build-job.yml' - vars: - variant: -mingw64 - local_env: '{{ mingw64_local_env }}' - autogen_args: '{{ mingw64_autogen_args }}' - machines: '{{ mingw_machines }}' diff --git a/projects/libosinfo+mingw32.yaml b/projects/libosinfo+mingw32.y= aml new file mode 100644 index 0000000..611f4f9 --- /dev/null +++ b/projects/libosinfo+mingw32.yaml @@ -0,0 +1,12 @@ + +- project: + name: libosinfo+mingw32 + machines: '{mingw_machines}' + title: libosinfo MinGW (32-bit) + archive_format: gz + git_url: '{git_urls[libosinfo][default]}' + jobs: + - autotools-build-job: + parent_jobs: 'osinfo-db-tools+mingw32-build' + local_env: '{mingw32_local_env}' + autogen_args: '{mingw32_autogen_args}' diff --git a/projects/libosinfo+mingw64.yaml b/projects/libosinfo+mingw64.y= aml new file mode 100644 index 0000000..3f06f22 --- /dev/null +++ b/projects/libosinfo+mingw64.yaml @@ -0,0 +1,12 @@ + +- project: + name: libosinfo+mingw64 + machines: '{mingw_machines}' + title: libosinfo MinGW (64-bit) + archive_format: gz + git_url: '{git_urls[libosinfo][default]}' + jobs: + - autotools-build-job: + parent_jobs: 'osinfo-db-tools+mingw64-build' + local_env: '{mingw64_local_env}' + autogen_args: '{mingw64_autogen_args}' diff --git a/projects/libosinfo.yaml b/projects/libosinfo.yaml index 0e08515..0376d0c 100644 --- a/projects/libosinfo.yaml +++ b/projects/libosinfo.yaml @@ -15,15 +15,3 @@ - autotools-rpm-job: parent_jobs: 'libosinfo-check' machines: '{rpm_machines}' - - autotools-build-job: - parent_jobs: 'osinfo-db-tools-build-mingw32' - variant: -mingw32 - local_env: '{mingw32_local_env}' - autogen_args: '{mingw32_autogen_args}' - machines: '{mingw_machines}' - - autotools-build-job: - parent_jobs: 'osinfo-db-tools-build-mingw64' - variant: -mingw64 - local_env: '{mingw64_local_env}' - autogen_args: '{mingw64_autogen_args}' - machines: '{mingw_machines}' diff --git a/projects/libvirt+mingw32.yaml b/projects/libvirt+mingw32.yaml new file mode 100644 index 0000000..bc8730e --- /dev/null +++ b/projects/libvirt+mingw32.yaml @@ -0,0 +1,12 @@ + +- project: + name: libvirt+mingw32 + machines: '{mingw_machines}' + title: Libvirt MinGW (32-bit) + archive_format: xz + git_url: '{git_urls[libvirt][default]}' + jobs: + - autotools-build-job: + parent_jobs: + local_env: '{mingw32_local_env}' + autogen_args: '{mingw32_autogen_args}' diff --git a/projects/libvirt+mingw64.yaml b/projects/libvirt+mingw64.yaml new file mode 100644 index 0000000..62a99e0 --- /dev/null +++ b/projects/libvirt+mingw64.yaml @@ -0,0 +1,12 @@ + +- project: + name: libvirt+mingw64 + machines: '{mingw_machines}' + title: Libvirt MinGW (64-bit) + archive_format: xz + git_url: '{git_urls[libvirt][default]}' + jobs: + - autotools-build-job: + parent_jobs: + local_env: '{mingw64_local_env}' + autogen_args: '{mingw64_autogen_args}' diff --git a/projects/libvirt-glib+mingw32.yaml b/projects/libvirt-glib+min= gw32.yaml new file mode 100644 index 0000000..e1927b4 --- /dev/null +++ b/projects/libvirt-glib+mingw32.yaml @@ -0,0 +1,12 @@ + +- project: + name: libvirt-glib+mingw32 + machines: '{mingw_machines}' + title: Libvirt GLib MinGW (32-bit) + archive_format: gz + git_url: '{git_urls[libvirt-glib][default]}' + jobs: + - autotools-build-job: + parent_jobs: 'libvirt+mingw32-build' + local_env: '{mingw32_local_env}' + autogen_args: '{mingw32_autogen_args}' diff --git a/projects/libvirt-glib+mingw64.yaml b/projects/libvirt-glib+min= gw64.yaml new file mode 100644 index 0000000..d67053f --- /dev/null +++ b/projects/libvirt-glib+mingw64.yaml @@ -0,0 +1,12 @@ + +- project: + name: libvirt-glib+mingw64 + machines: '{mingw_machines}' + title: Libvirt GLib MinGW (64-bit) + archive_format: gz + git_url: '{git_urls[libvirt-glib][default]}' + jobs: + - autotools-build-job: + parent_jobs: 'libvirt+mingw64-build' + local_env: '{mingw64_local_env}' + autogen_args: '{mingw64_autogen_args}' diff --git a/projects/libvirt-glib.yaml b/projects/libvirt-glib.yaml index 3f2aae3..9b7f828 100644 --- a/projects/libvirt-glib.yaml +++ b/projects/libvirt-glib.yaml @@ -16,15 +16,3 @@ - autotools-rpm-job: parent_jobs: 'libvirt-glib-check' machines: '{rpm_machines}' - - autotools-build-job: - parent_jobs: 'libvirt-build-mingw32' - variant: -mingw32 - local_env: '{mingw32_local_env}' - autogen_args: '{mingw32_autogen_args}' - machines: '{mingw_machines}' - - autotools-build-job: - parent_jobs: 'libvirt-build-mingw64' - variant: -mingw64 - local_env: '{mingw64_local_env}' - autogen_args: '{mingw64_autogen_args}' - machines: '{mingw_machines}' diff --git a/projects/libvirt.yaml b/projects/libvirt.yaml index ebcef77..7425f05 100644 --- a/projects/libvirt.yaml +++ b/projects/libvirt.yaml @@ -31,15 +31,3 @@ - autotools-rpm-job: parent_jobs: 'libvirt-check' machines: '{rpm_machines}' - - autotools-build-job: - parent_jobs: - variant: -mingw32 - local_env: '{mingw32_local_env}' - autogen_args: '{mingw32_autogen_args}' - machines: '{mingw_machines}' - - autotools-build-job: - parent_jobs: - variant: -mingw64 - local_env: '{mingw64_local_env}' - autogen_args: '{mingw64_autogen_args}' - machines: '{mingw_machines}' diff --git a/projects/osinfo-db-tools+mingw32.yaml b/projects/osinfo-db-too= ls+mingw32.yaml new file mode 100644 index 0000000..1f8d7cb --- /dev/null +++ b/projects/osinfo-db-tools+mingw32.yaml @@ -0,0 +1,12 @@ + +- project: + name: osinfo-db-tools+mingw32 + machines: '{mingw_machines}' + title: osinfo database tools MinGW (32-bit) + archive_format: gz + git_url: '{git_urls[osinfo-db-tools][default]}' + jobs: + - autotools-build-job: + parent_jobs: + local_env: '{mingw32_local_env}' + autogen_args: '{mingw32_autogen_args}' diff --git a/projects/osinfo-db-tools+mingw64.yaml b/projects/osinfo-db-too= ls+mingw64.yaml new file mode 100644 index 0000000..4216d1b --- /dev/null +++ b/projects/osinfo-db-tools+mingw64.yaml @@ -0,0 +1,12 @@ + +- project: + name: osinfo-db-tools+mingw64 + machines: '{mingw_machines}' + title: osinfo database tools MinGW (64-bit) + archive_format: gz + git_url: '{git_urls[osinfo-db-tools][default]}' + jobs: + - autotools-build-job: + parent_jobs: + local_env: '{mingw64_local_env}' + autogen_args: '{mingw64_autogen_args}' diff --git a/projects/osinfo-db-tools.yaml b/projects/osinfo-db-tools.yaml index 8243c08..b4558fc 100644 --- a/projects/osinfo-db-tools.yaml +++ b/projects/osinfo-db-tools.yaml @@ -15,15 +15,3 @@ - autotools-rpm-job: parent_jobs: 'osinfo-db-tools-check' machines: '{rpm_machines}' - - autotools-build-job: - parent_jobs: - variant: -mingw32 - local_env: '{mingw32_local_env}' - autogen_args: '{mingw32_autogen_args}' - machines: '{mingw_machines}' - - autotools-build-job: - parent_jobs: - variant: -mingw64 - local_env: '{mingw64_local_env}' - autogen_args: '{mingw64_autogen_args}' - machines: '{mingw_machines}' diff --git a/projects/virt-viewer+mingw32.yaml b/projects/virt-viewer+mingw= 32.yaml new file mode 100644 index 0000000..5850982 --- /dev/null +++ b/projects/virt-viewer+mingw32.yaml @@ -0,0 +1,12 @@ + +- project: + name: virt-viewer+mingw32 + machines: '{mingw_machines}' + title: Virt Viewer MinGW (32-bit) + archive_format: gz + git_url: '{git_urls[virt-viewer][default]}' + jobs: + - autotools-build-job: + parent_jobs: 'libvirt-glib+mingw32-build' + local_env: '{mingw32_local_env}' + autogen_args: '{mingw32_autogen_args}' diff --git a/projects/virt-viewer+mingw64.yaml b/projects/virt-viewer+mingw= 64.yaml new file mode 100644 index 0000000..763e474 --- /dev/null +++ b/projects/virt-viewer+mingw64.yaml @@ -0,0 +1,12 @@ + +- project: + name: virt-viewer+mingw64 + machines: '{mingw_machines}' + title: Virt Viewer MinGW (64-bit) + archive_format: gz + git_url: '{git_urls[virt-viewer][default]}' + jobs: + - autotools-build-job: + parent_jobs: 'libvirt-glib+mingw64-build' + local_env: '{mingw64_local_env}' + autogen_args: '{mingw64_autogen_args}' diff --git a/projects/virt-viewer.yaml b/projects/virt-viewer.yaml index 666d37f..ceb0b41 100644 --- a/projects/virt-viewer.yaml +++ b/projects/virt-viewer.yaml @@ -19,15 +19,3 @@ machines: - libvirt-fedora-28 - libvirt-fedora-rawhide - - autotools-build-job: - parent_jobs: 'libvirt-glib-build-mingw32' - variant: -mingw32 - local_env: '{mingw32_local_env}' - autogen_args: '{mingw32_autogen_args}' - machines: '{mingw_machines}' - - autotools-build-job: - parent_jobs: 'libvirt-glib-build-mingw64' - variant: -mingw64 - local_env: '{mingw64_local_env}' - autogen_args: '{mingw64_autogen_args}' - machines: '{mingw_machines}' --=20 2.17.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Wed May 8 01:50:05 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 1536058909639307.123504658553; Tue, 4 Sep 2018 04:01:49 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id CB243308FBA2; Tue, 4 Sep 2018 11:01:47 +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 516F35C541; Tue, 4 Sep 2018 11:01:47 +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 481DC4A460; Tue, 4 Sep 2018 11:01:46 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w84B1iTX011759 for ; Tue, 4 Sep 2018 07:01:44 -0400 Received: by smtp.corp.redhat.com (Postfix) id 409DF2027069; Tue, 4 Sep 2018 11:01:44 +0000 (UTC) Received: from inaba.usersys.redhat.com (unknown [10.43.2.44]) by smtp.corp.redhat.com (Postfix) with ESMTPS id D5054202704B for ; Tue, 4 Sep 2018 11:01:43 +0000 (UTC) From: Andrea Bolognani To: libvir-list@redhat.com Date: Tue, 4 Sep 2018 13:01:35 +0200 Message-Id: <20180904110135.11232-4-abologna@redhat.com> In-Reply-To: <20180904110135.11232-1-abologna@redhat.com> References: <20180904110135.11232-1-abologna@redhat.com> X-Scanned-By: MIMEDefang 2.78 on 10.11.54.4 X-loop: libvir-list@redhat.com Subject: [libvirt] [jenkins-ci PATCH 3/3] Remove 'variant' 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.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.43]); Tue, 04 Sep 2018 11:01:48 +0000 (UTC) X-ZohoMail: RDMRC_0 RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" It's no longer used anywhere. Signed-off-by: Andrea Bolognani Reviewed-by: Erik Skultety --- .../playbooks/build/jobs/autotools-build-job.yml | 4 ++-- .../playbooks/build/jobs/autotools-check-job.yml | 4 ++-- .../playbooks/build/jobs/autotools-rpm-job.yml | 4 ++-- .../build/jobs/autotools-syntax-check-job.yml | 4 ++-- guests/playbooks/build/jobs/defaults.yml | 1 - .../playbooks/build/jobs/generic-build-job.yml | 4 ++-- .../playbooks/build/jobs/generic-check-job.yml | 4 ++-- guests/playbooks/build/jobs/generic-rpm-job.yml | 4 ++-- .../build/jobs/generic-syntax-check-job.yml | 4 ++-- guests/playbooks/build/jobs/go-build-job.yml | 4 ++-- guests/playbooks/build/jobs/go-check-job.yml | 4 ++-- .../build/jobs/perl-modulebuild-build-job.yml | 4 ++-- .../build/jobs/perl-modulebuild-check-job.yml | 4 ++-- .../build/jobs/perl-modulebuild-rpm-job.yml | 4 ++-- guests/playbooks/build/jobs/prepare.yml | 8 ++++---- .../build/jobs/python-distutils-build-job.yml | 4 ++-- .../build/jobs/python-distutils-check-job.yml | 4 ++-- .../build/jobs/python-distutils-rpm-job.yml | 4 ++-- jobs/autotools.yaml | 16 ++++++++-------- jobs/defaults.yaml | 1 - jobs/generic.yaml | 16 ++++++++-------- jobs/go.yaml | 8 ++++---- jobs/perl-modulebuild.yaml | 12 ++++++------ jobs/python-distutils.yaml | 12 ++++++------ 24 files changed, 68 insertions(+), 70 deletions(-) diff --git a/guests/playbooks/build/jobs/autotools-build-job.yml b/guests/p= laybooks/build/jobs/autotools-build-job.yml index 70751bb..bf7a616 100644 --- a/guests/playbooks/build/jobs/autotools-build-job.yml +++ b/guests/playbooks/build/jobs/autotools-build-job.yml @@ -1,8 +1,8 @@ --- -- name: '{{ name }}-build{{ variant }}' +- name: '{{ name }}-build' shell: | set -e - cd {{ name }}{{ variant }} + cd {{ name }} =20 {{ global_env }} {{ local_env }} diff --git a/guests/playbooks/build/jobs/autotools-check-job.yml b/guests/p= laybooks/build/jobs/autotools-check-job.yml index 24a3ad4..bcb6a85 100644 --- a/guests/playbooks/build/jobs/autotools-check-job.yml +++ b/guests/playbooks/build/jobs/autotools-check-job.yml @@ -1,8 +1,8 @@ --- -- name: '{{ name }}-check{{ variant }}' +- name: '{{ name }}-check' shell: | set -e - cd {{ name }}{{ variant }} + cd {{ name }} =20 {{ global_env }} {{ local_env }} diff --git a/guests/playbooks/build/jobs/autotools-rpm-job.yml b/guests/pla= ybooks/build/jobs/autotools-rpm-job.yml index 1778211..5927d68 100644 --- a/guests/playbooks/build/jobs/autotools-rpm-job.yml +++ b/guests/playbooks/build/jobs/autotools-rpm-job.yml @@ -1,8 +1,8 @@ --- -- name: '{{ name }}-rpm{{ variant }}' +- name: '{{ name }}-rpm' shell: | set -e - cd {{ name }}{{ variant }} + cd {{ name }} =20 {{ global_env }} {{ local_env }} diff --git a/guests/playbooks/build/jobs/autotools-syntax-check-job.yml b/g= uests/playbooks/build/jobs/autotools-syntax-check-job.yml index e101c6d..4906fdf 100644 --- a/guests/playbooks/build/jobs/autotools-syntax-check-job.yml +++ b/guests/playbooks/build/jobs/autotools-syntax-check-job.yml @@ -1,8 +1,8 @@ --- -- name: '{{ name }}-syntax-check{{ variant }}' +- name: '{{ name }}-syntax-check' shell: | set -e - cd {{ name }}{{ variant }} + cd {{ name }} =20 {{ global_env }} {{ local_env }} diff --git a/guests/playbooks/build/jobs/defaults.yml b/guests/playbooks/bu= ild/jobs/defaults.yml index 7ea7ab8..522dd83 100644 --- a/guests/playbooks/build/jobs/defaults.yml +++ b/guests/playbooks/build/jobs/defaults.yml @@ -1,5 +1,4 @@ --- -variant: '' all_machines: - libvirt-centos-7 - libvirt-debian-8 diff --git a/guests/playbooks/build/jobs/generic-build-job.yml b/guests/pla= ybooks/build/jobs/generic-build-job.yml index b651952..5639f7c 100644 --- a/guests/playbooks/build/jobs/generic-build-job.yml +++ b/guests/playbooks/build/jobs/generic-build-job.yml @@ -1,8 +1,8 @@ --- -- name: '{{ name }}-build{{ variant }}' +- name: '{{ name }}-build' shell: | set -e - cd {{ name }}{{ variant }} + cd {{ name }} =20 {{ global_env }} {{ local_env }} diff --git a/guests/playbooks/build/jobs/generic-check-job.yml b/guests/pla= ybooks/build/jobs/generic-check-job.yml index c133890..15717ec 100644 --- a/guests/playbooks/build/jobs/generic-check-job.yml +++ b/guests/playbooks/build/jobs/generic-check-job.yml @@ -1,8 +1,8 @@ --- -- name: '{{ name }}-check{{ variant }}' +- name: '{{ name }}-check' shell: | set -e - cd {{ name }}{{ variant }} + cd {{ name }} =20 {{ global_env }} {{ local_env }} diff --git a/guests/playbooks/build/jobs/generic-rpm-job.yml b/guests/playb= ooks/build/jobs/generic-rpm-job.yml index 879d9f4..502a91e 100644 --- a/guests/playbooks/build/jobs/generic-rpm-job.yml +++ b/guests/playbooks/build/jobs/generic-rpm-job.yml @@ -1,8 +1,8 @@ --- -- name: '{{ name }}-rpm{{ variant }}' +- name: '{{ name }}-rpm' shell: | set -e - cd {{ name }}{{ variant }} + cd {{ name }} =20 {{ global_env }} {{ local_env }} diff --git a/guests/playbooks/build/jobs/generic-syntax-check-job.yml b/gue= sts/playbooks/build/jobs/generic-syntax-check-job.yml index 471cbf5..413a47f 100644 --- a/guests/playbooks/build/jobs/generic-syntax-check-job.yml +++ b/guests/playbooks/build/jobs/generic-syntax-check-job.yml @@ -1,8 +1,8 @@ --- -- name: '{{ name }}-syntax-check{{ variant }}' +- name: '{{ name }}-syntax-check' shell: | set -e - cd {{ name }}{{ variant }} + cd {{ name }} =20 {{ global_env }} {{ local_env }} diff --git a/guests/playbooks/build/jobs/go-build-job.yml b/guests/playbook= s/build/jobs/go-build-job.yml index 5eb9de1..fc7df2d 100644 --- a/guests/playbooks/build/jobs/go-build-job.yml +++ b/guests/playbooks/build/jobs/go-build-job.yml @@ -1,8 +1,8 @@ --- -- name: '{{ name }}-build{{ variant }}' +- name: '{{ name }}-build' shell: | set -e - cd {{ name }}{{ variant }} + cd {{ name }} =20 {{ global_env }} {{ local_env }} diff --git a/guests/playbooks/build/jobs/go-check-job.yml b/guests/playbook= s/build/jobs/go-check-job.yml index 29f3c53..533e0ac 100644 --- a/guests/playbooks/build/jobs/go-check-job.yml +++ b/guests/playbooks/build/jobs/go-check-job.yml @@ -1,8 +1,8 @@ --- -- name: '{{ name }}-check{{ variant }}' +- name: '{{ name }}-check' shell: | set -e - cd {{ name }}{{ variant }} + cd {{ name }} =20 {{ global_env }} {{ local_env }} diff --git a/guests/playbooks/build/jobs/perl-modulebuild-build-job.yml b/g= uests/playbooks/build/jobs/perl-modulebuild-build-job.yml index 15a1089..398266e 100644 --- a/guests/playbooks/build/jobs/perl-modulebuild-build-job.yml +++ b/guests/playbooks/build/jobs/perl-modulebuild-build-job.yml @@ -1,8 +1,8 @@ --- -- name: '{{ name }}-build{{ variant }}' +- name: '{{ name }}-build' shell: | set -e - cd {{ name }}{{ variant }} + cd {{ name }} =20 {{ global_env }} {{ local_env }} diff --git a/guests/playbooks/build/jobs/perl-modulebuild-check-job.yml b/g= uests/playbooks/build/jobs/perl-modulebuild-check-job.yml index 5c8ab1b..e72df59 100644 --- a/guests/playbooks/build/jobs/perl-modulebuild-check-job.yml +++ b/guests/playbooks/build/jobs/perl-modulebuild-check-job.yml @@ -1,8 +1,8 @@ --- -- name: '{{ name }}-check{{ variant }}' +- name: '{{ name }}-check' shell: | set -e - cd {{ name }}{{ variant }} + cd {{ name }} =20 {{ global_env }} {{ local_env }} diff --git a/guests/playbooks/build/jobs/perl-modulebuild-rpm-job.yml b/gue= sts/playbooks/build/jobs/perl-modulebuild-rpm-job.yml index dad672c..bb9d7f6 100644 --- a/guests/playbooks/build/jobs/perl-modulebuild-rpm-job.yml +++ b/guests/playbooks/build/jobs/perl-modulebuild-rpm-job.yml @@ -1,8 +1,8 @@ --- -- name: '{{ name }}-rpm{{ variant }}' +- name: '{{ name }}-rpm' shell: | set -e - cd {{ name }}{{ variant }} + cd {{ name }} =20 {{ global_env }} {{ local_env }} diff --git a/guests/playbooks/build/jobs/prepare.yml b/guests/playbooks/bui= ld/jobs/prepare.yml index 7782c0f..576afbc 100644 --- a/guests/playbooks/build/jobs/prepare.yml +++ b/guests/playbooks/build/jobs/prepare.yml @@ -1,17 +1,17 @@ --- -- name: '{{ name }}-prepare{{ variant }}' +- name: '{{ name }}-prepare' git: repo: '{{ git_url }}' version: '{{ git_branch }}' - dest: '{{ name }}{{ variant }}' + dest: '{{ name }}' force: yes when: - inventory_hostname in machines =20 -- name: '{{ name }}-prepare{{ variant }}' +- name: '{{ name }}-prepare' shell: | set -e - cd {{ name }}{{ variant }} + cd {{ name }} =20 git clean -xdf git submodule update --init diff --git a/guests/playbooks/build/jobs/python-distutils-build-job.yml b/g= uests/playbooks/build/jobs/python-distutils-build-job.yml index 711edc2..d10cbcc 100644 --- a/guests/playbooks/build/jobs/python-distutils-build-job.yml +++ b/guests/playbooks/build/jobs/python-distutils-build-job.yml @@ -1,8 +1,8 @@ --- -- name: '{{ name }}-build{{ variant }}' +- name: '{{ name }}-build' shell: | set -e - cd {{ name }}{{ variant }} + cd {{ name }} =20 {{ global_env }} {{ local_env }} diff --git a/guests/playbooks/build/jobs/python-distutils-check-job.yml b/g= uests/playbooks/build/jobs/python-distutils-check-job.yml index 4f36868..93d9abf 100644 --- a/guests/playbooks/build/jobs/python-distutils-check-job.yml +++ b/guests/playbooks/build/jobs/python-distutils-check-job.yml @@ -1,8 +1,8 @@ --- -- name: '{{ name }}-check{{ variant }}' +- name: '{{ name }}-check' shell: | set -e - cd {{ name }}{{ variant }} + cd {{ name }} =20 {{ global_env }} {{ local_env }} diff --git a/guests/playbooks/build/jobs/python-distutils-rpm-job.yml b/gue= sts/playbooks/build/jobs/python-distutils-rpm-job.yml index bae2b9b..a122ec7 100644 --- a/guests/playbooks/build/jobs/python-distutils-rpm-job.yml +++ b/guests/playbooks/build/jobs/python-distutils-rpm-job.yml @@ -1,8 +1,8 @@ --- -- name: '{{ name }}-rpm{{ variant }}' +- name: '{{ name }}-rpm' shell: | set -e - cd {{ name }}{{ variant }} + cd {{ name }} =20 {{ global_env }} {{ local_env }} diff --git a/jobs/autotools.yaml b/jobs/autotools.yaml index 96e5edf..8956855 100644 --- a/jobs/autotools.yaml +++ b/jobs/autotools.yaml @@ -1,10 +1,10 @@ =20 - job-template: id: autotools-build-job - name: '{name}-build{variant}' + name: '{name}-build' project-type: matrix description: '{title} Build' - workspace: '{name}{variant}' + workspace: '{name}' child-workspace: '.' block-downstream: true block-upstream: true @@ -54,10 +54,10 @@ =20 - job-template: id: autotools-syntax-check-job - name: '{name}-syntax-check{variant}' + name: '{name}-syntax-check' project-type: matrix description: '{title} Syntax Check' - workspace: '{name}{variant}' + workspace: '{name}' child-workspace: '.' block-downstream: true block-upstream: true @@ -93,10 +93,10 @@ =20 - job-template: id: autotools-check-job - name: '{name}-check{variant}' + name: '{name}-check' project-type: matrix description: '{title} Check' - workspace: '{name}{variant}' + workspace: '{name}' child-workspace: '.' block-downstream: true block-upstream: true @@ -136,10 +136,10 @@ =20 - job-template: id: autotools-rpm-job - name: '{name}-rpm{variant}' + name: '{name}-rpm' project-type: matrix description: '{title} RPM' - workspace: '{name}{variant}' + workspace: '{name}' child-workspace: '.' block-downstream: true block-upstream: true diff --git a/jobs/defaults.yaml b/jobs/defaults.yaml index 1a81547..5cf84dc 100644 --- a/jobs/defaults.yaml +++ b/jobs/defaults.yaml @@ -1,7 +1,6 @@ =20 - defaults: name: global - variant: '' node: libvirt all_machines: - libvirt-centos-7 diff --git a/jobs/generic.yaml b/jobs/generic.yaml index fb7f866..70210b6 100644 --- a/jobs/generic.yaml +++ b/jobs/generic.yaml @@ -1,10 +1,10 @@ =20 - job-template: id: generic-build-job - name: '{name}-build{variant}' + name: '{name}-build' project-type: matrix description: '{title} Build' - workspace: '{name}{variant}' + workspace: '{name}' child-workspace: '.' block-downstream: true block-upstream: true @@ -50,10 +50,10 @@ =20 - job-template: id: generic-syntax-check-job - name: '{name}-syntax-check{variant}' + name: '{name}-syntax-check' project-type: matrix description: '{title} Syntax Check' - workspace: '{name}{variant}' + workspace: '{name}' child-workspace: '.' block-downstream: true block-upstream: true @@ -88,10 +88,10 @@ =20 - job-template: id: generic-check-job - name: '{name}-check{variant}' + name: '{name}-check' project-type: matrix description: '{title} Check' - workspace: '{name}{variant}' + workspace: '{name}' child-workspace: '.' block-downstream: true block-upstream: true @@ -126,10 +126,10 @@ =20 - job-template: id: generic-rpm-job - name: '{name}-rpm{variant}' + name: '{name}-rpm' project-type: matrix description: '{title} RPM' - workspace: '{name}{variant}' + workspace: '{name}' child-workspace: '.' block-downstream: true block-upstream: true diff --git a/jobs/go.yaml b/jobs/go.yaml index 56ad11f..9f09950 100644 --- a/jobs/go.yaml +++ b/jobs/go.yaml @@ -1,10 +1,10 @@ =20 - job-template: id: go-build-job - name: '{name}-build{variant}' + name: '{name}-build' project-type: matrix description: '{title} Build' - workspace: '{name}{variant}' + workspace: '{name}' child-workspace: '.' block-downstream: true block-upstream: true @@ -50,10 +50,10 @@ =20 - job-template: id: go-check-job - name: '{name}-check{variant}' + name: '{name}-check' project-type: matrix description: '{title} Check' - workspace: '{name}{variant}' + workspace: '{name}' child-workspace: '.' block-downstream: true block-upstream: true diff --git a/jobs/perl-modulebuild.yaml b/jobs/perl-modulebuild.yaml index af041c2..b1140f5 100644 --- a/jobs/perl-modulebuild.yaml +++ b/jobs/perl-modulebuild.yaml @@ -1,10 +1,10 @@ =20 - job-template: id: perl-modulebuild-build-job - name: '{name}-build{variant}' + name: '{name}-build' project-type: matrix description: '{title} Build' - workspace: '{name}{variant}' + workspace: '{name}' child-workspace: '.' block-downstream: true block-upstream: true @@ -53,10 +53,10 @@ =20 - job-template: id: perl-modulebuild-check-job - name: '{name}-check{variant}' + name: '{name}-check' project-type: matrix description: '{title} Check' - workspace: '{name}{variant}' + workspace: '{name}' child-workspace: '.' block-downstream: true block-upstream: true @@ -91,10 +91,10 @@ =20 - job-template: id: perl-modulebuild-rpm-job - name: '{name}-rpm{variant}' + name: '{name}-rpm' project-type: matrix description: '{title} RPM' - workspace: '{name}{variant}' + workspace: '{name}' child-workspace: '.' block-downstream: true block-upstream: true diff --git a/jobs/python-distutils.yaml b/jobs/python-distutils.yaml index fe85c98..af816fd 100644 --- a/jobs/python-distutils.yaml +++ b/jobs/python-distutils.yaml @@ -1,10 +1,10 @@ =20 - job-template: id: python-distutils-build-job - name: '{name}-build{variant}' + name: '{name}-build' project-type: matrix description: '{title} Build' - workspace: '{name}{variant}' + workspace: '{name}' child-workspace: '.' block-downstream: true block-upstream: true @@ -53,10 +53,10 @@ =20 - job-template: id: python-distutils-check-job - name: '{name}-check{variant}' + name: '{name}-check' project-type: matrix description: '{title} Check' - workspace: '{name}{variant}' + workspace: '{name}' child-workspace: '.' block-downstream: true block-upstream: true @@ -91,10 +91,10 @@ =20 - job-template: id: python-distutils-rpm-job - name: '{name}-rpm{variant}' + name: '{name}-rpm' project-type: matrix description: '{title} RPM' - workspace: '{name}{variant}' + workspace: '{name}' child-workspace: '.' block-downstream: true block-upstream: true --=20 2.17.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list