[libvirt] [jenkins-ci PATCH 1/3] jobs: Introduce variants

This optional feature will allow us to reuse existing job templates for things like MinGW or website builds. Signed-off-by: Andrea Bolognani <abologna(a)redhat.com&gt; --- jobs/autotools.yaml | 20 ++++++++++---------- jobs/defaults.yaml | 1 + jobs/generic.yaml | 16 ++++++++-------- jobs/go.yaml | 8 ++++---- jobs/perl-makemaker.yaml | 12 ++++++------ jobs/perl-modulebuild.yaml | 12 ++++++------ jobs/python-distutils.yaml | 12 ++++++------ 7 files changed, 41 insertions(+), 40 deletions(-) diff --git a/jobs/autotools.yaml b/jobs/autotools.yaml index 0c164d3..5c78e6a 100644 --- a/jobs/autotools.yaml +++ b/jobs/autotools.yaml @@ -1,11 +1,11 @@ - job-template: id: autotools-build-job - name: '{name}-{branch}-build' + name: '{name}-{branch}-build{variant}' project-type: matrix description: '{title} Build' autogen_args: '' - workspace: '{name}-{branch}' + workspace: '{name}-{branch}{variant}' child-workspace: '.' block-downstream: true block-upstream: true @@ -55,10 +55,10 @@ - job-template: id: autotools-syntax-check-job - name: '{name}-{branch}-syntax-check' + name: '{name}-{branch}-syntax-check{variant}' project-type: matrix description: '{title} Syntax Check' - workspace: '{name}-{branch}' + workspace: '{name}-{branch}{variant}' child-workspace: '.' block-downstream: true block-upstream: true @@ -94,10 +94,10 @@ - job-template: id: autotools-check-job - name: '{name}-{branch}-check' + name: '{name}-{branch}-check{variant}' project-type: matrix description: '{title} Check' - workspace: '{name}-{branch}' + workspace: '{name}-{branch}{variant}' child-workspace: '.' block-downstream: true block-upstream: true @@ -137,11 +137,11 @@ - job-template: id: autotools-rpm-job - name: '{name}-{branch}-rpm' + name: '{name}-{branch}-rpm{variant}' project-type: matrix description: '{title} RPM' archive_format: gz - workspace: '{name}-{branch}' + workspace: '{name}-{branch}{variant}' child-workspace: '.' block-downstream: true block-upstream: true @@ -182,11 +182,11 @@ - job-template: id: autotools-mingw-job - name: '{name}-{branch}-mingw' + name: '{name}-{branch}-mingw{variant}' project-type: matrix description: '{title} MinGW' autogen_args: '' - workspace: '{name}-{branch}-mingw' + workspace: '{name}-{branch}-mingw{variant}' child-workspace: '.' block-downstream: true block-upstream: true diff --git a/jobs/defaults.yaml b/jobs/defaults.yaml index 23f8555..eef92e8 100644 --- a/jobs/defaults.yaml +++ b/jobs/defaults.yaml @@ -2,6 +2,7 @@ - defaults: name: global branch: master + variant: '' node: libvirt global_env: | local_env: | diff --git a/jobs/generic.yaml b/jobs/generic.yaml index 08ab104..f64dde0 100644 --- a/jobs/generic.yaml +++ b/jobs/generic.yaml @@ -1,11 +1,11 @@ - job-template: id: generic-build-job - name: '{name}-{branch}-build' + name: '{name}-{branch}-build{variant}' project-type: matrix description: '{title} Build' autogen_args: '' - workspace: '{name}-{branch}' + workspace: '{name}-{branch}{variant}' child-workspace: '.' block-downstream: true block-upstream: true @@ -51,10 +51,10 @@ - job-template: id: generic-syntax-check-job - name: '{name}-{branch}-syntax-check' + name: '{name}-{branch}-syntax-check{variant}' project-type: matrix description: '{title} Syntax Check' - workspace: '{name}-{branch}' + workspace: '{name}-{branch}{variant}' child-workspace: '.' block-downstream: true block-upstream: true @@ -89,10 +89,10 @@ - job-template: id: generic-check-job - name: '{name}-{branch}-check' + name: '{name}-{branch}-check{variant}' project-type: matrix description: '{title} Check' - workspace: '{name}-{branch}' + workspace: '{name}-{branch}{variant}' child-workspace: '.' block-downstream: true block-upstream: true @@ -127,11 +127,11 @@ - job-template: id: generic-rpm-job - name: '{name}-{branch}-rpm' + name: '{name}-{branch}-rpm{variant}' project-type: matrix description: '{title} RPM' archive_format: gz - workspace: '{name}-{branch}' + workspace: '{name}-{branch}{variant}' child-workspace: '.' block-downstream: true block-upstream: true diff --git a/jobs/go.yaml b/jobs/go.yaml index 2634cb2..9a349ca 100644 --- a/jobs/go.yaml +++ b/jobs/go.yaml @@ -1,11 +1,11 @@ - job-template: id: go-build-job - name: '{name}-{branch}-build' + name: '{name}-{branch}-build{variant}' project-type: matrix description: '{title} Build' autogen_args: '' - workspace: '{name}-{branch}' + workspace: '{name}-{branch}{variant}' child-workspace: '.' block-downstream: true block-upstream: true @@ -56,10 +56,10 @@ - job-template: id: go-check-job - name: '{name}-{branch}-check' + name: '{name}-{branch}-check{variant}' project-type: matrix description: '{title} Check' - workspace: '{name}-{branch}' + workspace: '{name}-{branch}{variant}' child-workspace: '.' block-downstream: true block-upstream: true diff --git a/jobs/perl-makemaker.yaml b/jobs/perl-makemaker.yaml index 873ce04..84b368e 100644 --- a/jobs/perl-makemaker.yaml +++ b/jobs/perl-makemaker.yaml @@ -1,11 +1,11 @@ - job-template: id: perl-makemaker-build-job - name: '{name}-{branch}-build' + name: '{name}-{branch}-build{variant}' project-type: matrix description: '{title} Build' autogen_args: '' - workspace: '{name}-{branch}' + workspace: '{name}-{branch}{variant}' child-workspace: '.' block-downstream: true block-upstream: true @@ -55,11 +55,11 @@ - job-template: id: perl-makemaker-test-job - name: '{name}-{branch}-test' + name: '{name}-{branch}-test{variant}' project-type: matrix description: '{title} Test' test_args: '' - workspace: '{name}-{branch}' + workspace: '{name}-{branch}{variant}' child-workspace: '.' block-downstream: true block-upstream: true @@ -94,11 +94,11 @@ - job-template: id: perl-makemaker-rpm-job - name: '{name}-{branch}-rpm' + name: '{name}-{branch}-rpm{variant}' project-type: matrix description: '{title} RPM' archive_format: gz - workspace: '{name}-{branch}' + workspace: '{name}-{branch}{variant}' child-workspace: '.' block-downstream: true block-upstream: true diff --git a/jobs/perl-modulebuild.yaml b/jobs/perl-modulebuild.yaml index d256599..b159ab3 100644 --- a/jobs/perl-modulebuild.yaml +++ b/jobs/perl-modulebuild.yaml @@ -1,11 +1,11 @@ - job-template: id: perl-modulebuild-build-job - name: '{name}-{branch}-build' + name: '{name}-{branch}-build{variant}' project-type: matrix description: '{title} Build' autogen_args: '' - workspace: '{name}-{branch}' + workspace: '{name}-{branch}{variant}' child-workspace: '.' block-downstream: true block-upstream: true @@ -55,10 +55,10 @@ - job-template: id: perl-modulebuild-test-job - name: '{name}-{branch}-test' + name: '{name}-{branch}-test{variant}' project-type: matrix description: '{title} Test' - workspace: '{name}-{branch}' + workspace: '{name}-{branch}{variant}' child-workspace: '.' block-downstream: true block-upstream: true @@ -93,11 +93,11 @@ - job-template: id: perl-modulebuild-rpm-job - name: '{name}-{branch}-rpm' + name: '{name}-{branch}-rpm{variant}' project-type: matrix description: '{title} RPM' archive_format: gz - workspace: '{name}-{branch}' + workspace: '{name}-{branch}{variant}' child-workspace: '.' block-downstream: true block-upstream: true diff --git a/jobs/python-distutils.yaml b/jobs/python-distutils.yaml index bfa0715..c075245 100644 --- a/jobs/python-distutils.yaml +++ b/jobs/python-distutils.yaml @@ -1,11 +1,11 @@ - job-template: id: python-distutils-build-job - name: '{name}-{branch}-build' + name: '{name}-{branch}-build{variant}' project-type: matrix description: '{title} Build' command_pre_build: '' - workspace: '{name}-{branch}' + workspace: '{name}-{branch}{variant}' child-workspace: '.' block-downstream: true block-upstream: true @@ -54,10 +54,10 @@ - job-template: id: python-distutils-check-job - name: '{name}-{branch}-check' + name: '{name}-{branch}-check{variant}' project-type: matrix description: '{title} Check' - workspace: '{name}-{branch}' + workspace: '{name}-{branch}{variant}' child-workspace: '.' block-downstream: true block-upstream: true @@ -92,10 +92,10 @@ - job-template: id: python-distutils-rpm-job - name: '{name}-{branch}-rpm' + name: '{name}-{branch}-rpm{variant}' project-type: matrix description: '{title} RPM' - workspace: '{name}-{branch}' + workspace: '{name}-{branch}{variant}' child-workspace: '.' block-downstream: true block-upstream: true -- 2.14.3