[libvirt] [jenkins-ci PATCH 3/3] Remove 'variant'
Andrea Bolognani
abologna at redhat.com
Tue Sep 4 11:01:35 UTC 2018
It's no longer used anywhere.
Signed-off-by: Andrea Bolognani <abologna at redhat.com>
---
.../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 ++--
guests/playbooks/build/jobs/defaults.yml | 1 -
.../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/defaults.yaml | 1 -
jobs/generic.yaml | 16 ++++++++--------
jobs/go.yaml | 8 ++++----
jobs/perl-modulebuild.yaml | 12 ++++++------
jobs/python-distutils.yaml | 12 ++++++------
24 files changed, 68 insertions(+), 70 deletions(-)
diff --git a/guests/playbooks/build/jobs/autotools-build-job.yml b/guests/playbooks/build/jobs/autotools-build-job.yml
index 70751bb..bf7a616 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 }}-build{{ variant }}'
+- name: '{{ name }}-build'
shell: |
set -e
- cd {{ name }}{{ variant }}
+ cd {{ name }}
{{ 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 24a3ad4..bcb6a85 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 }}-check{{ variant }}'
+- name: '{{ name }}-check'
shell: |
set -e
- cd {{ name }}{{ variant }}
+ cd {{ name }}
{{ 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 1778211..5927d68 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 }}-rpm{{ variant }}'
+- name: '{{ name }}-rpm'
shell: |
set -e
- cd {{ name }}{{ variant }}
+ cd {{ name }}
{{ 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 e101c6d..4906fdf 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 }}-syntax-check{{ variant }}'
+- name: '{{ name }}-syntax-check'
shell: |
set -e
- cd {{ name }}{{ variant }}
+ cd {{ name }}
{{ global_env }}
{{ local_env }}
diff --git a/guests/playbooks/build/jobs/defaults.yml b/guests/playbooks/build/jobs/defaults.yml
index 7ea7ab8..522dd83 100644
--- a/guests/playbooks/build/jobs/defaults.yml
+++ b/guests/playbooks/build/jobs/defaults.yml
@@ -1,5 +1,4 @@
---
-variant: ''
all_machines:
- libvirt-centos-7
- libvirt-debian-8
diff --git a/guests/playbooks/build/jobs/generic-build-job.yml b/guests/playbooks/build/jobs/generic-build-job.yml
index b651952..5639f7c 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 }}-build{{ variant }}'
+- name: '{{ name }}-build'
shell: |
set -e
- cd {{ name }}{{ variant }}
+ cd {{ name }}
{{ 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 c133890..15717ec 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 }}-check{{ variant }}'
+- name: '{{ name }}-check'
shell: |
set -e
- cd {{ name }}{{ variant }}
+ cd {{ name }}
{{ 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 879d9f4..502a91e 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 }}-rpm{{ variant }}'
+- name: '{{ name }}-rpm'
shell: |
set -e
- cd {{ name }}{{ variant }}
+ cd {{ name }}
{{ 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 471cbf5..413a47f 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 }}-syntax-check{{ variant }}'
+- name: '{{ name }}-syntax-check'
shell: |
set -e
- cd {{ name }}{{ variant }}
+ cd {{ name }}
{{ 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 5eb9de1..fc7df2d 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 }}-build{{ variant }}'
+- name: '{{ name }}-build'
shell: |
set -e
- cd {{ name }}{{ variant }}
+ cd {{ name }}
{{ 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 29f3c53..533e0ac 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 }}-check{{ variant }}'
+- name: '{{ name }}-check'
shell: |
set -e
- cd {{ name }}{{ variant }}
+ cd {{ name }}
{{ 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 15a1089..398266e 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 }}-build{{ variant }}'
+- name: '{{ name }}-build'
shell: |
set -e
- cd {{ name }}{{ variant }}
+ cd {{ name }}
{{ 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 5c8ab1b..e72df59 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 }}-check{{ variant }}'
+- name: '{{ name }}-check'
shell: |
set -e
- cd {{ name }}{{ variant }}
+ cd {{ name }}
{{ 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 dad672c..bb9d7f6 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 }}-rpm{{ variant }}'
+- name: '{{ name }}-rpm'
shell: |
set -e
- cd {{ name }}{{ variant }}
+ cd {{ name }}
{{ global_env }}
{{ local_env }}
diff --git a/guests/playbooks/build/jobs/prepare.yml b/guests/playbooks/build/jobs/prepare.yml
index 7782c0f..576afbc 100644
--- a/guests/playbooks/build/jobs/prepare.yml
+++ b/guests/playbooks/build/jobs/prepare.yml
@@ -1,17 +1,17 @@
---
-- name: '{{ name }}-prepare{{ variant }}'
+- name: '{{ name }}-prepare'
git:
repo: '{{ git_url }}'
version: '{{ git_branch }}'
- dest: '{{ name }}{{ variant }}'
+ dest: '{{ name }}'
force: yes
when:
- inventory_hostname in machines
-- name: '{{ name }}-prepare{{ variant }}'
+- name: '{{ name }}-prepare'
shell: |
set -e
- cd {{ name }}{{ variant }}
+ cd {{ name }}
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 711edc2..d10cbcc 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 }}-build{{ variant }}'
+- name: '{{ name }}-build'
shell: |
set -e
- cd {{ name }}{{ variant }}
+ cd {{ name }}
{{ 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 4f36868..93d9abf 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 }}-check{{ variant }}'
+- name: '{{ name }}-check'
shell: |
set -e
- cd {{ name }}{{ variant }}
+ cd {{ name }}
{{ 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 bae2b9b..a122ec7 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 }}-rpm{{ variant }}'
+- name: '{{ name }}-rpm'
shell: |
set -e
- cd {{ name }}{{ variant }}
+ cd {{ name }}
{{ global_env }}
{{ local_env }}
diff --git a/jobs/autotools.yaml b/jobs/autotools.yaml
index 96e5edf..8956855 100644
--- a/jobs/autotools.yaml
+++ b/jobs/autotools.yaml
@@ -1,10 +1,10 @@
- job-template:
id: autotools-build-job
- name: '{name}-build{variant}'
+ name: '{name}-build'
project-type: matrix
description: '{title} Build'
- workspace: '{name}{variant}'
+ workspace: '{name}'
child-workspace: '.'
block-downstream: true
block-upstream: true
@@ -54,10 +54,10 @@
- job-template:
id: autotools-syntax-check-job
- name: '{name}-syntax-check{variant}'
+ name: '{name}-syntax-check'
project-type: matrix
description: '{title} Syntax Check'
- workspace: '{name}{variant}'
+ workspace: '{name}'
child-workspace: '.'
block-downstream: true
block-upstream: true
@@ -93,10 +93,10 @@
- job-template:
id: autotools-check-job
- name: '{name}-check{variant}'
+ name: '{name}-check'
project-type: matrix
description: '{title} Check'
- workspace: '{name}{variant}'
+ workspace: '{name}'
child-workspace: '.'
block-downstream: true
block-upstream: true
@@ -136,10 +136,10 @@
- job-template:
id: autotools-rpm-job
- name: '{name}-rpm{variant}'
+ name: '{name}-rpm'
project-type: matrix
description: '{title} RPM'
- workspace: '{name}{variant}'
+ workspace: '{name}'
child-workspace: '.'
block-downstream: true
block-upstream: true
diff --git a/jobs/defaults.yaml b/jobs/defaults.yaml
index 1a81547..5cf84dc 100644
--- a/jobs/defaults.yaml
+++ b/jobs/defaults.yaml
@@ -1,7 +1,6 @@
- defaults:
name: global
- variant: ''
node: libvirt
all_machines:
- libvirt-centos-7
diff --git a/jobs/generic.yaml b/jobs/generic.yaml
index fb7f866..70210b6 100644
--- a/jobs/generic.yaml
+++ b/jobs/generic.yaml
@@ -1,10 +1,10 @@
- job-template:
id: generic-build-job
- name: '{name}-build{variant}'
+ name: '{name}-build'
project-type: matrix
description: '{title} Build'
- workspace: '{name}{variant}'
+ workspace: '{name}'
child-workspace: '.'
block-downstream: true
block-upstream: true
@@ -50,10 +50,10 @@
- job-template:
id: generic-syntax-check-job
- name: '{name}-syntax-check{variant}'
+ name: '{name}-syntax-check'
project-type: matrix
description: '{title} Syntax Check'
- workspace: '{name}{variant}'
+ workspace: '{name}'
child-workspace: '.'
block-downstream: true
block-upstream: true
@@ -88,10 +88,10 @@
- job-template:
id: generic-check-job
- name: '{name}-check{variant}'
+ name: '{name}-check'
project-type: matrix
description: '{title} Check'
- workspace: '{name}{variant}'
+ workspace: '{name}'
child-workspace: '.'
block-downstream: true
block-upstream: true
@@ -126,10 +126,10 @@
- job-template:
id: generic-rpm-job
- name: '{name}-rpm{variant}'
+ name: '{name}-rpm'
project-type: matrix
description: '{title} RPM'
- workspace: '{name}{variant}'
+ workspace: '{name}'
child-workspace: '.'
block-downstream: true
block-upstream: true
diff --git a/jobs/go.yaml b/jobs/go.yaml
index 56ad11f..9f09950 100644
--- a/jobs/go.yaml
+++ b/jobs/go.yaml
@@ -1,10 +1,10 @@
- job-template:
id: go-build-job
- name: '{name}-build{variant}'
+ name: '{name}-build'
project-type: matrix
description: '{title} Build'
- workspace: '{name}{variant}'
+ workspace: '{name}'
child-workspace: '.'
block-downstream: true
block-upstream: true
@@ -50,10 +50,10 @@
- job-template:
id: go-check-job
- name: '{name}-check{variant}'
+ name: '{name}-check'
project-type: matrix
description: '{title} Check'
- workspace: '{name}{variant}'
+ workspace: '{name}'
child-workspace: '.'
block-downstream: true
block-upstream: true
diff --git a/jobs/perl-modulebuild.yaml b/jobs/perl-modulebuild.yaml
index af041c2..b1140f5 100644
--- a/jobs/perl-modulebuild.yaml
+++ b/jobs/perl-modulebuild.yaml
@@ -1,10 +1,10 @@
- job-template:
id: perl-modulebuild-build-job
- name: '{name}-build{variant}'
+ name: '{name}-build'
project-type: matrix
description: '{title} Build'
- workspace: '{name}{variant}'
+ workspace: '{name}'
child-workspace: '.'
block-downstream: true
block-upstream: true
@@ -53,10 +53,10 @@
- job-template:
id: perl-modulebuild-check-job
- name: '{name}-check{variant}'
+ name: '{name}-check'
project-type: matrix
description: '{title} Check'
- workspace: '{name}{variant}'
+ workspace: '{name}'
child-workspace: '.'
block-downstream: true
block-upstream: true
@@ -91,10 +91,10 @@
- job-template:
id: perl-modulebuild-rpm-job
- name: '{name}-rpm{variant}'
+ name: '{name}-rpm'
project-type: matrix
description: '{title} RPM'
- workspace: '{name}{variant}'
+ workspace: '{name}'
child-workspace: '.'
block-downstream: true
block-upstream: true
diff --git a/jobs/python-distutils.yaml b/jobs/python-distutils.yaml
index fe85c98..af816fd 100644
--- a/jobs/python-distutils.yaml
+++ b/jobs/python-distutils.yaml
@@ -1,10 +1,10 @@
- job-template:
id: python-distutils-build-job
- name: '{name}-build{variant}'
+ name: '{name}-build'
project-type: matrix
description: '{title} Build'
- workspace: '{name}{variant}'
+ workspace: '{name}'
child-workspace: '.'
block-downstream: true
block-upstream: true
@@ -53,10 +53,10 @@
- job-template:
id: python-distutils-check-job
- name: '{name}-check{variant}'
+ name: '{name}-check'
project-type: matrix
description: '{title} Check'
- workspace: '{name}{variant}'
+ workspace: '{name}'
child-workspace: '.'
block-downstream: true
block-upstream: true
@@ -91,10 +91,10 @@
- job-template:
id: python-distutils-rpm-job
- name: '{name}-rpm{variant}'
+ name: '{name}-rpm'
project-type: matrix
description: '{title} RPM'
- workspace: '{name}{variant}'
+ workspace: '{name}'
child-workspace: '.'
block-downstream: true
block-upstream: true
--
2.17.1
More information about the libvir-list
mailing list