[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

[libvirt] [jenkins-ci PATCH 7/7] Switch osinfo-db-tools builds to Meson



Signed-off-by: Fabiano Fidêncio <fidencio redhat com>
---
 .../playbooks/build/projects/osinfo-db-tools+mingw32.yml  | 4 ++--
 .../playbooks/build/projects/osinfo-db-tools+mingw64.yml  | 4 ++--
 guests/playbooks/build/projects/osinfo-db-tools.yml       | 8 ++++----
 jenkins/projects/osinfo-db-tools+mingw32.yaml             | 4 ++--
 jenkins/projects/osinfo-db-tools+mingw64.yaml             | 4 ++--
 jenkins/projects/osinfo-db-tools.yaml                     | 8 ++++----
 6 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/guests/playbooks/build/projects/osinfo-db-tools+mingw32.yml b/guests/playbooks/build/projects/osinfo-db-tools+mingw32.yml
index e64bf8a..c083226 100644
--- a/guests/playbooks/build/projects/osinfo-db-tools+mingw32.yml
+++ b/guests/playbooks/build/projects/osinfo-db-tools+mingw32.yml
@@ -6,7 +6,7 @@
     git_url: '{{ git_urls["osinfo-db-tools"][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 }}'
+    meson_args: '{{ mingw32_meson_args }}'
diff --git a/guests/playbooks/build/projects/osinfo-db-tools+mingw64.yml b/guests/playbooks/build/projects/osinfo-db-tools+mingw64.yml
index df07e7e..1671841 100644
--- a/guests/playbooks/build/projects/osinfo-db-tools+mingw64.yml
+++ b/guests/playbooks/build/projects/osinfo-db-tools+mingw64.yml
@@ -6,7 +6,7 @@
     git_url: '{{ git_urls["osinfo-db-tools"][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 }}'
+    meson_args: '{{ mingw64_meson_args }}'
diff --git a/guests/playbooks/build/projects/osinfo-db-tools.yml b/guests/playbooks/build/projects/osinfo-db-tools.yml
index 9ef3672..4bb6236 100644
--- a/guests/playbooks/build/projects/osinfo-db-tools.yml
+++ b/guests/playbooks/build/projects/osinfo-db-tools.yml
@@ -16,9 +16,9 @@
     git_url: '{{ git_urls["osinfo-db-tools"][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-syntax-check-job.yml'
+- include: '{{ playbook_base }}/jobs/meson-check-job.yml'
+- include: '{{ playbook_base }}/jobs/meson-rpm-job.yml'
   vars:
     machines: '{{ rpm_machines }}'
diff --git a/jenkins/projects/osinfo-db-tools+mingw32.yaml b/jenkins/projects/osinfo-db-tools+mingw32.yaml
index d796ca1..fd4a950 100644
--- a/jenkins/projects/osinfo-db-tools+mingw32.yaml
+++ b/jenkins/projects/osinfo-db-tools+mingw32.yaml
@@ -6,7 +6,7 @@
     archive_format: xz
     git_url: '{git_urls[osinfo-db-tools][default]}'
     jobs:
-      - autotools-build-job:
+      - meson-build-job:
           parent_jobs:
           local_env: '{mingw32_local_env}'
-          autogen_args: '{mingw32_autogen_args}'
+          meson_args: '{mingw32_meson_args}'
diff --git a/jenkins/projects/osinfo-db-tools+mingw64.yaml b/jenkins/projects/osinfo-db-tools+mingw64.yaml
index 7808fed..959c48c 100644
--- a/jenkins/projects/osinfo-db-tools+mingw64.yaml
+++ b/jenkins/projects/osinfo-db-tools+mingw64.yaml
@@ -6,7 +6,7 @@
     archive_format: xz
     git_url: '{git_urls[osinfo-db-tools][default]}'
     jobs:
-      - autotools-build-job:
+      - meson-build-job:
           parent_jobs:
           local_env: '{mingw64_local_env}'
-          autogen_args: '{mingw64_autogen_args}'
+          meson_args: '{mingw64_meson_args}'
diff --git a/jenkins/projects/osinfo-db-tools.yaml b/jenkins/projects/osinfo-db-tools.yaml
index 503533a..15a95d3 100644
--- a/jenkins/projects/osinfo-db-tools.yaml
+++ b/jenkins/projects/osinfo-db-tools.yaml
@@ -14,12 +14,12 @@
     archive_format: xz
     git_url: '{git_urls[osinfo-db-tools][default]}'
     jobs:
-      - autotools-build-job:
+      - meson-build-job:
           parent_jobs:
-      - autotools-syntax-check-job:
+      - meson-syntax-check-job:
           parent_jobs: 'osinfo-db-tools-build'
-      - autotools-check-job:
+      - meson-check-job:
           parent_jobs: 'osinfo-db-tools-syntax-check'
-      - autotools-rpm-job:
+      - meson-rpm-job:
           parent_jobs: 'osinfo-db-tools-check'
           machines: '{rpm_machines}'
-- 
2.21.0


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]