[libvirt] [jenkins-ci PATCH 4/4] Switch libosinfo builds to Meson

Signed-off-by: Fabiano Fidêncio <fidencio(a)redhat.com&gt; --- guests/playbooks/build/projects/libosinfo+mingw32.yml | 4 ++-- guests/playbooks/build/projects/libosinfo+mingw64.yml | 4 ++-- guests/playbooks/build/projects/libosinfo.yml | 7 +++---- jenkins/projects/libosinfo+mingw32.yaml | 4 ++-- jenkins/projects/libosinfo+mingw64.yaml | 4 ++-- jenkins/projects/libosinfo.yaml | 8 +++----- 6 files changed, 14 insertions(+), 17 deletions(-) diff --git a/guests/playbooks/build/projects/libosinfo+mingw32.yml b/guests/playbooks/build/projects/libosinfo+mingw32.yml index fee0ef7..ea113e2 100644 --- a/guests/playbooks/build/projects/libosinfo+mingw32.yml +++ b/guests/playbooks/build/projects/libosinfo+mingw32.yml @@ -6,7 +6,7 @@ git_url: '{{ git_urls["libosinfo"][git_remote] }}' - include: '{{ playbook_base }}/jobs/prepare.yml' -- include: '{{ playbook_base }}/jobs/autotools-build-job.yml' +- include: '{{ playbook_base }}/jobs/meson-build-job.yml' vars: local_env: '{{ mingw32_local_env }}' - autogen_args: '{{ mingw32_autogen_args }}' + autogen_args: '{{ mingw32_meson_args }}' diff --git a/guests/playbooks/build/projects/libosinfo+mingw64.yml b/guests/playbooks/build/projects/libosinfo+mingw64.yml index a79accc..e7cc88c 100644 --- a/guests/playbooks/build/projects/libosinfo+mingw64.yml +++ b/guests/playbooks/build/projects/libosinfo+mingw64.yml @@ -6,7 +6,7 @@ git_url: '{{ git_urls["libosinfo"][git_remote] }}' - include: '{{ playbook_base }}/jobs/prepare.yml' -- include: '{{ playbook_base }}/jobs/autotools-build-job.yml' +- include: '{{ playbook_base }}/jobs/meson-build-job.yml' vars: local_env: '{{ mingw64_local_env }}' - autogen_args: '{{ mingw64_autogen_args }}' + autogen_args: '{{ mingw64_meson_args }}' diff --git a/guests/playbooks/build/projects/libosinfo.yml b/guests/playbooks/build/projects/libosinfo.yml index 3a0c43c..f06dbb3 100644 --- a/guests/playbooks/build/projects/libosinfo.yml +++ b/guests/playbooks/build/projects/libosinfo.yml @@ -16,10 +16,9 @@ git_url: '{{ git_urls["libosinfo"][git_remote] }}' - include: '{{ playbook_base }}/jobs/prepare.yml' -- include: '{{ playbook_base }}/jobs/autotools-build-job.yml' -- include: '{{ playbook_base }}/jobs/autotools-syntax-check-job.yml' -- include: '{{ playbook_base }}/jobs/autotools-check-job.yml' -- include: '{{ playbook_base }}/jobs/autotools-rpm-job.yml' +- include: '{{ playbook_base }}/jobs/meson-build-job.yml' +- include: '{{ playbook_base }}/jobs/meson-check-job.yml' +- include: '{{ playbook_base }}/jobs/meson-rpm-job.yml' vars: machines: - libvirt-fedora-29 diff --git a/jenkins/projects/libosinfo+mingw32.yaml b/jenkins/projects/libosinfo+mingw32.yaml index d3e5d42..6900090 100644 --- a/jenkins/projects/libosinfo+mingw32.yaml +++ b/jenkins/projects/libosinfo+mingw32.yaml @@ -6,7 +6,7 @@ archive_format: xz git_url: '{git_urls[libosinfo][default]}' jobs: - - autotools-build-job: + - meson-build-job: parent_jobs: 'osinfo-db-tools+mingw32-build' local_env: '{mingw32_local_env}' - autogen_args: '{mingw32_autogen_args}' + autogen_args: '{mingw32_meson_args}' diff --git a/jenkins/projects/libosinfo+mingw64.yaml b/jenkins/projects/libosinfo+mingw64.yaml index 25ce34c..bcd81d8 100644 --- a/jenkins/projects/libosinfo+mingw64.yaml +++ b/jenkins/projects/libosinfo+mingw64.yaml @@ -6,7 +6,7 @@ archive_format: xz git_url: '{git_urls[libosinfo][default]}' jobs: - - autotools-build-job: + - meson-build-job: parent_jobs: 'osinfo-db-tools+mingw64-build' local_env: '{mingw64_local_env}' - autogen_args: '{mingw64_autogen_args}' + autogen_args: '{mingw64_meson_args}' diff --git a/jenkins/projects/libosinfo.yaml b/jenkins/projects/libosinfo.yaml index 200a766..c744b38 100644 --- a/jenkins/projects/libosinfo.yaml +++ b/jenkins/projects/libosinfo.yaml @@ -15,13 +15,11 @@ archive_format: xz git_url: '{git_urls[libosinfo][default]}' jobs: - - autotools-build-job: + - meson-build-job: parent_jobs: 'osinfo-db-build' - - autotools-syntax-check-job: + - meson-check-job: parent_jobs: 'libosinfo-build' - - autotools-check-job: - parent_jobs: 'libosinfo-syntax-check' - - autotools-rpm-job: + - meson-rpm-job: parent_jobs: 'libosinfo-check' machines: - libvirt-fedora-29 -- 2.23.0