From nobody Fri Apr 26 07:58:18 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 207.211.31.120 as permitted sender) client-ip=207.211.31.120; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 207.211.31.120 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com Return-Path: Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [207.211.31.120]) by mx.zohomail.com with SMTPS id 1581355193184263.6958980038827; Mon, 10 Feb 2020 09:19:53 -0800 (PST) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-323-2_CU9a-6M22GkHoVnq0oxQ-1; Mon, 10 Feb 2020 12:19:47 -0500 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 7D45B18CA263; Mon, 10 Feb 2020 17:19:41 +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 5AEF210013A7; Mon, 10 Feb 2020 17:19:41 +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 1C60B866D6; Mon, 10 Feb 2020 17:19:41 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 01AHJdmw028148 for ; Mon, 10 Feb 2020 12:19:39 -0500 Received: by smtp.corp.redhat.com (Postfix) id AF3755C107; Mon, 10 Feb 2020 17:19:39 +0000 (UTC) Received: from kinshicho.usersys.redhat.com (unknown [10.43.2.246]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 3763177958 for ; Mon, 10 Feb 2020 17:19:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1581355191; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=Yetx6YbD26mV2L1eSGHKm4T1TCrbGO8krsOQOa2XuMk=; b=fsJNSuQBAZLHFHftRcAWBBtPSP0Kie8+ig/+lsQuBaUqyIa1ymSoQ3QYkKHBFJHvK1A0fi FULibRdVURdyvJYLo5O5adtuHqQ9ZcH3siaZYrhlWZQ7Jo6K3UIQKApJoHhrX7KGq6ud1T LTzMJtgdMv193kFrz9bdynpAdOXN9jY= From: Andrea Bolognani To: libvir-list@redhat.com Subject: [dockerfiles PATCH] refresh: Drop MinGW hacks Date: Mon, 10 Feb 2020 18:19:34 +0100 Message-Id: <20200210171934.53475-1-abologna@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-loop: libvir-list@redhat.com 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: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-MC-Unique: 2_CU9a-6M22GkHoVnq0oxQ-1 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Up until now we have had to hardcode some information in our refresh script, but with the recent improvements to lcitool that's no longer necessary. Signed-off-by: Andrea Bolognani --- This patch needs https://www.redhat.com/archives/libvir-list/2020-February/msg00409.html to be merged into libvirt-jenkins-ci. refresh | 37 ++++++++++++------------------------- 1 file changed, 12 insertions(+), 25 deletions(-) diff --git a/refresh b/refresh index 5f3f5e3..6b644de 100755 --- a/refresh +++ b/refresh @@ -31,22 +31,19 @@ class Dockerfile: CROSS =3D "-cross-" SUFFIX =3D ".zip" =20 - # PROJECTS is a dictionary of dictionaries. + # PROJECTS is a dictionary of lists. # The key is the project name, as present in the Dockerfile name and - # the value is a dictionary containing the subprojects which the - # dependencies should be installed together as the key and their value - # being whether they support mingw builds or not. - # This hack is needed till the moment libvirt-jenkins-ci treats mingw - # builds in the very same way as cross-builds are treated. + # the value is a list containing the subprojects which the + # dependencies should be installed together as. PROJECTS =3D { - "libvirt" : { - "libvirt" : True - }, - "libosinfo" : { - "libosinfo" : True, - "osinfo-db" : False, - "osinfo-db-tools" : True - }, + "libvirt" : [ + "libvirt" + ], + "libosinfo" : [ + "libosinfo", + "osinfo-db", + "osinfo-db-tools", + ], } =20 def __init__(self, path): @@ -91,17 +88,7 @@ class Dockerfile: self.os =3D stem self.cross_arch =3D None =20 - self.projects =3D [] - - for project in Dockerfile.PROJECTS[project_name]: - self.projects +=3D [project] - # Fedora 30 is special in that we use it to perform MinGW - # builds, so we need to add the corresponding projects as well. - # If a specific project needs to have the MinGW variant includ= ed, - # the corresponding value in the dictionary will be True - if (self.os =3D=3D "fedora-30" and - Dockerfile.PROJECTS[project_name][project]): - self.projects +=3D [project + "+mingw*"] + self.projects =3D Dockerfile.PROJECTS[project_name] =20 =20 def refresh(self, lcitool): --=20 2.24.1