Out of the box, it contains the upstream repository for all projects; additionally, the user will be able to store information about their own repositories, making it possible to test-build in-progress branches before submitting the code upstream. Despite all the pieces being now in place for us to get rid of the per-project "git_url" variable entirely, we can't actually do that because Jenkins Job Builder, unlike Ansible, doesn't support dictionary access with other variables being used as keys. That's fairly okay, though, because the Jenkins part is less dynamic than the Ansible one anyway. Signed-off-by: Andrea Bolognani <abologna@xxxxxxxxxx> --- guests/playbooks/build/jobs/defaults.yml | 31 +++++++++++++++++++ guests/playbooks/build/projects/libosinfo.yml | 2 +- .../playbooks/build/projects/libvirt-cim.yml | 2 +- .../playbooks/build/projects/libvirt-dbus.yml | 2 +- .../playbooks/build/projects/libvirt-glib.yml | 2 +- .../build/projects/libvirt-go-xml.yml | 2 +- .../playbooks/build/projects/libvirt-go.yml | 2 +- .../playbooks/build/projects/libvirt-perl.yml | 2 +- .../build/projects/libvirt-python.yml | 2 +- .../build/projects/libvirt-sandbox.yml | 2 +- .../playbooks/build/projects/libvirt-tck.yml | 2 +- guests/playbooks/build/projects/libvirt.yml | 2 +- .../build/projects/osinfo-db-tools.yml | 2 +- guests/playbooks/build/projects/osinfo-db.yml | 2 +- .../playbooks/build/projects/virt-manager.yml | 2 +- .../playbooks/build/projects/virt-viewer.yml | 2 +- jobs/defaults.yaml | 31 +++++++++++++++++++ projects/libosinfo.yaml | 2 +- projects/libvirt-cim.yaml | 2 +- projects/libvirt-dbus.yaml | 2 +- projects/libvirt-glib.yaml | 2 +- projects/libvirt-go-xml.yaml | 2 +- projects/libvirt-go.yaml | 2 +- projects/libvirt-perl.yaml | 2 +- projects/libvirt-python.yaml | 2 +- projects/libvirt-sandbox.yaml | 2 +- projects/libvirt-tck.yaml | 2 +- projects/libvirt.yaml | 2 +- projects/osinfo-db-tools.yaml | 2 +- projects/osinfo-db.yaml | 2 +- projects/virt-manager.yaml | 2 +- projects/virt-viewer.yaml | 2 +- 32 files changed, 92 insertions(+), 30 deletions(-) diff --git a/guests/playbooks/build/jobs/defaults.yml b/guests/playbooks/build/jobs/defaults.yml index c07475c..b8fb6b7 100644 --- a/guests/playbooks/build/jobs/defaults.yml +++ b/guests/playbooks/build/jobs/defaults.yml @@ -40,3 +40,34 @@ mingw64_local_env: | export PKG_CONFIG_PATH="$VIRT_PREFIX/lib/pkgconfig" export PKG_CONFIG_LIBDIR="/usr/x86_64-w64-mingw32/sys-root/mingw/lib/pkgconfig:/usr/x86_64-w64-mingw32/sys-root/mingw/share/pkgconfig" mingw64_autogen_args: --host=x86_64-w64-mingw32 +git_urls: + libosinfo: + upstream: https://gitlab.com/libosinfo/libosinfo.git + libvirt-cim: + upstream: https://github.com/libvirt/libvirt-cim.git + libvirt-dbus: + upstream: https://github.com/libvirt/libvirt-dbus.git + libvirt-glib: + upstream: https://github.com/libvirt/libvirt-glib.git + libvirt-go-xml: + upstream: https://github.com/libvirt/libvirt-go-xml.git + libvirt-go: + upstream: https://github.com/libvirt/libvirt-go.git + libvirt-perl: + upstream: https://github.com/libvirt/libvirt-perl.git + libvirt-python: + upstream: https://github.com/libvirt/libvirt-python.git + libvirt-sandbox: + upstream: https://github.com/libvirt/libvirt-sandbox.git + libvirt-tck: + upstream: https://github.com/libvirt/libvirt-tck.git + libvirt: + upstream: https://github.com/libvirt/libvirt.git + osinfo-db-tools: + upstream: https://gitlab.com/libosinfo/osinfo-db-tools.git + osinfo-db: + upstream: https://gitlab.com/libosinfo/osinfo-db.git + virt-manager: + upstream: https://github.com/virt-manager/virt-manager.git + virt-viewer: + upstream: https://pagure.io/virt-viewer.git diff --git a/guests/playbooks/build/projects/libosinfo.yml b/guests/playbooks/build/projects/libosinfo.yml index c29053b..9082c33 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: https://gitlab.com/libosinfo/libosinfo.git + git_url: '{{ git_urls["libosinfo"]["upstream"] }}' - 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 f959bf6..a5cc82f 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: https://github.com/libvirt/libvirt-cim.git + git_url: '{{ git_urls["libvirt-cim"]["upstream"] }}' - 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 d9f5d4a..857c82a 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: https://github.com/libvirt/libvirt-dbus.git + git_url: '{{ git_urls["libvirt-dbus"]["upstream"] }}' - 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 0d8de9d..78a40bf 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: https://github.com/libvirt/libvirt-glib.git + git_url: '{{ git_urls["libvirt-glib"]["upstream"] }}' - 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 5dc86e7..e5f7b12 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: https://github.com/libvirt/libvirt-go-xml.git + git_url: '{{ git_urls["libvirt-go-xml"]["upstream"] }}' - 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 9316ef1..78f9856 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: https://github.com/libvirt/libvirt-go.git + git_url: '{{ git_urls["libvirt-go"]["upstream"] }}' - 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 6cb15bd..f90a8ed 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: https://github.com/libvirt/libvirt-perl.git + git_url: '{{ git_urls["libvirt-perl"]["upstream"] }}' - 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 f2c39be..ba67f1b 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: https://github.com/libvirt/libvirt-python.git + git_url: '{{ git_urls["libvirt-python"]["upstream"] }}' - 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 411cfc7..e4021c4 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: https://github.com/libvirt/libvirt-sandbox.git + git_url: '{{ git_urls["libvirt-sandbox"]["upstream"] }}' - 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 fa16d26..06d0c2a 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: https://github.com/libvirt/libvirt-tck.git + git_url: '{{ git_urls["libvirt-tck"]["upstream"] }}' - 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 bb3e53f..1c5bdd2 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: https://github.com/libvirt/libvirt.git + git_url: '{{ git_urls["libvirt"]["upstream"] }}' - 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 a4b7c0e..26aa00a 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: https://gitlab.com/libosinfo/osinfo-db-tools.git + git_url: '{{ git_urls["osinfo-db-tools"]["upstream"] }}' - 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 97bc31d..a199040 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: https://gitlab.com/libosinfo/osinfo-db.git + git_url: '{{ git_urls["osinfo-db"]["upstream"] }}' - 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 fcd4fa4..a648ea1 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: https://github.com/virt-manager/virt-manager.git + git_url: '{{ git_urls["virt-manager"]["upstream"] }}' - 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 04af2b3..da1a562 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: https://pagure.io/virt-viewer.git + git_url: '{{ git_urls["virt-viewer"]["upstream"] }}' - include: '{{ playbook_base }}/jobs/prepare.yml' - include: '{{ playbook_base }}/jobs/autotools-build-job.yml' diff --git a/jobs/defaults.yaml b/jobs/defaults.yaml index 872dea0..58f8801 100644 --- a/jobs/defaults.yaml +++ b/jobs/defaults.yaml @@ -39,4 +39,35 @@ export PKG_CONFIG_PATH="$VIRT_PREFIX/lib/pkgconfig" export PKG_CONFIG_LIBDIR="/usr/x86_64-w64-mingw32/sys-root/mingw/lib/pkgconfig:/usr/x86_64-w64-mingw32/sys-root/mingw/share/pkgconfig" mingw64_autogen_args: --host=x86_64-w64-mingw32 + git_urls: + libosinfo: + upstream: https://gitlab.com/libosinfo/libosinfo.git + libvirt-cim: + upstream: https://github.com/libvirt/libvirt-cim.git + libvirt-dbus: + upstream: https://github.com/libvirt/libvirt-dbus.git + libvirt-glib: + upstream: https://github.com/libvirt/libvirt-glib.git + libvirt-go-xml: + upstream: https://github.com/libvirt/libvirt-go-xml.git + libvirt-go: + upstream: https://github.com/libvirt/libvirt-go.git + libvirt-perl: + upstream: https://github.com/libvirt/libvirt-perl.git + libvirt-python: + upstream: https://github.com/libvirt/libvirt-python.git + libvirt-sandbox: + upstream: https://github.com/libvirt/libvirt-sandbox.git + libvirt-tck: + upstream: https://github.com/libvirt/libvirt-tck.git + libvirt: + upstream: https://github.com/libvirt/libvirt.git + osinfo-db-tools: + upstream: https://gitlab.com/libosinfo/osinfo-db-tools.git + osinfo-db: + upstream: https://gitlab.com/libosinfo/osinfo-db.git + virt-manager: + upstream: https://github.com/virt-manager/virt-manager.git + virt-viewer: + upstream: https://pagure.io/virt-viewer.git spam: ymankad@xxxxxxxxxx libvirt-ci@xxxxxxxxxx diff --git a/projects/libosinfo.yaml b/projects/libosinfo.yaml index 167b720..29dfe0a 100644 --- a/projects/libosinfo.yaml +++ b/projects/libosinfo.yaml @@ -4,7 +4,7 @@ machines: '{all_machines}' title: libosinfo archive_format: gz - git_url: https://gitlab.com/libosinfo/libosinfo.git + git_url: '{git_urls[libosinfo][upstream]}' jobs: - autotools-build-job: parent_jobs: 'osinfo-db-build' diff --git a/projects/libvirt-cim.yaml b/projects/libvirt-cim.yaml index 6657dc4..680b5c0 100644 --- a/projects/libvirt-cim.yaml +++ b/projects/libvirt-cim.yaml @@ -4,7 +4,7 @@ machines: '{rpm_machines}' title: libvirt CIM archive_format: gz - git_url: https://github.com/libvirt/libvirt-cim.git + git_url: '{git_urls[libvirt-cim][upstream]}' jobs: - autotools-build-job: parent_jobs: 'libvirt-build' diff --git a/projects/libvirt-dbus.yaml b/projects/libvirt-dbus.yaml index ff088e7..848ebf5 100644 --- a/projects/libvirt-dbus.yaml +++ b/projects/libvirt-dbus.yaml @@ -12,7 +12,7 @@ - libvirt-freebsd-11 title: Libvirt D-Bus archive_format: xz - git_url: https://github.com/libvirt/libvirt-dbus.git + git_url: '{git_urls[libvirt-dbus][upstream]}' jobs: - autotools-build-job: parent_jobs: 'libvirt-glib-build' diff --git a/projects/libvirt-glib.yaml b/projects/libvirt-glib.yaml index 02ba50f..ba78815 100644 --- a/projects/libvirt-glib.yaml +++ b/projects/libvirt-glib.yaml @@ -4,7 +4,7 @@ machines: '{all_machines}' title: Libvirt GLib archive_format: gz - git_url: https://github.com/libvirt/libvirt-glib.git + git_url: '{git_urls[libvirt-glib][upstream]}' jobs: - autotools-build-job: parent_jobs: 'libvirt-build' diff --git a/projects/libvirt-go-xml.yaml b/projects/libvirt-go-xml.yaml index 4da955b..e42efda 100644 --- a/projects/libvirt-go-xml.yaml +++ b/projects/libvirt-go-xml.yaml @@ -4,7 +4,7 @@ machines: '{all_machines}' title: Libvirt Go XML archive_format: gz - git_url: https://github.com/libvirt/libvirt-go-xml.git + git_url: '{git_urls[libvirt-go-xml][upstream]}' jobs: - go-build-job: parent_jobs: 'libvirt-build' diff --git a/projects/libvirt-go.yaml b/projects/libvirt-go.yaml index 11ad037..0527c8d 100644 --- a/projects/libvirt-go.yaml +++ b/projects/libvirt-go.yaml @@ -4,7 +4,7 @@ machines: '{all_machines}' title: Libvirt Go archive_format: gz - git_url: https://github.com/libvirt/libvirt-go.git + git_url: '{git_urls[libvirt-go][upstream]}' jobs: - go-build-job: parent_jobs: 'libvirt-build' diff --git a/projects/libvirt-perl.yaml b/projects/libvirt-perl.yaml index c76b319..ae61bed 100644 --- a/projects/libvirt-perl.yaml +++ b/projects/libvirt-perl.yaml @@ -4,7 +4,7 @@ machines: '{all_machines}' title: Libvirt Perl archive_format: gz - git_url: https://github.com/libvirt/libvirt-perl.git + git_url: '{git_urls[libvirt-perl][upstream]}' jobs: - perl-modulebuild-build-job: parent_jobs: 'libvirt-build' diff --git a/projects/libvirt-python.yaml b/projects/libvirt-python.yaml index 044010c..544e079 100644 --- a/projects/libvirt-python.yaml +++ b/projects/libvirt-python.yaml @@ -4,7 +4,7 @@ machines: '{all_machines}' title: Libvirt Python archive_format: gz - git_url: https://github.com/libvirt/libvirt-python.git + git_url: '{git_urls[libvirt-python][upstream]}' jobs: - python-distutils-build-job: parent_jobs: 'libvirt-build' diff --git a/projects/libvirt-sandbox.yaml b/projects/libvirt-sandbox.yaml index 418a751..3194ee8 100644 --- a/projects/libvirt-sandbox.yaml +++ b/projects/libvirt-sandbox.yaml @@ -12,7 +12,7 @@ - libvirt-fedora-rawhide title: Libvirt Sandbox archive_format: gz - git_url: https://github.com/libvirt/libvirt-sandbox.git + git_url: '{git_urls[libvirt-sandbox][upstream]}' jobs: - autotools-build-job: parent_jobs: 'libvirt-glib-build' diff --git a/projects/libvirt-tck.yaml b/projects/libvirt-tck.yaml index 61174f9..b636d77 100644 --- a/projects/libvirt-tck.yaml +++ b/projects/libvirt-tck.yaml @@ -13,7 +13,7 @@ - libvirt-freebsd-11 title: Libvirt TCK archive_format: gz - git_url: https://github.com/libvirt/libvirt-tck.git + git_url: '{git_urls[libvirt-tck][upstream]}' jobs: - perl-modulebuild-build-job: parent_jobs: 'libvirt-perl-build' diff --git a/projects/libvirt.yaml b/projects/libvirt.yaml index 9feeb07..0d06dae 100644 --- a/projects/libvirt.yaml +++ b/projects/libvirt.yaml @@ -4,7 +4,7 @@ machines: '{all_machines}' title: Libvirt archive_format: xz - git_url: https://github.com/libvirt/libvirt.git + git_url: '{git_urls[upstream]}' jobs: - autotools-build-job: parent_jobs: diff --git a/projects/osinfo-db-tools.yaml b/projects/osinfo-db-tools.yaml index 2ea08fd..aabe583 100644 --- a/projects/osinfo-db-tools.yaml +++ b/projects/osinfo-db-tools.yaml @@ -4,7 +4,7 @@ machines: '{all_machines}' title: osinfo database tools archive_format: gz - git_url: https://gitlab.com/libosinfo/osinfo-db-tools.git + git_url: '{git_urls[osinfo-db-tools][upstream]}' jobs: - autotools-build-job: parent_jobs: diff --git a/projects/osinfo-db.yaml b/projects/osinfo-db.yaml index 3c044e8..b509b6e 100644 --- a/projects/osinfo-db.yaml +++ b/projects/osinfo-db.yaml @@ -4,7 +4,7 @@ machines: '{all_machines}' title: osinfo database archive_format: xz - git_url: https://gitlab.com/libosinfo/osinfo-db.git + git_url: '{git_urls[osinfo-db][upstream]}' jobs: - generic-build-job: parent_jobs: 'osinfo-db-tools-build' diff --git a/projects/virt-manager.yaml b/projects/virt-manager.yaml index cae0f31..a2a1934 100644 --- a/projects/virt-manager.yaml +++ b/projects/virt-manager.yaml @@ -13,7 +13,7 @@ - libvirt-freebsd-11 title: Virtual Machine Manager archive_format: gz - git_url: https://github.com/virt-manager/virt-manager.git + git_url: '{git_urls[virt-manager][upstream]}' jobs: - python-distutils-build-job: parent_jobs: diff --git a/projects/virt-viewer.yaml b/projects/virt-viewer.yaml index 4eee446..b9a0b72 100644 --- a/projects/virt-viewer.yaml +++ b/projects/virt-viewer.yaml @@ -4,7 +4,7 @@ machines: '{all_machines}' title: Virt Viewer archive_format: gz - git_url: https://pagure.io/virt-viewer.git + git_url: '{git_urls[virt-viewer][upstream]}' jobs: - autotools-build-job: parent_jobs: 'libvirt-glib-build' -- 2.17.1 -- libvir-list mailing list libvir-list@xxxxxxxxxx https://www.redhat.com/mailman/listinfo/libvir-list
