From nobody Mon Feb 9 06:34:35 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1536058909639307.123504658553; Tue, 4 Sep 2018 04:01:49 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id CB243308FBA2; Tue, 4 Sep 2018 11:01:47 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 516F35C541; Tue, 4 Sep 2018 11:01:47 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 481DC4A460; Tue, 4 Sep 2018 11:01:46 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w84B1iTX011759 for ; Tue, 4 Sep 2018 07:01:44 -0400 Received: by smtp.corp.redhat.com (Postfix) id 409DF2027069; Tue, 4 Sep 2018 11:01:44 +0000 (UTC) Received: from inaba.usersys.redhat.com (unknown [10.43.2.44]) by smtp.corp.redhat.com (Postfix) with ESMTPS id D5054202704B for ; Tue, 4 Sep 2018 11:01:43 +0000 (UTC) From: Andrea Bolognani To: libvir-list@redhat.com Date: Tue, 4 Sep 2018 13:01:35 +0200 Message-Id: <20180904110135.11232-4-abologna@redhat.com> In-Reply-To: <20180904110135.11232-1-abologna@redhat.com> References: <20180904110135.11232-1-abologna@redhat.com> X-Scanned-By: MIMEDefang 2.78 on 10.11.54.4 X-loop: libvir-list@redhat.com Subject: [libvirt] [jenkins-ci PATCH 3/3] Remove 'variant' X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.43]); Tue, 04 Sep 2018 11:01:48 +0000 (UTC) X-ZohoMail: RDMRC_0 RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" It's no longer used anywhere. Signed-off-by: Andrea Bolognani --- .../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/p= laybooks/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 }} =20 {{ global_env }} {{ local_env }} diff --git a/guests/playbooks/build/jobs/autotools-check-job.yml b/guests/p= laybooks/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 }} =20 {{ global_env }} {{ local_env }} diff --git a/guests/playbooks/build/jobs/autotools-rpm-job.yml b/guests/pla= ybooks/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 }} =20 {{ global_env }} {{ local_env }} diff --git a/guests/playbooks/build/jobs/autotools-syntax-check-job.yml b/g= uests/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 }} =20 {{ global_env }} {{ local_env }} diff --git a/guests/playbooks/build/jobs/defaults.yml b/guests/playbooks/bu= ild/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/pla= ybooks/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 }} =20 {{ global_env }} {{ local_env }} diff --git a/guests/playbooks/build/jobs/generic-check-job.yml b/guests/pla= ybooks/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 }} =20 {{ global_env }} {{ local_env }} diff --git a/guests/playbooks/build/jobs/generic-rpm-job.yml b/guests/playb= ooks/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 }} =20 {{ global_env }} {{ local_env }} diff --git a/guests/playbooks/build/jobs/generic-syntax-check-job.yml b/gue= sts/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 }} =20 {{ global_env }} {{ local_env }} diff --git a/guests/playbooks/build/jobs/go-build-job.yml b/guests/playbook= s/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 }} =20 {{ global_env }} {{ local_env }} diff --git a/guests/playbooks/build/jobs/go-check-job.yml b/guests/playbook= s/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 }} =20 {{ global_env }} {{ local_env }} diff --git a/guests/playbooks/build/jobs/perl-modulebuild-build-job.yml b/g= uests/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 }} =20 {{ global_env }} {{ local_env }} diff --git a/guests/playbooks/build/jobs/perl-modulebuild-check-job.yml b/g= uests/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 }} =20 {{ global_env }} {{ local_env }} diff --git a/guests/playbooks/build/jobs/perl-modulebuild-rpm-job.yml b/gue= sts/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 }} =20 {{ global_env }} {{ local_env }} diff --git a/guests/playbooks/build/jobs/prepare.yml b/guests/playbooks/bui= ld/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 =20 -- name: '{{ name }}-prepare{{ variant }}' +- name: '{{ name }}-prepare' shell: | set -e - cd {{ name }}{{ variant }} + cd {{ name }} =20 git clean -xdf git submodule update --init diff --git a/guests/playbooks/build/jobs/python-distutils-build-job.yml b/g= uests/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 }} =20 {{ global_env }} {{ local_env }} diff --git a/guests/playbooks/build/jobs/python-distutils-check-job.yml b/g= uests/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 }} =20 {{ global_env }} {{ local_env }} diff --git a/guests/playbooks/build/jobs/python-distutils-rpm-job.yml b/gue= sts/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 }} =20 {{ 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 @@ =20 - 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 @@ =20 - 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 @@ =20 - 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 @@ =20 - 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 @@ =20 - 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 @@ =20 - 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 @@ =20 - 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 @@ =20 - 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 @@ =20 - 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 @@ =20 - 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 @@ =20 - 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 @@ =20 - 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 @@ =20 - 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 @@ =20 - 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 @@ =20 - 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 @@ =20 - 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 @@ =20 - 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 --=20 2.17.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list