From nobody Sat Apr 27 16:28:05 2024 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 1525966007746197.81718490410003; Thu, 10 May 2018 08:26:47 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx12.intmail.prod.int.phx2.redhat.com [10.5.11.27]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id BDCA530CB951; Thu, 10 May 2018 15:26:45 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 623E1975A9; Thu, 10 May 2018 15:26:45 +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 36F3B1801218; Thu, 10 May 2018 15:26:44 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w4AFQfSO000620 for ; Thu, 10 May 2018 11:26:41 -0400 Received: by smtp.corp.redhat.com (Postfix) id EFABE63F59; Thu, 10 May 2018 15:26:40 +0000 (UTC) Received: from inaba.usersys.redhat.com (unknown [10.43.2.44]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 9448850327 for ; Thu, 10 May 2018 15:26:40 +0000 (UTC) From: Andrea Bolognani To: libvir-list@redhat.com Date: Thu, 10 May 2018 17:26:32 +0200 Message-Id: <20180510152633.16553-2-abologna@redhat.com> In-Reply-To: <20180510152633.16553-1-abologna@redhat.com> References: <20180510152633.16553-1-abologna@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.11.54.5 X-loop: libvir-list@redhat.com Subject: [libvirt] [jenkins-ci PATCH 1/2] jobs: Move archive_format to defaults 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.84 on 10.5.11.27 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.47]); Thu, 10 May 2018 15:26:46 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Instead of repeating the definition all over the place, move it to the defaults where it belongs. Signed-off-by: Andrea Bolognani Reviewed-by: Erik Skultety --- jobs/autotools.yaml | 1 - jobs/defaults.yaml | 1 + jobs/generic.yaml | 1 - jobs/perl-makemaker.yaml | 1 - jobs/perl-modulebuild.yaml | 1 - 5 files changed, 1 insertion(+), 4 deletions(-) diff --git a/jobs/autotools.yaml b/jobs/autotools.yaml index 9868573..638be5e 100644 --- a/jobs/autotools.yaml +++ b/jobs/autotools.yaml @@ -140,7 +140,6 @@ name: '{name}-{branch}-rpm{variant}' project-type: matrix description: '{title} RPM' - archive_format: gz workspace: '{name}-{branch}{variant}' child-workspace: '.' block-downstream: true diff --git a/jobs/defaults.yaml b/jobs/defaults.yaml index 45eedb7..0a1c757 100644 --- a/jobs/defaults.yaml +++ b/jobs/defaults.yaml @@ -20,6 +20,7 @@ - libvirt-fedora-rawhide mingw_machines: - libvirt-fedora-rawhide + archive_format: gz global_env: | local_env: | mingw32_local_env: | diff --git a/jobs/generic.yaml b/jobs/generic.yaml index f64dde0..3e20962 100644 --- a/jobs/generic.yaml +++ b/jobs/generic.yaml @@ -130,7 +130,6 @@ name: '{name}-{branch}-rpm{variant}' project-type: matrix description: '{title} RPM' - archive_format: gz workspace: '{name}-{branch}{variant}' child-workspace: '.' block-downstream: true diff --git a/jobs/perl-makemaker.yaml b/jobs/perl-makemaker.yaml index 84b368e..31f1441 100644 --- a/jobs/perl-makemaker.yaml +++ b/jobs/perl-makemaker.yaml @@ -97,7 +97,6 @@ name: '{name}-{branch}-rpm{variant}' project-type: matrix description: '{title} RPM' - archive_format: gz workspace: '{name}-{branch}{variant}' child-workspace: '.' block-downstream: true diff --git a/jobs/perl-modulebuild.yaml b/jobs/perl-modulebuild.yaml index b159ab3..60374da 100644 --- a/jobs/perl-modulebuild.yaml +++ b/jobs/perl-modulebuild.yaml @@ -96,7 +96,6 @@ name: '{name}-{branch}-rpm{variant}' project-type: matrix description: '{title} RPM' - archive_format: gz workspace: '{name}-{branch}{variant}' child-workspace: '.' block-downstream: true --=20 2.17.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Sat Apr 27 16:28:05 2024 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 1525966022272627.3772345631578; Thu, 10 May 2018 08:27:02 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id E8FC2624DE; Thu, 10 May 2018 15:26:59 +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 6E2DF60922; Thu, 10 May 2018 15:26:59 +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 1245E4BB79; Thu, 10 May 2018 15:26:59 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w4AFQfE9000629 for ; Thu, 10 May 2018 11:26:41 -0400 Received: by smtp.corp.redhat.com (Postfix) id 908DB63F59; Thu, 10 May 2018 15:26:41 +0000 (UTC) Received: from inaba.usersys.redhat.com (unknown [10.43.2.44]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 35D2963F70 for ; Thu, 10 May 2018 15:26:41 +0000 (UTC) From: Andrea Bolognani To: libvir-list@redhat.com Date: Thu, 10 May 2018 17:26:33 +0200 Message-Id: <20180510152633.16553-3-abologna@redhat.com> In-Reply-To: <20180510152633.16553-1-abologna@redhat.com> References: <20180510152633.16553-1-abologna@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.11.54.5 X-loop: libvir-list@redhat.com Subject: [libvirt] [jenkins-ci PATCH 2/2] projects: Define archive_format for osinfo-db 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.13 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.39]); Thu, 10 May 2018 15:27:01 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Follow the standard templating behavior instead of needlessly hardcoding information in the script. Signed-off-by: Andrea Bolognani Reviewed-by: Erik Skultety --- projects/osinfo-db.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/projects/osinfo-db.yaml b/projects/osinfo-db.yaml index 0d0a972..9e22c93 100644 --- a/projects/osinfo-db.yaml +++ b/projects/osinfo-db.yaml @@ -3,6 +3,7 @@ name: osinfo-db machines: '{all_machines}' title: osinfo database + archive_format: xz jobs: - generic-build-job: parent_jobs: 'osinfo-db-tools-master-build' @@ -17,7 +18,7 @@ parent_jobs: 'osinfo-db-master-check' machines: '{rpm_machines}' command: | - rm -f *.tar.xz + rm -f *.tar.{archive_format} $MAKE osinfo-db.spec perl -i -p -e 's/BuildRequires: osinfo-db-tools.*//' osinfo-db= .spec $MAKE rpm --=20 2.17.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list