[libvirt] [jenkins-ci PATCH 7/8] guests: Use "git_remote" when building

This makes the build process use the value provided by the user through lcitool instead of the default. With this change, building arbitrary branches from arbitrary git repository through lcitool is fully working. Signed-off-by: Andrea Bolognani <abologna(a)redhat.com&gt; --- guests/playbooks/build/projects/libosinfo.yml | 2 +- guests/playbooks/build/projects/libvirt-cim.yml | 2 +- guests/playbooks/build/projects/libvirt-dbus.yml | 2 +- guests/playbooks/build/projects/libvirt-glib.yml | 2 +- guests/playbooks/build/projects/libvirt-go-xml.yml | 2 +- guests/playbooks/build/projects/libvirt-go.yml | 2 +- guests/playbooks/build/projects/libvirt-perl.yml | 2 +- guests/playbooks/build/projects/libvirt-python.yml | 2 +- guests/playbooks/build/projects/libvirt-sandbox.yml | 2 +- guests/playbooks/build/projects/libvirt-tck.yml | 2 +- guests/playbooks/build/projects/libvirt.yml | 2 +- guests/playbooks/build/projects/osinfo-db-tools.yml | 2 +- guests/playbooks/build/projects/osinfo-db.yml | 2 +- guests/playbooks/build/projects/virt-manager.yml | 2 +- guests/playbooks/build/projects/virt-viewer.yml | 2 +- 15 files changed, 15 insertions(+), 15 deletions(-) diff --git a/guests/playbooks/build/projects/libosinfo.yml b/guests/playbooks/build/projects/libosinfo.yml index 9082c33..bd59c58 100644 --- a/guests/playbooks/build/projects/libosinfo.yml +++ b/guests/playbooks/build/projects/libosinfo.yml @@ -3,7 +3,7 @@ name: libosinfo machines: '{{ all_machines }}' archive_format: gz - git_url: '{{ git_urls["libosinfo"]["upstream"] }}' + git_url: '{{ git_urls["libosinfo"][git_remote] }}' - include: '{{ playbook_base }}/jobs/prepare.yml' - include: '{{ playbook_base }}/jobs/autotools-build-job.yml' diff --git a/guests/playbooks/build/projects/libvirt-cim.yml b/guests/playbooks/build/projects/libvirt-cim.yml index a5cc82f..d530ffb 100644 --- a/guests/playbooks/build/projects/libvirt-cim.yml +++ b/guests/playbooks/build/projects/libvirt-cim.yml @@ -3,7 +3,7 @@ name: libvirt-cim machines: '{{ rpm_machines }}' archive_format: gz - git_url: '{{ git_urls["libvirt-cim"]["upstream"] }}' + git_url: '{{ git_urls["libvirt-cim"][git_remote] }}' - include: '{{ playbook_base }}/jobs/prepare.yml' - include: '{{ playbook_base }}/jobs/autotools-build-job.yml' diff --git a/guests/playbooks/build/projects/libvirt-dbus.yml b/guests/playbooks/build/projects/libvirt-dbus.yml index 857c82a..69ba144 100644 --- a/guests/playbooks/build/projects/libvirt-dbus.yml +++ b/guests/playbooks/build/projects/libvirt-dbus.yml @@ -15,7 +15,7 @@ - libvirt-ubuntu-16 - libvirt-ubuntu-18 archive_format: xz - git_url: '{{ git_urls["libvirt-dbus"]["upstream"] }}' + git_url: '{{ git_urls["libvirt-dbus"][git_remote] }}' - include: '{{ playbook_base }}/jobs/prepare.yml' - include: '{{ playbook_base }}/jobs/autotools-build-job.yml' diff --git a/guests/playbooks/build/projects/libvirt-glib.yml b/guests/playbooks/build/projects/libvirt-glib.yml index 78a40bf..2a5170e 100644 --- a/guests/playbooks/build/projects/libvirt-glib.yml +++ b/guests/playbooks/build/projects/libvirt-glib.yml @@ -3,7 +3,7 @@ name: libvirt-glib machines: '{{ all_machines }}' archive_format: gz - git_url: '{{ git_urls["libvirt-glib"]["upstream"] }}' + git_url: '{{ git_urls["libvirt-glib"][git_remote] }}' - include: '{{ playbook_base }}/jobs/prepare.yml' - include: '{{ playbook_base }}/jobs/autotools-build-job.yml' diff --git a/guests/playbooks/build/projects/libvirt-go-xml.yml b/guests/playbooks/build/projects/libvirt-go-xml.yml index e5f7b12..ef932b4 100644 --- a/guests/playbooks/build/projects/libvirt-go-xml.yml +++ b/guests/playbooks/build/projects/libvirt-go-xml.yml @@ -3,7 +3,7 @@ name: libvirt-go-xml machines: '{{ all_machines }}' archive_format: gz - git_url: '{{ git_urls["libvirt-go-xml"]["upstream"] }}' + git_url: '{{ git_urls["libvirt-go-xml"][git_remote] }}' - include: '{{ playbook_base }}/jobs/prepare.yml' - include: '{{ playbook_base }}/jobs/go-build-job.yml' diff --git a/guests/playbooks/build/projects/libvirt-go.yml b/guests/playbooks/build/projects/libvirt-go.yml index 78f9856..6c59900 100644 --- a/guests/playbooks/build/projects/libvirt-go.yml +++ b/guests/playbooks/build/projects/libvirt-go.yml @@ -3,7 +3,7 @@ name: libvirt-go machines: '{{ all_machines }}' archive_format: gz - git_url: '{{ git_urls["libvirt-go"]["upstream"] }}' + git_url: '{{ git_urls["libvirt-go"][git_remote] }}' - include: '{{ playbook_base }}/jobs/prepare.yml' - include: '{{ playbook_base }}/jobs/go-build-job.yml' diff --git a/guests/playbooks/build/projects/libvirt-perl.yml b/guests/playbooks/build/projects/libvirt-perl.yml index f90a8ed..e5164f3 100644 --- a/guests/playbooks/build/projects/libvirt-perl.yml +++ b/guests/playbooks/build/projects/libvirt-perl.yml @@ -3,7 +3,7 @@ name: libvirt-perl machines: '{{ all_machines }}' archive_format: gz - git_url: '{{ git_urls["libvirt-perl"]["upstream"] }}' + git_url: '{{ git_urls["libvirt-perl"][git_remote] }}' - include: '{{ playbook_base }}/jobs/prepare.yml' - include: '{{ playbook_base }}/jobs/perl-modulebuild-build-job.yml' diff --git a/guests/playbooks/build/projects/libvirt-python.yml b/guests/playbooks/build/projects/libvirt-python.yml index ba67f1b..bc4e4c1 100644 --- a/guests/playbooks/build/projects/libvirt-python.yml +++ b/guests/playbooks/build/projects/libvirt-python.yml @@ -3,7 +3,7 @@ name: libvirt-python machines: '{{ all_machines }}' archive_format: gz - git_url: '{{ git_urls["libvirt-python"]["upstream"] }}' + git_url: '{{ git_urls["libvirt-python"][git_remote] }}' - include: '{{ playbook_base }}/jobs/prepare.yml' - include: '{{ playbook_base }}/jobs/python-distutils-build-job.yml' diff --git a/guests/playbooks/build/projects/libvirt-sandbox.yml b/guests/playbooks/build/projects/libvirt-sandbox.yml index e4021c4..6b6a3f6 100644 --- a/guests/playbooks/build/projects/libvirt-sandbox.yml +++ b/guests/playbooks/build/projects/libvirt-sandbox.yml @@ -14,7 +14,7 @@ - libvirt-ubuntu-16 - libvirt-ubuntu-18 archive_format: gz - git_url: '{{ git_urls["libvirt-sandbox"]["upstream"] }}' + git_url: '{{ git_urls["libvirt-sandbox"][git_remote] }}' - include: '{{ playbook_base }}/jobs/prepare.yml' - include: '{{ playbook_base }}/jobs/autotools-build-job.yml' diff --git a/guests/playbooks/build/projects/libvirt-tck.yml b/guests/playbooks/build/projects/libvirt-tck.yml index 06d0c2a..e4b82cb 100644 --- a/guests/playbooks/build/projects/libvirt-tck.yml +++ b/guests/playbooks/build/projects/libvirt-tck.yml @@ -14,7 +14,7 @@ - libvirt-ubuntu-16 - libvirt-ubuntu-18 archive_format: gz - git_url: '{{ git_urls["libvirt-tck"]["upstream"] }}' + git_url: '{{ git_urls["libvirt-tck"][git_remote] }}' - include: '{{ playbook_base }}/jobs/prepare.yml' - include: '{{ playbook_base }}/jobs/perl-modulebuild-build-job.yml' diff --git a/guests/playbooks/build/projects/libvirt.yml b/guests/playbooks/build/projects/libvirt.yml index 1c5bdd2..a9d3397 100644 --- a/guests/playbooks/build/projects/libvirt.yml +++ b/guests/playbooks/build/projects/libvirt.yml @@ -3,7 +3,7 @@ name: libvirt machines: '{{ all_machines }}' archive_format: xz - git_url: '{{ git_urls["libvirt"]["upstream"] }}' + git_url: '{{ git_urls["libvirt"][git_remote] }}' - include: '{{ playbook_base }}/jobs/prepare.yml' - include: '{{ playbook_base }}/jobs/autotools-build-job.yml' diff --git a/guests/playbooks/build/projects/osinfo-db-tools.yml b/guests/playbooks/build/projects/osinfo-db-tools.yml index 26aa00a..0da981e 100644 --- a/guests/playbooks/build/projects/osinfo-db-tools.yml +++ b/guests/playbooks/build/projects/osinfo-db-tools.yml @@ -3,7 +3,7 @@ name: osinfo-db-tools machines: '{{ all_machines }}' archive_format: gz - git_url: '{{ git_urls["osinfo-db-tools"]["upstream"] }}' + git_url: '{{ git_urls["osinfo-db-tools"][git_remote] }}' - include: '{{ playbook_base }}/jobs/prepare.yml' - include: '{{ playbook_base }}/jobs/autotools-build-job.yml' diff --git a/guests/playbooks/build/projects/osinfo-db.yml b/guests/playbooks/build/projects/osinfo-db.yml index a199040..cc88fe8 100644 --- a/guests/playbooks/build/projects/osinfo-db.yml +++ b/guests/playbooks/build/projects/osinfo-db.yml @@ -3,7 +3,7 @@ name: osinfo-db machines: '{{ all_machines }}' archive_format: xz - git_url: '{{ git_urls["osinfo-db"]["upstream"] }}' + git_url: '{{ git_urls["osinfo-db"][git_remote] }}' - include: '{{ playbook_base }}/jobs/prepare.yml' - include: '{{ playbook_base }}/jobs/generic-build-job.yml' diff --git a/guests/playbooks/build/projects/virt-manager.yml b/guests/playbooks/build/projects/virt-manager.yml index a648ea1..0dec7f6 100644 --- a/guests/playbooks/build/projects/virt-manager.yml +++ b/guests/playbooks/build/projects/virt-manager.yml @@ -15,7 +15,7 @@ - libvirt-freebsd-current - libvirt-ubuntu-18 archive_format: gz - git_url: '{{ git_urls["virt-manager"]["upstream"] }}' + git_url: '{{ git_urls["virt-manager"][git_remote] }}' - include: '{{ playbook_base }}/jobs/prepare.yml' - include: '{{ playbook_base }}/jobs/python-distutils-build-job.yml' diff --git a/guests/playbooks/build/projects/virt-viewer.yml b/guests/playbooks/build/projects/virt-viewer.yml index da1a562..fe1e140 100644 --- a/guests/playbooks/build/projects/virt-viewer.yml +++ b/guests/playbooks/build/projects/virt-viewer.yml @@ -3,7 +3,7 @@ name: virt-viewer machines: '{{ all_machines }}' archive_format: gz - git_url: '{{ git_urls["virt-viewer"]["upstream"] }}' + git_url: '{{ git_urls["virt-viewer"][git_remote] }}' - include: '{{ playbook_base }}/jobs/prepare.yml' - include: '{{ playbook_base }}/jobs/autotools-build-job.yml' -- 2.17.1