On Wed, Sep 18, 2019 at 06:19:54PM +0200, Fabiano Fidêncio wrote:
It's been agreed that the projects using libvirt-jenkins-ci would
have
the `syntax-check` running as part of their test suite. Therefore,
there's no reason for keeping a job which is not going to be used.
Signed-off-by: Fabiano Fidêncio <fidencio(a)redhat.com>
---
.../build/projects/osinfo-db-tools.yml | 1 -
jenkins/jobs/meson.yaml | 39 -------------------
jenkins/projects/osinfo-db-tools.yaml | 4 +-
3 files changed, 1 insertion(+), 43 deletions(-)
diff --git a/guests/playbooks/build/projects/osinfo-db-tools.yml
b/guests/playbooks/build/projects/osinfo-db-tools.yml
index d142e0e..67e5f00 100644
--- a/guests/playbooks/build/projects/osinfo-db-tools.yml
+++ b/guests/playbooks/build/projects/osinfo-db-tools.yml
@@ -17,7 +17,6 @@
- include: '{{ playbook_base }}/jobs/prepare.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:
diff --git a/jenkins/jobs/meson.yaml b/jenkins/jobs/meson.yaml
index 02e4395..102d0a4 100644
--- a/jenkins/jobs/meson.yaml
+++ b/jenkins/jobs/meson.yaml
@@ -53,45 +53,6 @@
notify-every-unstable-build: false
send-to-individuals: false
-- job-template:
- id: meson-syntax-check-job
- name: '{name}-syntax-check'
- project-type: matrix
- description: '{title} Syntax Check'
- workspace: '{name}'
- child-workspace: '.'
- block-downstream: true
- block-upstream: true
- wrappers:
- - timeout:
- abort: true
- type: absolute
- timeout: 90
- write-description: 'Aborted build after 90 minutes'
- properties:
- - build-discarder:
- days-to-keep: 30
- num-to-keep: 1000
- triggers:
- - reverse:
- jobs: '{obj:parent_jobs}'
- axes:
- - axis:
- name: systems
- type: slave
- values: '{obj:machines}'
- builders:
- - shell: |
- {global_env}
- {local_env}
- cd build
- ninja syntax-check
Instead of removing the syntax-check job we can keep it if we use
'suite' labels for our tests in a way that we would use 'syntax' label
for syntax-check tests and 'unit' label for unit tests.
That way the syntax-check job will call
`meson test --suite syntax`
and check job will call
`meson test --suite unit`
Pavel