[libvirt] [jenkins-ci PATCH 2/8] Don't use "branch" in paths and job names

We'll soon to make it possible to build arbitrary branches from arbitrary git repositories with lcitool: sticking with the current scheme for on-disk storage would mean that we would create a separate git clone for each branch that was ever built this way, which is clearly extremely wasteful not to mention slow. To prevent that from happening we drop the branch name from the directory name, which makes it possible to have a single git clone per project and allows to quickly and cheaply switching repositories and branches. After dropping the branch name from the directory name, there is very little reason to keep it in the job name: on the CentOS CI environment we only ever build master, and with lcitool the users themselves provide the git configuration including the branch name, so it doesn't really provide any useful information in either case. Let's drop it from there as well. Signed-off-by: Andrea Bolognani <abologna(a)redhat.com&gt; --- .../playbooks/build/jobs/autotools-build-job.yml | 4 ++-- .../playbooks/build/jobs/autotools-check-job.yml | 4 ++-- .../playbooks/build/jobs/autotools-rpm-job.yml | 4 ++-- .../build/jobs/autotools-syntax-check-job.yml | 4 ++-- .../playbooks/build/jobs/generic-build-job.yml | 4 ++-- .../playbooks/build/jobs/generic-check-job.yml | 4 ++-- guests/playbooks/build/jobs/generic-rpm-job.yml | 4 ++-- .../build/jobs/generic-syntax-check-job.yml | 4 ++-- guests/playbooks/build/jobs/go-build-job.yml | 4 ++-- guests/playbooks/build/jobs/go-check-job.yml | 4 ++-- .../build/jobs/perl-modulebuild-build-job.yml | 4 ++-- .../build/jobs/perl-modulebuild-check-job.yml | 4 ++-- .../build/jobs/perl-modulebuild-rpm-job.yml | 4 ++-- guests/playbooks/build/jobs/prepare.yml | 8 ++++---- .../build/jobs/python-distutils-build-job.yml | 4 ++-- .../build/jobs/python-distutils-check-job.yml | 4 ++-- .../build/jobs/python-distutils-rpm-job.yml | 4 ++-- jobs/autotools.yaml | 16 ++++++++-------- jobs/generic.yaml | 16 ++++++++-------- jobs/go.yaml | 8 ++++---- jobs/perl-modulebuild.yaml | 12 ++++++------ jobs/python-distutils.yaml | 12 ++++++------ projects/libosinfo.yaml | 12 ++++++------ projects/libvirt-cim.yaml | 4 ++-- projects/libvirt-dbus.yaml | 8 ++++---- projects/libvirt-glib.yaml | 12 ++++++------ projects/libvirt-go-xml.yaml | 4 ++-- projects/libvirt-go.yaml | 4 ++-- projects/libvirt-perl.yaml | 6 +++--- projects/libvirt-python.yaml | 6 +++--- projects/libvirt-sandbox.yaml | 8 ++++---- projects/libvirt-tck.yaml | 6 +++--- projects/libvirt.yaml | 6 +++--- projects/osinfo-db-tools.yaml | 6 +++--- projects/osinfo-db.yaml | 6 +++--- projects/virt-manager.yaml | 8 ++++---- projects/virt-viewer.yaml | 12 ++++++------ 37 files changed, 122 insertions(+), 122 deletions(-) diff --git a/guests/playbooks/build/jobs/autotools-build-job.yml b/guests/playbooks/build/jobs/autotools-build-job.yml index bb621a1..70751bb 100644 --- a/guests/playbooks/build/jobs/autotools-build-job.yml +++ b/guests/playbooks/build/jobs/autotools-build-job.yml @@ -1,8 +1,8 @@ --- -- name: '{{ name }}-{{ branch }}-build{{ variant }}' +- name: '{{ name }}-build{{ variant }}' shell: | set -e - cd {{ name }}-{{ branch }}{{ variant }} + cd {{ name }}{{ variant }} {{ global_env }} {{ local_env }} diff --git a/guests/playbooks/build/jobs/autotools-check-job.yml b/guests/playbooks/build/jobs/autotools-check-job.yml index 50024ae..24a3ad4 100644 --- a/guests/playbooks/build/jobs/autotools-check-job.yml +++ b/guests/playbooks/build/jobs/autotools-check-job.yml @@ -1,8 +1,8 @@ --- -- name: '{{ name }}-{{ branch }}-check{{ variant }}' +- name: '{{ name }}-check{{ variant }}' shell: | set -e - cd {{ name }}-{{ branch }}{{ variant }} + cd {{ name }}{{ variant }} {{ global_env }} {{ local_env }} diff --git a/guests/playbooks/build/jobs/autotools-rpm-job.yml b/guests/playbooks/build/jobs/autotools-rpm-job.yml index c8babdf..1778211 100644 --- a/guests/playbooks/build/jobs/autotools-rpm-job.yml +++ b/guests/playbooks/build/jobs/autotools-rpm-job.yml @@ -1,8 +1,8 @@ --- -- name: '{{ name }}-{{ branch }}-rpm{{ variant }}' +- name: '{{ name }}-rpm{{ variant }}' shell: | set -e - cd {{ name }}-{{ branch }}{{ variant }} + cd {{ name }}{{ variant }} {{ global_env }} {{ local_env }} diff --git a/guests/playbooks/build/jobs/autotools-syntax-check-job.yml b/guests/playbooks/build/jobs/autotools-syntax-check-job.yml index bbbd240..e101c6d 100644 --- a/guests/playbooks/build/jobs/autotools-syntax-check-job.yml +++ b/guests/playbooks/build/jobs/autotools-syntax-check-job.yml @@ -1,8 +1,8 @@ --- -- name: '{{ name }}-{{ branch }}-syntax-check{{ variant }}' +- name: '{{ name }}-syntax-check{{ variant }}' shell: | set -e - cd {{ name }}-{{ branch }}{{ variant }} + cd {{ name }}{{ variant }} {{ global_env }} {{ local_env }} diff --git a/guests/playbooks/build/jobs/generic-build-job.yml b/guests/playbooks/build/jobs/generic-build-job.yml index 5519eee..b651952 100644 --- a/guests/playbooks/build/jobs/generic-build-job.yml +++ b/guests/playbooks/build/jobs/generic-build-job.yml @@ -1,8 +1,8 @@ --- -- name: '{{ name }}-{{ branch }}-build{{ variant }}' +- name: '{{ name }}-build{{ variant }}' shell: | set -e - cd {{ name }}-{{ branch }}{{ variant }} + cd {{ name }}{{ variant }} {{ global_env }} {{ local_env }} diff --git a/guests/playbooks/build/jobs/generic-check-job.yml b/guests/playbooks/build/jobs/generic-check-job.yml index 00fbce3..c133890 100644 --- a/guests/playbooks/build/jobs/generic-check-job.yml +++ b/guests/playbooks/build/jobs/generic-check-job.yml @@ -1,8 +1,8 @@ --- -- name: '{{ name }}-{{ branch }}-check{{ variant }}' +- name: '{{ name }}-check{{ variant }}' shell: | set -e - cd {{ name }}-{{ branch }}{{ variant }} + cd {{ name }}{{ variant }} {{ global_env }} {{ local_env }} diff --git a/guests/playbooks/build/jobs/generic-rpm-job.yml b/guests/playbooks/build/jobs/generic-rpm-job.yml index 1db4ea4..879d9f4 100644 --- a/guests/playbooks/build/jobs/generic-rpm-job.yml +++ b/guests/playbooks/build/jobs/generic-rpm-job.yml @@ -1,8 +1,8 @@ --- -- name: '{{ name }}-{{ branch }}-rpm{{ variant }}' +- name: '{{ name }}-rpm{{ variant }}' shell: | set -e - cd {{ name }}-{{ branch }}{{ variant }} + cd {{ name }}{{ variant }} {{ global_env }} {{ local_env }} diff --git a/guests/playbooks/build/jobs/generic-syntax-check-job.yml b/guests/playbooks/build/jobs/generic-syntax-check-job.yml index 72885f1..471cbf5 100644 --- a/guests/playbooks/build/jobs/generic-syntax-check-job.yml +++ b/guests/playbooks/build/jobs/generic-syntax-check-job.yml @@ -1,8 +1,8 @@ --- -- name: '{{ name }}-{{ branch }}-syntax-check{{ variant }}' +- name: '{{ name }}-syntax-check{{ variant }}' shell: | set -e - cd {{ name }}-{{ branch }}{{ variant }} + cd {{ name }}{{ variant }} {{ global_env }} {{ local_env }} diff --git a/guests/playbooks/build/jobs/go-build-job.yml b/guests/playbooks/build/jobs/go-build-job.yml index 8a3ebb9..5eb9de1 100644 --- a/guests/playbooks/build/jobs/go-build-job.yml +++ b/guests/playbooks/build/jobs/go-build-job.yml @@ -1,8 +1,8 @@ --- -- name: '{{ name }}-{{ branch }}-build{{ variant }}' +- name: '{{ name }}-build{{ variant }}' shell: | set -e - cd {{ name }}-{{ branch }}{{ variant }} + cd {{ name }}{{ variant }} {{ global_env }} {{ local_env }} diff --git a/guests/playbooks/build/jobs/go-check-job.yml b/guests/playbooks/build/jobs/go-check-job.yml index dda7998..29f3c53 100644 --- a/guests/playbooks/build/jobs/go-check-job.yml +++ b/guests/playbooks/build/jobs/go-check-job.yml @@ -1,8 +1,8 @@ --- -- name: '{{ name }}-{{ branch }}-check{{ variant }}' +- name: '{{ name }}-check{{ variant }}' shell: | set -e - cd {{ name }}-{{ branch }}{{ variant }} + cd {{ name }}{{ variant }} {{ global_env }} {{ local_env }} diff --git a/guests/playbooks/build/jobs/perl-modulebuild-build-job.yml b/guests/playbooks/build/jobs/perl-modulebuild-build-job.yml index 030e713..15a1089 100644 --- a/guests/playbooks/build/jobs/perl-modulebuild-build-job.yml +++ b/guests/playbooks/build/jobs/perl-modulebuild-build-job.yml @@ -1,8 +1,8 @@ --- -- name: '{{ name }}-{{ branch }}-build{{ variant }}' +- name: '{{ name }}-build{{ variant }}' shell: | set -e - cd {{ name }}-{{ branch }}{{ variant }} + cd {{ name }}{{ variant }} {{ global_env }} {{ local_env }} diff --git a/guests/playbooks/build/jobs/perl-modulebuild-check-job.yml b/guests/playbooks/build/jobs/perl-modulebuild-check-job.yml index 165e868..5c8ab1b 100644 --- a/guests/playbooks/build/jobs/perl-modulebuild-check-job.yml +++ b/guests/playbooks/build/jobs/perl-modulebuild-check-job.yml @@ -1,8 +1,8 @@ --- -- name: '{{ name }}-{{ branch }}-check{{ variant }}' +- name: '{{ name }}-check{{ variant }}' shell: | set -e - cd {{ name }}-{{ branch }}{{ variant }} + cd {{ name }}{{ variant }} {{ global_env }} {{ local_env }} diff --git a/guests/playbooks/build/jobs/perl-modulebuild-rpm-job.yml b/guests/playbooks/build/jobs/perl-modulebuild-rpm-job.yml index 7a2ddc9..dad672c 100644 --- a/guests/playbooks/build/jobs/perl-modulebuild-rpm-job.yml +++ b/guests/playbooks/build/jobs/perl-modulebuild-rpm-job.yml @@ -1,8 +1,8 @@ --- -- name: '{{ name }}-{{ branch }}-rpm{{ variant }}' +- name: '{{ name }}-rpm{{ variant }}' shell: | set -e - cd {{ name }}-{{ branch }}{{ variant }} + cd {{ name }}{{ variant }} {{ global_env }} {{ local_env }} diff --git a/guests/playbooks/build/jobs/prepare.yml b/guests/playbooks/build/jobs/prepare.yml index 0b22ac5..01e667d 100644 --- a/guests/playbooks/build/jobs/prepare.yml +++ b/guests/playbooks/build/jobs/prepare.yml @@ -1,17 +1,17 @@ --- -- name: '{{ name }}-{{ branch }}-prepare{{ variant }}' +- name: '{{ name }}-prepare{{ variant }}' git: repo: '{{ git_url }}' version: '{{ branch }}' - dest: '{{ name }}-{{ branch }}{{ variant }}' + dest: '{{ name }}{{ variant }}' force: yes when: - inventory_hostname in machines -- name: '{{ name }}-{{ branch }}-prepare{{ variant }}' +- name: '{{ name }}-prepare{{ variant }}' shell: | set -e - cd {{ name }}-{{ branch }}{{ variant }} + cd {{ name }}{{ variant }} git clean -xdf git submodule update --init diff --git a/guests/playbooks/build/jobs/python-distutils-build-job.yml b/guests/playbooks/build/jobs/python-distutils-build-job.yml index c077015..711edc2 100644 --- a/guests/playbooks/build/jobs/python-distutils-build-job.yml +++ b/guests/playbooks/build/jobs/python-distutils-build-job.yml @@ -1,8 +1,8 @@ --- -- name: '{{ name }}-{{ branch }}-build{{ variant }}' +- name: '{{ name }}-build{{ variant }}' shell: | set -e - cd {{ name }}-{{ branch }}{{ variant }} + cd {{ name }}{{ variant }} {{ global_env }} {{ local_env }} diff --git a/guests/playbooks/build/jobs/python-distutils-check-job.yml b/guests/playbooks/build/jobs/python-distutils-check-job.yml index 318feaf..4f36868 100644 --- a/guests/playbooks/build/jobs/python-distutils-check-job.yml +++ b/guests/playbooks/build/jobs/python-distutils-check-job.yml @@ -1,8 +1,8 @@ --- -- name: '{{ name }}-{{ branch }}-check{{ variant }}' +- name: '{{ name }}-check{{ variant }}' shell: | set -e - cd {{ name }}-{{ branch }}{{ variant }} + cd {{ name }}{{ variant }} {{ global_env }} {{ local_env }} diff --git a/guests/playbooks/build/jobs/python-distutils-rpm-job.yml b/guests/playbooks/build/jobs/python-distutils-rpm-job.yml index 4ee418f..bae2b9b 100644 --- a/guests/playbooks/build/jobs/python-distutils-rpm-job.yml +++ b/guests/playbooks/build/jobs/python-distutils-rpm-job.yml @@ -1,8 +1,8 @@ --- -- name: '{{ name }}-{{ branch }}-rpm{{ variant }}' +- name: '{{ name }}-rpm{{ variant }}' shell: | set -e - cd {{ name }}-{{ branch }}{{ variant }} + cd {{ name }}{{ variant }} {{ global_env }} {{ local_env }} diff --git a/jobs/autotools.yaml b/jobs/autotools.yaml index 4232d0e..96e21d7 100644 --- a/jobs/autotools.yaml +++ b/jobs/autotools.yaml @@ -1,10 +1,10 @@ - job-template: id: autotools-build-job - name: '{name}-{branch}-build{variant}' + name: '{name}-build{variant}' project-type: matrix description: '{title} Build' - workspace: '{name}-{branch}{variant}' + workspace: '{name}{variant}' child-workspace: '.' block-downstream: true block-upstream: true @@ -54,10 +54,10 @@ - job-template: id: autotools-syntax-check-job - name: '{name}-{branch}-syntax-check{variant}' + name: '{name}-syntax-check{variant}' project-type: matrix description: '{title} Syntax Check' - workspace: '{name}-{branch}{variant}' + workspace: '{name}{variant}' child-workspace: '.' block-downstream: true block-upstream: true @@ -93,10 +93,10 @@ - job-template: id: autotools-check-job - name: '{name}-{branch}-check{variant}' + name: '{name}-check{variant}' project-type: matrix description: '{title} Check' - workspace: '{name}-{branch}{variant}' + workspace: '{name}{variant}' child-workspace: '.' block-downstream: true block-upstream: true @@ -136,10 +136,10 @@ - job-template: id: autotools-rpm-job - name: '{name}-{branch}-rpm{variant}' + name: '{name}-rpm{variant}' project-type: matrix description: '{title} RPM' - workspace: '{name}-{branch}{variant}' + workspace: '{name}{variant}' child-workspace: '.' block-downstream: true block-upstream: true diff --git a/jobs/generic.yaml b/jobs/generic.yaml index 805b1d6..3ab7534 100644 --- a/jobs/generic.yaml +++ b/jobs/generic.yaml @@ -1,10 +1,10 @@ - job-template: id: generic-build-job - name: '{name}-{branch}-build{variant}' + name: '{name}-build{variant}' project-type: matrix description: '{title} Build' - workspace: '{name}-{branch}{variant}' + workspace: '{name}{variant}' child-workspace: '.' block-downstream: true block-upstream: true @@ -50,10 +50,10 @@ - job-template: id: generic-syntax-check-job - name: '{name}-{branch}-syntax-check{variant}' + name: '{name}-syntax-check{variant}' project-type: matrix description: '{title} Syntax Check' - workspace: '{name}-{branch}{variant}' + workspace: '{name}{variant}' child-workspace: '.' block-downstream: true block-upstream: true @@ -88,10 +88,10 @@ - job-template: id: generic-check-job - name: '{name}-{branch}-check{variant}' + name: '{name}-check{variant}' project-type: matrix description: '{title} Check' - workspace: '{name}-{branch}{variant}' + workspace: '{name}{variant}' child-workspace: '.' block-downstream: true block-upstream: true @@ -126,10 +126,10 @@ - job-template: id: generic-rpm-job - name: '{name}-{branch}-rpm{variant}' + name: '{name}-rpm{variant}' project-type: matrix description: '{title} RPM' - workspace: '{name}-{branch}{variant}' + workspace: '{name}{variant}' child-workspace: '.' block-downstream: true block-upstream: true diff --git a/jobs/go.yaml b/jobs/go.yaml index b460658..308bb48 100644 --- a/jobs/go.yaml +++ b/jobs/go.yaml @@ -1,10 +1,10 @@ - job-template: id: go-build-job - name: '{name}-{branch}-build{variant}' + name: '{name}-build{variant}' project-type: matrix description: '{title} Build' - workspace: '{name}-{branch}{variant}' + workspace: '{name}{variant}' child-workspace: '.' block-downstream: true block-upstream: true @@ -50,10 +50,10 @@ - job-template: id: go-check-job - name: '{name}-{branch}-check{variant}' + name: '{name}-check{variant}' project-type: matrix description: '{title} Check' - workspace: '{name}-{branch}{variant}' + workspace: '{name}{variant}' child-workspace: '.' block-downstream: true block-upstream: true diff --git a/jobs/perl-modulebuild.yaml b/jobs/perl-modulebuild.yaml index 01247a3..8170ccd 100644 --- a/jobs/perl-modulebuild.yaml +++ b/jobs/perl-modulebuild.yaml @@ -1,10 +1,10 @@ - job-template: id: perl-modulebuild-build-job - name: '{name}-{branch}-build{variant}' + name: '{name}-build{variant}' project-type: matrix description: '{title} Build' - workspace: '{name}-{branch}{variant}' + workspace: '{name}{variant}' child-workspace: '.' block-downstream: true block-upstream: true @@ -53,10 +53,10 @@ - job-template: id: perl-modulebuild-check-job - name: '{name}-{branch}-check{variant}' + name: '{name}-check{variant}' project-type: matrix description: '{title} Check' - workspace: '{name}-{branch}{variant}' + workspace: '{name}{variant}' child-workspace: '.' block-downstream: true block-upstream: true @@ -91,10 +91,10 @@ - job-template: id: perl-modulebuild-rpm-job - name: '{name}-{branch}-rpm{variant}' + name: '{name}-rpm{variant}' project-type: matrix description: '{title} RPM' - workspace: '{name}-{branch}{variant}' + workspace: '{name}{variant}' child-workspace: '.' block-downstream: true block-upstream: true diff --git a/jobs/python-distutils.yaml b/jobs/python-distutils.yaml index 1227b8c..be9f0ce 100644 --- a/jobs/python-distutils.yaml +++ b/jobs/python-distutils.yaml @@ -1,10 +1,10 @@ - job-template: id: python-distutils-build-job - name: '{name}-{branch}-build{variant}' + name: '{name}-build{variant}' project-type: matrix description: '{title} Build' - workspace: '{name}-{branch}{variant}' + workspace: '{name}{variant}' child-workspace: '.' block-downstream: true block-upstream: true @@ -53,10 +53,10 @@ - job-template: id: python-distutils-check-job - name: '{name}-{branch}-check{variant}' + name: '{name}-check{variant}' project-type: matrix description: '{title} Check' - workspace: '{name}-{branch}{variant}' + workspace: '{name}{variant}' child-workspace: '.' block-downstream: true block-upstream: true @@ -91,10 +91,10 @@ - job-template: id: python-distutils-rpm-job - name: '{name}-{branch}-rpm{variant}' + name: '{name}-rpm{variant}' project-type: matrix description: '{title} RPM' - workspace: '{name}-{branch}{variant}' + workspace: '{name}{variant}' child-workspace: '.' block-downstream: true block-upstream: true diff --git a/projects/libosinfo.yaml b/projects/libosinfo.yaml index 55a4817..167b720 100644 --- a/projects/libosinfo.yaml +++ b/projects/libosinfo.yaml @@ -7,22 +7,22 @@ git_url: https://gitlab.com/libosinfo/libosinfo.git jobs: - autotools-build-job: - parent_jobs: 'osinfo-db-master-build' + parent_jobs: 'osinfo-db-build' - autotools-syntax-check-job: - parent_jobs: 'libosinfo-master-build' + parent_jobs: 'libosinfo-build' - autotools-check-job: - parent_jobs: 'libosinfo-master-syntax-check' + parent_jobs: 'libosinfo-syntax-check' - autotools-rpm-job: - parent_jobs: 'libosinfo-master-check' + parent_jobs: 'libosinfo-check' machines: '{rpm_machines}' - autotools-build-job: - parent_jobs: 'osinfo-db-tools-master-build-mingw32' + parent_jobs: 'osinfo-db-tools-build-mingw32' variant: -mingw32 local_env: '{mingw32_local_env}' autogen_args: '{mingw32_autogen_args}' machines: '{mingw_machines}' - autotools-build-job: - parent_jobs: 'osinfo-db-tools-master-build-mingw64' + parent_jobs: 'osinfo-db-tools-build-mingw64' variant: -mingw64 local_env: '{mingw64_local_env}' autogen_args: '{mingw64_autogen_args}' diff --git a/projects/libvirt-cim.yaml b/projects/libvirt-cim.yaml index 6d524df..6657dc4 100644 --- a/projects/libvirt-cim.yaml +++ b/projects/libvirt-cim.yaml @@ -7,6 +7,6 @@ git_url: https://github.com/libvirt/libvirt-cim.git jobs: - autotools-build-job: - parent_jobs: 'libvirt-master-build' + parent_jobs: 'libvirt-build' - autotools-rpm-job: - parent_jobs: 'libvirt-cim-master-build' + parent_jobs: 'libvirt-cim-build' diff --git a/projects/libvirt-dbus.yaml b/projects/libvirt-dbus.yaml index 5689345..ff088e7 100644 --- a/projects/libvirt-dbus.yaml +++ b/projects/libvirt-dbus.yaml @@ -15,9 +15,9 @@ git_url: https://github.com/libvirt/libvirt-dbus.git jobs: - autotools-build-job: - parent_jobs: 'libvirt-glib-master-build' + parent_jobs: 'libvirt-glib-build' - autotools-syntax-check-job: - parent_jobs: 'libvirt-dbus-master-build' + parent_jobs: 'libvirt-dbus-build' # CentOS 7 doesn't include Python 3 and the version of pyflakes # in FreeBSD CURRENT is too new to be used by flake8 machines: @@ -28,7 +28,7 @@ - libvirt-freebsd-10 - libvirt-freebsd-11 - autotools-check-job: - parent_jobs: 'libvirt-dbus-master-syntax-check' + parent_jobs: 'libvirt-dbus-syntax-check' # CentOS 7 doesn't include Python 3 and the version in Ubuntu # 16.04 is too old machines: @@ -39,5 +39,5 @@ - libvirt-freebsd-10 - libvirt-freebsd-11 - autotools-rpm-job: - parent_jobs: 'libvirt-dbus-master-check' + parent_jobs: 'libvirt-dbus-check' machines: '{rpm_machines}' diff --git a/projects/libvirt-glib.yaml b/projects/libvirt-glib.yaml index 993024a..02ba50f 100644 --- a/projects/libvirt-glib.yaml +++ b/projects/libvirt-glib.yaml @@ -7,23 +7,23 @@ git_url: https://github.com/libvirt/libvirt-glib.git jobs: - autotools-build-job: - parent_jobs: 'libvirt-master-build' + parent_jobs: 'libvirt-build' autogen_args: --enable-gtk-doc - autotools-syntax-check-job: - parent_jobs: 'libvirt-glib-master-build' + parent_jobs: 'libvirt-glib-build' - autotools-check-job: - parent_jobs: 'libvirt-glib-master-syntax-check' + parent_jobs: 'libvirt-glib-syntax-check' - autotools-rpm-job: - parent_jobs: 'libvirt-glib-master-check' + parent_jobs: 'libvirt-glib-check' machines: '{rpm_machines}' - autotools-build-job: - parent_jobs: 'libvirt-master-build-mingw32' + parent_jobs: 'libvirt-build-mingw32' variant: -mingw32 local_env: '{mingw32_local_env}' autogen_args: '{mingw32_autogen_args}' machines: '{mingw_machines}' - autotools-build-job: - parent_jobs: 'libvirt-master-build-mingw64' + parent_jobs: 'libvirt-build-mingw64' variant: -mingw64 local_env: '{mingw64_local_env}' autogen_args: '{mingw64_autogen_args}' diff --git a/projects/libvirt-go-xml.yaml b/projects/libvirt-go-xml.yaml index 7e6e090..4da955b 100644 --- a/projects/libvirt-go-xml.yaml +++ b/projects/libvirt-go-xml.yaml @@ -7,8 +7,8 @@ git_url: https://github.com/libvirt/libvirt-go-xml.git jobs: - go-build-job: - parent_jobs: 'libvirt-master-build' + parent_jobs: 'libvirt-build' - go-check-job: - parent_jobs: 'libvirt-go-xml-master-build' + parent_jobs: 'libvirt-go-xml-build' local_env: | export TEST_ARGS="-tags xmlroundtrip" diff --git a/projects/libvirt-go.yaml b/projects/libvirt-go.yaml index d90339a..11ad037 100644 --- a/projects/libvirt-go.yaml +++ b/projects/libvirt-go.yaml @@ -7,8 +7,8 @@ git_url: https://github.com/libvirt/libvirt-go.git jobs: - go-build-job: - parent_jobs: 'libvirt-master-build' + parent_jobs: 'libvirt-build' - go-check-job: - parent_jobs: 'libvirt-go-master-build' + parent_jobs: 'libvirt-go-build' local_env: | export TEST_ARGS="-tags api" diff --git a/projects/libvirt-perl.yaml b/projects/libvirt-perl.yaml index dbb6caf..c76b319 100644 --- a/projects/libvirt-perl.yaml +++ b/projects/libvirt-perl.yaml @@ -7,13 +7,13 @@ git_url: https://github.com/libvirt/libvirt-perl.git jobs: - perl-modulebuild-build-job: - parent_jobs: 'libvirt-master-build' + parent_jobs: 'libvirt-build' local_env: | export TEST_MAINTAINER=1 - perl-modulebuild-check-job: - parent_jobs: 'libvirt-perl-master-build' + parent_jobs: 'libvirt-perl-build' local_env: | export TEST_MAINTAINER=1 - perl-modulebuild-rpm-job: - parent_jobs: 'libvirt-perl-master-check' + parent_jobs: 'libvirt-perl-check' machines: '{rpm_machines}' diff --git a/projects/libvirt-python.yaml b/projects/libvirt-python.yaml index 05eea41..044010c 100644 --- a/projects/libvirt-python.yaml +++ b/projects/libvirt-python.yaml @@ -7,9 +7,9 @@ git_url: https://github.com/libvirt/libvirt-python.git jobs: - python-distutils-build-job: - parent_jobs: 'libvirt-master-build' + parent_jobs: 'libvirt-build' - python-distutils-check-job: - parent_jobs: 'libvirt-python-master-build' + parent_jobs: 'libvirt-python-build' - python-distutils-rpm-job: - parent_jobs: 'libvirt-python-master-check' + parent_jobs: 'libvirt-python-check' machines: '{rpm_machines}' diff --git a/projects/libvirt-sandbox.yaml b/projects/libvirt-sandbox.yaml index 0831896..418a751 100644 --- a/projects/libvirt-sandbox.yaml +++ b/projects/libvirt-sandbox.yaml @@ -15,14 +15,14 @@ git_url: https://github.com/libvirt/libvirt-sandbox.git jobs: - autotools-build-job: - parent_jobs: 'libvirt-glib-master-build' + parent_jobs: 'libvirt-glib-build' autogen_args: --enable-gtk-doc - autotools-syntax-check-job: - parent_jobs: 'libvirt-sandbox-master-build' + parent_jobs: 'libvirt-sandbox-build' - autotools-check-job: - parent_jobs: 'libvirt-sandbox-master-syntax-check' + parent_jobs: 'libvirt-sandbox-syntax-check' - autotools-rpm-job: - parent_jobs: 'libvirt-sandbox-master-check' + parent_jobs: 'libvirt-sandbox-check' machines: - libvirt-fedora-27 - libvirt-fedora-28 diff --git a/projects/libvirt-tck.yaml b/projects/libvirt-tck.yaml index 3c8adfd..61174f9 100644 --- a/projects/libvirt-tck.yaml +++ b/projects/libvirt-tck.yaml @@ -16,11 +16,11 @@ git_url: https://github.com/libvirt/libvirt-tck.git jobs: - perl-modulebuild-build-job: - parent_jobs: 'libvirt-perl-master-build' + parent_jobs: 'libvirt-perl-build' - perl-modulebuild-check-job: - parent_jobs: 'libvirt-tck-master-build' + parent_jobs: 'libvirt-tck-build' - perl-modulebuild-rpm-job: - parent_jobs: 'libvirt-tck-master-check' + parent_jobs: 'libvirt-tck-check' machines: - libvirt-fedora-27 - libvirt-fedora-28 diff --git a/projects/libvirt.yaml b/projects/libvirt.yaml index e9db7cb..9feeb07 100644 --- a/projects/libvirt.yaml +++ b/projects/libvirt.yaml @@ -9,7 +9,7 @@ - autotools-build-job: parent_jobs: - autotools-syntax-check-job: - parent_jobs: 'libvirt-master-build' + parent_jobs: 'libvirt-build' # We limit syntax-check to Linux platforms because it calls some # commands with more arguments than FreeBSD supports machines: @@ -20,7 +20,7 @@ - libvirt-fedora-28 - libvirt-fedora-rawhide - autotools-check-job: - parent_jobs: 'libvirt-master-syntax-check' + parent_jobs: 'libvirt-syntax-check' local_env: | # gnulib's test-poll is broken on FreeBSD, so disable expensive # tests (which include gnulib's test suite) until it's fixed @@ -29,7 +29,7 @@ fi export VIR_TEST_DEBUG=2 - autotools-rpm-job: - parent_jobs: 'libvirt-master-check' + parent_jobs: 'libvirt-check' machines: '{rpm_machines}' - autotools-build-job: parent_jobs: diff --git a/projects/osinfo-db-tools.yaml b/projects/osinfo-db-tools.yaml index bcf9e0a..2ea08fd 100644 --- a/projects/osinfo-db-tools.yaml +++ b/projects/osinfo-db-tools.yaml @@ -9,11 +9,11 @@ - autotools-build-job: parent_jobs: - autotools-syntax-check-job: - parent_jobs: 'osinfo-db-tools-master-build' + parent_jobs: 'osinfo-db-tools-build' - autotools-check-job: - parent_jobs: 'osinfo-db-tools-master-syntax-check' + parent_jobs: 'osinfo-db-tools-syntax-check' - autotools-rpm-job: - parent_jobs: 'osinfo-db-tools-master-check' + parent_jobs: 'osinfo-db-tools-check' machines: '{rpm_machines}' - autotools-build-job: parent_jobs: diff --git a/projects/osinfo-db.yaml b/projects/osinfo-db.yaml index 185d943..3c044e8 100644 --- a/projects/osinfo-db.yaml +++ b/projects/osinfo-db.yaml @@ -7,16 +7,16 @@ git_url: https://gitlab.com/libosinfo/osinfo-db.git jobs: - generic-build-job: - parent_jobs: 'osinfo-db-tools-master-build' + parent_jobs: 'osinfo-db-tools-build' command: | $MAKE all $MAKE install OSINFO_DB_TARGET="--system" - generic-check-job: - parent_jobs: 'osinfo-db-master-build' + parent_jobs: 'osinfo-db-build' command: | $MAKE check - generic-rpm-job: - parent_jobs: 'osinfo-db-master-check' + parent_jobs: 'osinfo-db-check' machines: '{rpm_machines}' command: | {strip_buildrequires} diff --git a/projects/virt-manager.yaml b/projects/virt-manager.yaml index f7929d6..cae0f31 100644 --- a/projects/virt-manager.yaml +++ b/projects/virt-manager.yaml @@ -17,12 +17,12 @@ jobs: - python-distutils-build-job: parent_jobs: - - 'libvirt-python-master-build' - - 'libosinfo-master-build' + - 'libvirt-python-build' + - 'libosinfo-build' command_pre_build: | $PYTHON ./setup.py configure --prefix=$VIRT_PREFIX - python-distutils-check-job: - parent_jobs: 'virt-manager-master-build' + parent_jobs: 'virt-manager-build' # libxml2's Python 3 bindings don't work properly on FreeBSD, # so skip the test suite there for the time being. See # https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=224902 @@ -32,7 +32,7 @@ - libvirt-fedora-28 - libvirt-fedora-rawhide - python-distutils-rpm-job: - parent_jobs: 'virt-manager-master-check' + parent_jobs: 'virt-manager-check' machines: - libvirt-fedora-27 - libvirt-fedora-28 diff --git a/projects/virt-viewer.yaml b/projects/virt-viewer.yaml index 884cf12..4eee446 100644 --- a/projects/virt-viewer.yaml +++ b/projects/virt-viewer.yaml @@ -7,26 +7,26 @@ git_url: https://pagure.io/virt-viewer.git jobs: - autotools-build-job: - parent_jobs: 'libvirt-glib-master-build' + parent_jobs: 'libvirt-glib-build' - autotools-syntax-check-job: - parent_jobs: 'virt-viewer-master-build' + parent_jobs: 'virt-viewer-build' - autotools-check-job: - parent_jobs: 'virt-viewer-master-syntax-check' + parent_jobs: 'virt-viewer-syntax-check' - autotools-rpm-job: - parent_jobs: 'virt-viewer-master-check' + parent_jobs: 'virt-viewer-check' # The spec file for virt-viewer requires a very recent version # of spice-gtk, so we have to skip this job on older distros machines: - libvirt-fedora-28 - libvirt-fedora-rawhide - autotools-build-job: - parent_jobs: 'libvirt-glib-master-build-mingw32' + parent_jobs: 'libvirt-glib-build-mingw32' variant: -mingw32 local_env: '{mingw32_local_env}' autogen_args: '{mingw32_autogen_args}' machines: '{mingw_machines}' - autotools-build-job: - parent_jobs: 'libvirt-glib-master-build-mingw64' + parent_jobs: 'libvirt-glib-build-mingw64' variant: -mingw64 local_env: '{mingw64_local_env}' autogen_args: '{mingw64_autogen_args}' -- 2.17.1