From nobody Mon Apr 29 04:19:46 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 ARC-Seal: i=1; a=rsa-sha256; t=1588614072; cv=none; d=zohomail.com; s=zohoarc; b=WqxFN2XxVBux9uCp1WnwJtvwIoURKumgZ41n0tlA3KY+63TMupzROp/cGXDEuhueKJUbAhc4Qhu1VC5XYPMk+PKiUkHh3VolD3SqJNOndEYq5O7tdUxg1y8uCjOodHCwb2wRsYja3h2UtjZvPgG5pS07zcKdIOzc8Skk1P2eWrA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1588614072; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=B0q8s86cTP+wTOWdW6gUMsWrL1UFJ6AjHzbV5WLD7uY=; b=bfZf6bo2wNNm9rd5KhYDOpdFd7G4lri8KBKPv0yW4029XUEkXuNCC2rgniVYuSuyWyP/zUaqChBZbQFOqQaqYxb7RCKpuaMd0JYBF7cbzfDnK8y6XPe+27dgJqYI3Z9kE2DvIdqCkxJj9F1Iq0SBY55wZBy2xSHbEiZ50GpM+Ps= ARC-Authentication-Results: i=1; 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 header.from= (p=none dis=none) header.from= 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 1588614072931561.2844452845234; Mon, 4 May 2020 10:41:12 -0700 (PDT) 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-81-bJJY6NfNMCy-GcDrQE85ZQ-1; Mon, 04 May 2020 13:41:09 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id A50EE100CCC2; Mon, 4 May 2020 17:41:03 +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 770812DE64; Mon, 4 May 2020 17:41:03 +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 345C34CAB0; Mon, 4 May 2020 17:41:03 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 044Hetco016260 for ; Mon, 4 May 2020 13:40:55 -0400 Received: by smtp.corp.redhat.com (Postfix) id 662CA6FDCA; Mon, 4 May 2020 17:40:55 +0000 (UTC) Received: from localhost.localdomain.com (unknown [10.36.110.51]) by smtp.corp.redhat.com (Postfix) with ESMTP id 8BEF96F133; Mon, 4 May 2020 17:40:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1588614071; 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: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=B0q8s86cTP+wTOWdW6gUMsWrL1UFJ6AjHzbV5WLD7uY=; b=QaANHhSHC221uBobvC/n+ajdvHu7G0noWyU1d82UqwRcdkfaSuFakhbh7UOgd1L9V6Ajo2 7FOLParyzsius3AfYcx2dSBB+/Dd1iR+2ukDzgVbjuK+Ow4C5bFEkt9mbFviQgd8ddcHzk E5gvM10iRR3Ay9Chojw7oGo+f87BwS0= X-MC-Unique: bJJY6NfNMCy-GcDrQE85ZQ-1 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: libvir-list@redhat.com Subject: [libvirt-php 1/6] m4: ignore --php-binary if it doesn't exist Date: Mon, 4 May 2020 18:40:41 +0100 Message-Id: <20200504174046.763123-2-berrange@redhat.com> In-Reply-To: <20200504174046.763123-1-berrange@redhat.com> References: <20200504174046.763123-1-berrange@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 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.23 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" On OpenSUSE 151, "php-config --php-binary" reports a name of "/usr/bin/php-cgi", but this binary doesn't actually exist. We need to fallback to the plain "/usr/bin/php" command. Signed-off-by: Daniel P. Berrang=C3=A9 Reviewed-by: Michal Privoznik --- m4/virt-php-extension.m4 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/m4/virt-php-extension.m4 b/m4/virt-php-extension.m4 index 5aa3cb7..2a97e74 100644 --- a/m4/virt-php-extension.m4 +++ b/m4/virt-php-extension.m4 @@ -26,7 +26,7 @@ AC_DEFUN([LIBVIRT_CHECK_PHP_EXTENSION],[ AC_MSG_CHECKING([for php module $1]) =20 phpbinary=3D"$($PHPCONFIG --php-binary)" - if test "x$phpbinary" =3D "x"; then + if test "x$phpbinary" =3D "x" || test ! -x "$phpbinary" ; then phpbinary=3D"$($PHPCONFIG --prefix)/bin/php" fi =20 --=20 2.26.2 From nobody Mon Apr 29 04:19:46 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 ARC-Seal: i=1; a=rsa-sha256; t=1588614072; cv=none; d=zohomail.com; s=zohoarc; b=KdEm9//2VyeYFZCHCOvnntK3j9o5qXsI2fn8mXKr3TraZtsrddtCuNhBn1bIdmbpofWeGuHaBFPm+j+hqnUKuuhlJI9fmZ/OKgF0xh2sC8ROnhkJsWFiVu97ZlkZtU/RGiVNCqhk2dO7PgtpqERe+DP5BEUfQRzsQbekKsHUd8w= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1588614072; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=VnWrlUqR6nOS68dTRF1GQTyrH3gblHi0eaQypLgjeXA=; b=IDlvYNGvKBb16yC3SyS4msyoEwRZ2F6hG90Bmx8GCZRdbo3h7bsMy5NqJzQkN+MBzoX1flBTf/iVqQ1JiEHy1/4BwE3vvZ6iwzAZUIhpxtzI4A7Tz7cqt9JsTdP7Dxmxs2rsch97FUrOWU/3twDIPqRAEW4XkDlx+83eSWe0Gio= ARC-Authentication-Results: i=1; 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 header.from= (p=none dis=none) header.from= 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 1588614072532235.67720541644212; Mon, 4 May 2020 10:41:12 -0700 (PDT) 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-413-pb_x_l92Px6sM5AJbyiZbg-1; Mon, 04 May 2020 13:41:05 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 36FFA835B41; Mon, 4 May 2020 17:40:59 +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 EF1FA60BEC; Mon, 4 May 2020 17:40:58 +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 55B951809542; Mon, 4 May 2020 17:40:58 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 044Heurs016279 for ; Mon, 4 May 2020 13:40:56 -0400 Received: by smtp.corp.redhat.com (Postfix) id CF3BA6FDAB; Mon, 4 May 2020 17:40:56 +0000 (UTC) Received: from localhost.localdomain.com (unknown [10.36.110.51]) by smtp.corp.redhat.com (Postfix) with ESMTP id E095370520; Mon, 4 May 2020 17:40:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1588614071; 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: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=VnWrlUqR6nOS68dTRF1GQTyrH3gblHi0eaQypLgjeXA=; b=AgO/5LyaofsBvzzF3TRZL3zdvZAAUNuSYwuGmssD/E6iUt043zdygdGvgn/J4nSYUotfUf fC33I+bj21TzOPBwsAsGsBw6tY7tvjVW5P0A/uYdr9K7lE/t9k6T+qLwe0hiuCvzeGDwLZ KwxolQFW1OWFPJdqWxpTcem9bwFZsmI= X-MC-Unique: pb_x_l92Px6sM5AJbyiZbg-1 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: libvir-list@redhat.com Subject: [libvirt-php 2/6] src: don't declare global variables in header files Date: Mon, 4 May 2020 18:40:42 +0100 Message-Id: <20200504174046.763123-3-berrange@redhat.com> In-Reply-To: <20200504174046.763123-1-berrange@redhat.com> References: <20200504174046.763123-1-berrange@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 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.79 on 10.5.11.12 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" In Fedora 32 and later the linker will no longer merge duplicate global variables. Thus headers need fixing to properly use "extern" and put the actual declaration in the source files. Signed-off-by: Daniel P. Berrang=C3=A9 Reviewed-by: Michal Privoznik --- src/libvirt-connection.c | 2 ++ src/libvirt-connection.h | 2 +- src/libvirt-domain.c | 2 ++ src/libvirt-domain.h | 2 +- src/libvirt-network.c | 2 ++ src/libvirt-network.h | 2 +- src/libvirt-nodedev.c | 2 ++ src/libvirt-nodedev.h | 2 +- src/libvirt-nwfilter.c | 2 ++ src/libvirt-nwfilter.h | 2 +- src/libvirt-php.c | 2 ++ src/libvirt-php.h | 2 +- src/libvirt-snapshot.c | 2 ++ src/libvirt-snapshot.h | 2 +- src/libvirt-storage.c | 3 +++ src/libvirt-storage.h | 4 ++-- src/libvirt-stream.c | 2 ++ src/libvirt-stream.h | 2 +- 18 files changed, 29 insertions(+), 10 deletions(-) diff --git a/src/libvirt-connection.c b/src/libvirt-connection.c index 9e70031..adc0045 100644 --- a/src/libvirt-connection.c +++ b/src/libvirt-connection.c @@ -11,6 +11,8 @@ =20 DEBUG_INIT("connection"); =20 +int le_libvirt_connection; + /* * Private function name: free_resources_on_connection * Since version: 0.4.2 diff --git a/src/libvirt-connection.h b/src/libvirt-connection.h index 0cae5ec..20f79e0 100644 --- a/src/libvirt-connection.h +++ b/src/libvirt-connection.h @@ -46,7 +46,7 @@ RETURN_FALSE; = \ } while (0) =20 -int le_libvirt_connection; +extern int le_libvirt_connection; =20 typedef struct _php_libvirt_connection { virConnectPtr conn; diff --git a/src/libvirt-domain.c b/src/libvirt-domain.c index f594253..419630b 100644 --- a/src/libvirt-domain.c +++ b/src/libvirt-domain.c @@ -15,6 +15,8 @@ =20 DEBUG_INIT("domain"); =20 +int le_libvirt_domain; + void php_libvirt_domain_dtor(virt_resource *rsrc TSRMLS_DC) { diff --git a/src/libvirt-domain.h b/src/libvirt-domain.h index 8b80c9c..8640df8 100644 --- a/src/libvirt-domain.h +++ b/src/libvirt-domain.h @@ -120,7 +120,7 @@ PHP_FE(libvirt_list_active_domains, arginfo_libvirt_conn) = \ PHP_FE(libvirt_list_inactive_domains, arginfo_libvirt_conn) =20 -int le_libvirt_domain; +extern int le_libvirt_domain; =20 typedef struct _php_libvirt_domain { virDomainPtr domain; diff --git a/src/libvirt-network.c b/src/libvirt-network.c index 673790a..3888780 100644 --- a/src/libvirt-network.c +++ b/src/libvirt-network.c @@ -11,6 +11,8 @@ =20 DEBUG_INIT("network"); =20 +int le_libvirt_network; + void php_libvirt_network_dtor(virt_resource *rsrc TSRMLS_DC) { diff --git a/src/libvirt-network.h b/src/libvirt-network.h index 604b803..634c681 100644 --- a/src/libvirt-network.h +++ b/src/libvirt-network.h @@ -45,7 +45,7 @@ PHP_FE(libvirt_list_all_networks, arginfo_libvirt_conn_optflags)= \ PHP_FE(libvirt_list_networks, arginfo_libvirt_conn_optflags) =20 -int le_libvirt_network; +extern int le_libvirt_network; =20 typedef struct _php_libvirt_network { virNetworkPtr network; diff --git a/src/libvirt-nodedev.c b/src/libvirt-nodedev.c index 5cfe428..e7a8535 100644 --- a/src/libvirt-nodedev.c +++ b/src/libvirt-nodedev.c @@ -11,6 +11,8 @@ =20 DEBUG_INIT("nodedev"); =20 +int le_libvirt_nodedev; + void php_libvirt_nodedev_dtor(virt_resource *rsrc TSRMLS_DC) { diff --git a/src/libvirt-nodedev.h b/src/libvirt-nodedev.h index 350b213..1357037 100644 --- a/src/libvirt-nodedev.h +++ b/src/libvirt-nodedev.h @@ -35,7 +35,7 @@ RETURN_FALSE; = \ } while (0) =20 -int le_libvirt_nodedev; +extern int le_libvirt_nodedev; =20 typedef struct _php_libvirt_nodedev { virNodeDevicePtr device; diff --git a/src/libvirt-nwfilter.c b/src/libvirt-nwfilter.c index d949052..fa824cb 100644 --- a/src/libvirt-nwfilter.c +++ b/src/libvirt-nwfilter.c @@ -11,6 +11,8 @@ =20 DEBUG_INIT("nwfilter"); =20 +int le_libvirt_nwfilter; + void php_libvirt_nwfilter_dtor(virt_resource *rsrc TSRMLS_DC) { diff --git a/src/libvirt-nwfilter.h b/src/libvirt-nwfilter.h index c0cebb3..b450419 100644 --- a/src/libvirt-nwfilter.h +++ b/src/libvirt-nwfilter.h @@ -42,7 +42,7 @@ RETURN_FALSE; = \ } while (0) = \ =20 -int le_libvirt_nwfilter; +extern int le_libvirt_nwfilter; =20 typedef struct _php_libvirt_nwfilter { virNWFilterPtr nwfilter; diff --git a/src/libvirt-php.c b/src/libvirt-php.c index 75cbf68..04f73d9 100644 --- a/src/libvirt-php.c +++ b/src/libvirt-php.c @@ -31,6 +31,8 @@ =20 DEBUG_INIT("core"); =20 +ZEND_DECLARE_MODULE_GLOBALS(libvirt) + #ifndef EXTWIN /* Additional binaries */ const char *features[] =3D { "screenshot", "create-image", "screenshot-con= vert", NULL }; diff --git a/src/libvirt-php.h b/src/libvirt-php.h index d6e61c5..f0c77ce 100644 --- a/src/libvirt-php.h +++ b/src/libvirt-php.h @@ -155,7 +155,7 @@ ZEND_BEGIN_MODULE_GLOBALS(libvirt) int binding_resources_count; ZEND_END_MODULE_GLOBALS(libvirt) =20 -ZEND_DECLARE_MODULE_GLOBALS(libvirt) +ZEND_EXTERN_MODULE_GLOBALS(libvirt) =20 /* Private definitions */ void set_error(char *msg TSRMLS_DC); diff --git a/src/libvirt-snapshot.c b/src/libvirt-snapshot.c index e1445a2..3b10c10 100644 --- a/src/libvirt-snapshot.c +++ b/src/libvirt-snapshot.c @@ -11,6 +11,8 @@ =20 DEBUG_INIT("snapshot"); =20 +int le_libvirt_snapshot; + void php_libvirt_snapshot_dtor(virt_resource *rsrc TSRMLS_DC) { php_libvirt_snapshot *snapshot =3D (php_libvirt_snapshot *)rsrc->ptr; diff --git a/src/libvirt-snapshot.h b/src/libvirt-snapshot.h index 32db210..f8339a6 100644 --- a/src/libvirt-snapshot.h +++ b/src/libvirt-snapshot.h @@ -39,7 +39,7 @@ RETURN_FALSE; = \ } while (0) = \ =20 -int le_libvirt_snapshot; +extern int le_libvirt_snapshot; =20 typedef struct _php_libvirt_snapshot { virDomainSnapshotPtr snapshot; diff --git a/src/libvirt-storage.c b/src/libvirt-storage.c index 0c0d943..593d4d2 100644 --- a/src/libvirt-storage.c +++ b/src/libvirt-storage.c @@ -12,6 +12,9 @@ =20 DEBUG_INIT("storage"); =20 +int le_libvirt_storagepool; +int le_libvirt_volume; + void php_libvirt_storagepool_dtor(virt_resource *rsrc TSRMLS_DC) { diff --git a/src/libvirt-storage.h b/src/libvirt-storage.h index de972f7..7620c15 100644 --- a/src/libvirt-storage.h +++ b/src/libvirt-storage.h @@ -83,8 +83,8 @@ RETURN_FALSE; = \ } while (0) = \ =20 -int le_libvirt_storagepool; -int le_libvirt_volume; +extern int le_libvirt_storagepool; +extern int le_libvirt_volume; =20 typedef struct _php_libvirt_storagepool { virStoragePoolPtr pool; diff --git a/src/libvirt-stream.c b/src/libvirt-stream.c index f1fc1ff..11d7752 100644 --- a/src/libvirt-stream.c +++ b/src/libvirt-stream.c @@ -11,6 +11,8 @@ =20 DEBUG_INIT("stream"); =20 +int le_libvirt_stream; + void php_libvirt_stream_dtor(virt_resource *rsrc TSRMLS_DC) { diff --git a/src/libvirt-stream.h b/src/libvirt-stream.h index 89b28a6..c041ccb 100644 --- a/src/libvirt-stream.h +++ b/src/libvirt-stream.h @@ -20,7 +20,7 @@ PHP_FE(libvirt_stream_send, arginfo_libvirt_stream_send) = \ PHP_FE(libvirt_stream_recv, arginfo_libvirt_stream_recv) =20 -int le_libvirt_stream; +extern int le_libvirt_stream; =20 typedef struct _php_libvirt_stream { virStreamPtr stream; --=20 2.26.2 From nobody Mon Apr 29 04:19:46 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 207.211.31.81 as permitted sender) client-ip=207.211.31.81; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 207.211.31.81 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1588614073; cv=none; d=zohomail.com; s=zohoarc; b=HBqQpyI3xa+YepJ8vSoYpLkuUg9dtNJ80kxrSQ1DgXeJkMF9isHCsniJM8Gnuy4wqGN7jkZkTFD2zN/vLVuLrybbRmMTdsNmNQU9+7LLtRS2Qv9T1RhPUFNmRXp5Hy2sH/bzeyV7q+B3yJonm6k5Sfnbr7LyThiC5yDcHScOczY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1588614073; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=vMaJKkHWtJCSmGHKSD6EAgAe0RKlVQx1tnZZR0hQejw=; b=FCf27D6tMtsQTBMX3Cxd+NVsRU/W4gwCnZAZ5yxkTwaPcQXRMqrKw4ogXWeYOs/XJftHmTrv9bHC663ANOE4y70aTPXT7nmFxvlxHKF3tfZOEqGaAtVPoI8GwXNYUCLJnyX36gDd3DlAssZi2NUZEB8sBRVLKFxaxfq32KwCz/o= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 207.211.31.81 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-delivery-1.mimecast.com (us-smtp-2.mimecast.com [207.211.31.81]) by mx.zohomail.com with SMTPS id 1588614073589483.3531818798459; Mon, 4 May 2020 10:41:13 -0700 (PDT) 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-111-7Pf7XWHLMxOBW3ixea4fuQ-1; Mon, 04 May 2020 13:41:09 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 9FD08835B45; Mon, 4 May 2020 17:41:04 +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 7809F5D9D3; Mon, 4 May 2020 17:41:04 +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 35F074E44C; Mon, 4 May 2020 17:41:04 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 044Hew3g016288 for ; Mon, 4 May 2020 13:40:58 -0400 Received: by smtp.corp.redhat.com (Postfix) id 1339A6FDAB; Mon, 4 May 2020 17:40:58 +0000 (UTC) Received: from localhost.localdomain.com (unknown [10.36.110.51]) by smtp.corp.redhat.com (Postfix) with ESMTP id 429A86F133; Mon, 4 May 2020 17:40:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1588614072; 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: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=vMaJKkHWtJCSmGHKSD6EAgAe0RKlVQx1tnZZR0hQejw=; b=M3rH+iOLIr0lBUv+CQ/uwFE40i1Yys2SiD9gqhDkOcSpBQCaAu/735giR4+kXmf5PBjpip NmwS0ikBkpwbFXdsY7D4md/v71cHEKyRq+1IIEj3sc1Asgd4RFEUHs+c3EB95ZI3b1iV6y kgUCPrju5QYp1tKLKDNMlX250s54ftE= X-MC-Unique: 7Pf7XWHLMxOBW3ixea4fuQ-1 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: libvir-list@redhat.com Subject: [libvirt-php 3/6] tests: mark skipped tests with exit status 77 Date: Mon, 4 May 2020 18:40:43 +0100 Message-Id: <20200504174046.763123-4-berrange@redhat.com> In-Reply-To: <20200504174046.763123-1-berrange@redhat.com> References: <20200504174046.763123-1-berrange@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 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.79 on 10.5.11.14 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" Skipped tests should be distinguished from failed tests. Exit code 77 is a standard from autoconf. Signed-off-by: Daniel P. Berrang=C3=A9 Reviewed-by: Michal Privoznik --- tests/functions.phpt.in | 2 +- tests/runtests.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/functions.phpt.in b/tests/functions.phpt.in index 47dba2d..2ec3d79 100644 --- a/tests/functions.phpt.in +++ b/tests/functions.phpt.in @@ -26,7 +26,7 @@ bail("Invalid test name!"); =20 printf("Test $name SKIPPED\n"); - exit(1); + exit(77); } =20 $abs_srcdir =3D '@abs_srcdir@' ?: getcwd(); diff --git a/tests/runtests.sh b/tests/runtests.sh index 8280be7..2674475 100755 --- a/tests/runtests.sh +++ b/tests/runtests.sh @@ -18,7 +18,7 @@ run_test() ret=3D0 =20 php -n -c "${srcdir}/php.ini" "${srcdir}/${name}.phpt" - if [ "x$?" !=3D "x0" ]; then + if [ "x$?" !=3D "x0" && "x$?" !=3D "x77" ]; then if [ "x$nf" =3D=3D 'x1' ]; then ret=3D1 else --=20 2.26.2 From nobody Mon Apr 29 04:19:46 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 ARC-Seal: i=1; a=rsa-sha256; t=1588614073; cv=none; d=zohomail.com; s=zohoarc; b=KwSyPOzuKIxMix/OCdsQyenw4Q4Dd86Z6uczZXLpPPvUzw7WeYO7vdz90ZnW1HN/x1Pdc6mgksMq2rDuJlhM3vHVuLqsukdyNM2sG7QcigGwG+WxHzLbMzWH+dpubOMrXHnTooVWT9xlFF/c7nyiueAfJMrs7iDeRQt2XG029fo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1588614073; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=PGkrIUS8FJD0IKpAhLXZiQmXu8rFBUFD9rW/v3zamYw=; b=mE4r/RRFnNXsLESBV3sIPiHtDsN4Vv+wYm9CrloFRC1q6hyhvYgtMXbs+BxPn/RNYI6dlIKXPKZVPnqaxxgt8adDNhzhoHBRh/4jureTqOzteN5Y49wPcl6tjaHA8AzV8QN4lbRQMmtrJ5ZN8MBxTOYc8PyhtwGJf0hZyszp5lE= ARC-Authentication-Results: i=1; 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 header.from= (p=none dis=none) header.from= 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 1588614073300604.1790299203768; Mon, 4 May 2020 10:41:13 -0700 (PDT) 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-453-exk7nftAOCGmuPR2GtqGYw-1; Mon, 04 May 2020 13:41:09 -0400 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 mimecast-mx01.redhat.com (Postfix) with ESMTPS id 1E2AA107ACF2; Mon, 4 May 2020 17:41:04 +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 EA3056FDAB; Mon, 4 May 2020 17:41:03 +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 A535F1809554; Mon, 4 May 2020 17:41:03 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 044HexRd016303 for ; Mon, 4 May 2020 13:40:59 -0400 Received: by smtp.corp.redhat.com (Postfix) id 95BEF6FDAB; Mon, 4 May 2020 17:40:59 +0000 (UTC) Received: from localhost.localdomain.com (unknown [10.36.110.51]) by smtp.corp.redhat.com (Postfix) with ESMTP id 6932F6F133; Mon, 4 May 2020 17:40:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1588614071; 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: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=PGkrIUS8FJD0IKpAhLXZiQmXu8rFBUFD9rW/v3zamYw=; b=gVKxYGxxfcYzOjJPsTKZD1FD1P/n0m9BxfTMVpIaZkP54pPEHvxlbMN0TVVHtpVfbuVwbt FEUAwMwR9qH8zExpvXfrvoDy5yufiXxsz3EcWunGLFjkoku6R92jbQ8iLjyne53ab8jt33 r9xyWgCASjcanFdziXU0lnCtxOyS/r4= X-MC-Unique: exk7nftAOCGmuPR2GtqGYw-1 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: libvir-list@redhat.com Subject: [libvirt-php 4/6] tests: skip test if not running on host with running libvirtd Date: Mon, 4 May 2020 18:40:44 +0100 Message-Id: <20200504174046.763123-5-berrange@redhat.com> In-Reply-To: <20200504174046.763123-1-berrange@redhat.com> References: <20200504174046.763123-1-berrange@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 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.79 on 10.5.11.13 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" Signed-off-by: Daniel P. Berrang=C3=A9 Reviewed-by: Michal Privoznik --- tests/test-get-models.phpt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/test-get-models.phpt b/tests/test-get-models.phpt index 60af7fa..3ed6ec5 100644 --- a/tests/test-get-models.phpt +++ b/tests/test-get-models.phpt @@ -1,9 +1,9 @@ (p=none dis=none) header.from= Return-Path: Received: from us-smtp-delivery-1.mimecast.com (us-smtp-1.mimecast.com [207.211.31.81]) by mx.zohomail.com with SMTPS id 1588614082509108.84712119918117; Mon, 4 May 2020 10:41:22 -0700 (PDT) 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-451-x_F6e313Mhu5Q0fG827kRA-1; Mon, 04 May 2020 13:41:18 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 8B1D9100CCC5; Mon, 4 May 2020 17:41:07 +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 627CE60E1C; Mon, 4 May 2020 17:41:07 +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 DAD0D1809557; Mon, 4 May 2020 17:41:06 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 044Hf03H016313 for ; Mon, 4 May 2020 13:41:00 -0400 Received: by smtp.corp.redhat.com (Postfix) id E80616FDAB; Mon, 4 May 2020 17:41:00 +0000 (UTC) Received: from localhost.localdomain.com (unknown [10.36.110.51]) by smtp.corp.redhat.com (Postfix) with ESMTP id 0B02F6F133; Mon, 4 May 2020 17:40:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1588614081; 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: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=u/zGrTCM0K5NJncDYc1AJ8m5dRdPMHUXswSvILmctyw=; b=WdMYAXVGGI0J7izco87SU0S1jYyheJYvspc9YiNXBq4e49RquJB7BQEX3l6KOEWpV5nsD1 qnoU08PDa2+2xEaMDO23VPHfxfrNZ+UEw/yocNCtMgQA6IfpCDXxGS5v/Ojo7iRCtG98wr t+9QYNvyuBAUIiRe8DTWNQJNMFxycCI= X-MC-Unique: x_F6e313Mhu5Q0fG827kRA-1 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: libvir-list@redhat.com Subject: [libvirt-php 5/6] gitlab: add CI jobs for validating build across platforms Date: Mon, 4 May 2020 18:40:45 +0100 Message-Id: <20200504174046.763123-6-berrange@redhat.com> In-Reply-To: <20200504174046.763123-1-berrange@redhat.com> References: <20200504174046.763123-1-berrange@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 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.79 on 10.5.11.12 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" This introduces CI jobs that replace the current jobs used on Jenkins for every platform except FreeBSD. A merge request workflow requires the user to fork the primary git repo into their personal namespace. In general the changes need to be tested against the current libvirt git master. If the user has a fork of the main libvirt repo, we don't want to use that by default as it may be out of date. The general goal is that the CI jobs are self-contained and don't depend on the build artifacts from the libvirt repo. We also want to avoid having an explicit dependency on the libvirt-ci repo, or on the Quay.io service. Contributors to the PHP module need to be able to make code changes which imply CI environment changes and be able to test them in isolation. Thus, the dockerfile recipes for each distro are added in the ci/ sub-directory. The first stage of the CI jobs is to use these recipes to build and publish a container image. These images are then used in the second stage to perform the actual build. The container image build is cached, inheriting from both the primary libvirt project namespace, and the user's private project namespace. Thus the performance hit of building container images will only be felt the first time the project is forked, or when the parent Docker images are rebuilt. The dockerfiles were originally generated using lcitool, but if the user makes a change that introduces new build dependencies, the corresponding packages can be added to the dockerfile recipes directly in the same commit. The change can be propagated back into the libvirt-ci.git repo asynchronously. The build job will do a minimal(-ish) build of libvirt git master and then build the rest of the code against that. Ideally the main libvirt configure script would have a way to request a minimal build of just the API and test driver, but for now we settle for just --without-libvirt which culls a large number of the drivers fairly easily. The CentOS-8 distro is skipped as it dropped the required PHP module. Signed-off-by: Daniel P. Berrang=C3=A9 Reviewed-by: Michal Privoznik --- .gitlab-ci.yml | 146 +++++++++++++++++++++++++++ ci/README.rst | 12 +++ ci/libvirt-centos-7.Dockerfile | 92 +++++++++++++++++ ci/libvirt-debian-10.Dockerfile | 64 ++++++++++++ ci/libvirt-debian-9.Dockerfile | 67 ++++++++++++ ci/libvirt-debian-sid.Dockerfile | 64 ++++++++++++ ci/libvirt-fedora-31.Dockerfile | 60 +++++++++++ ci/libvirt-fedora-32.Dockerfile | 60 +++++++++++ ci/libvirt-fedora-rawhide.Dockerfile | 61 +++++++++++ ci/libvirt-opensuse-151.Dockerfile | 62 ++++++++++++ ci/libvirt-ubuntu-1804.Dockerfile | 67 ++++++++++++ ci/libvirt-ubuntu-2004.Dockerfile | 64 ++++++++++++ ci/refresh | 22 ++++ 13 files changed, 841 insertions(+) create mode 100644 ci/README.rst create mode 100644 ci/libvirt-centos-7.Dockerfile create mode 100644 ci/libvirt-debian-10.Dockerfile create mode 100644 ci/libvirt-debian-9.Dockerfile create mode 100644 ci/libvirt-debian-sid.Dockerfile create mode 100644 ci/libvirt-fedora-31.Dockerfile create mode 100644 ci/libvirt-fedora-32.Dockerfile create mode 100644 ci/libvirt-fedora-rawhide.Dockerfile create mode 100644 ci/libvirt-opensuse-151.Dockerfile create mode 100644 ci/libvirt-ubuntu-1804.Dockerfile create mode 100644 ci/libvirt-ubuntu-2004.Dockerfile create mode 100755 ci/refresh diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 50dae92..a8fb4f9 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,6 +1,51 @@ =20 stages: - prebuild + - containers + - builds + +.container_job_template: &container_job_definition + image: docker:stable + stage: containers + services: + - docker:dind + before_script: + - export TAG=3D"$CI_REGISTRY_IMAGE/ci-$NAME:latest" + - export COMMON_TAG=3D"$CI_REGISTRY/libvirt/libvirt-php/ci-$NAME:lates= t" + - docker info + - docker login registry.gitlab.com -u "$CI_REGISTRY_USER" -p "$CI_REGI= STRY_PASSWORD" + script: + - docker pull "$TAG" || docker pull "$COMMON_TAG" || true + - docker build --cache-from "$TAG" --cache-from "$COMMON_TAG" --tag "$= TAG" -f "ci/libvirt-$NAME.Dockerfile" ci + - docker push "$TAG" + after_script: + - docker logout + +.git_build_job_template: &git_build_job_definition + image: $CI_REGISTRY_IMAGE/ci-$NAME:latest + stage: builds + before_script: + - export MAKEFLAGS=3D"-j$(getconf _NPROCESSORS_ONLN)" + - export SCRATCH_DIR=3D"/tmp/scratch" + - export VROOT=3D"$SCRATCH_DIR/vroot" + - export LD_LIBRARY_PATH=3D"$VROOT/lib" + - export PATH=3D"$VROOT/bin:$PATH" + - export PKG_CONFIG_PATH=3D"$VROOT/lib/pkgconfig" + - export TEST_MAINTAINER=3D1 + script: + - pushd "$PWD" + - mkdir -p "$SCRATCH_DIR" + - cd "$SCRATCH_DIR" + - git clone --depth 1 https://gitlab.com/libvirt/libvirt.git + - mkdir libvirt/build + - cd libvirt/build + - ../autogen.sh --prefix=3D"$VROOT" --without-libvirtd + - $MAKE install + - popd + - ./autogen.sh + - make distcheck + after_script: + - find -name test-suite.log | xargs cat =20 # Check that all commits are signed-off for the DCO. # Skip on "libvirt" namespace, since we only need to run @@ -14,3 +59,104 @@ check-dco: except: variables: - $CI_PROJECT_NAMESPACE =3D=3D 'libvirt' + +centos-7-container: + <<: *container_job_definition + variables: + NAME: centos-7 + +debian-9-container: + <<: *container_job_definition + variables: + NAME: debian-9 + +debian-10-container: + <<: *container_job_definition + variables: + NAME: debian-10 + +debian-sid-container: + <<: *container_job_definition + variables: + NAME: debian-sid + +fedora-31-container: + <<: *container_job_definition + variables: + NAME: fedora-31 + +fedora-32-container: + <<: *container_job_definition + variables: + NAME: fedora-32 + +fedora-rawhide-container: + <<: *container_job_definition + variables: + NAME: fedora-rawhide + +opensuse-151-container: + <<: *container_job_definition + variables: + NAME: opensuse-151 + +ubuntu-1804-container: + <<: *container_job_definition + variables: + NAME: ubuntu-1804 + +ubuntu-2004-container: + <<: *container_job_definition + variables: + NAME: ubuntu-2004 + + +centos-7-git-build: + <<: *git_build_job_definition + variables: + NAME: centos-7 + +debian-9-git-build: + <<: *git_build_job_definition + variables: + NAME: debian-9 + +debian-10-git-build: + <<: *git_build_job_definition + variables: + NAME: debian-10 + +debian-sid-git-build: + <<: *git_build_job_definition + variables: + NAME: debian-sid + +fedora-31-git-build: + <<: *git_build_job_definition + variables: + NAME: fedora-31 + +fedora-32-git-build: + <<: *git_build_job_definition + variables: + NAME: fedora-32 + +fedora-rawhide-git-build: + <<: *git_build_job_definition + variables: + NAME: fedora-rawhide + +opensuse-151-git-build: + <<: *git_build_job_definition + variables: + NAME: opensuse-151 + +ubuntu-1804-git-build: + <<: *git_build_job_definition + variables: + NAME: ubuntu-1804 + +ubuntu-2004-git-build: + <<: *git_build_job_definition + variables: + NAME: ubuntu-2004 diff --git a/ci/README.rst b/ci/README.rst new file mode 100644 index 0000000..fef7a95 --- /dev/null +++ b/ci/README.rst @@ -0,0 +1,12 @@ +CI job assets +=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D + +This directory contains assets used in the automated CI jobs, most +notably the Dockerfiles used to build container images in which the +CI jobs then run. + +The `refresh` script is used to re-create the Dockerfiles using the +`lcitool` that is provided by repo `https://gitlab.com/libvirt/libvirt-ci` +The containers are built during the CI process and cached in the GitLab +container registry of the project doing the build. The cached containers +can be deleted at any time and will be correctly rebuilt. diff --git a/ci/libvirt-centos-7.Dockerfile b/ci/libvirt-centos-7.Dockerfile new file mode 100644 index 0000000..c403fb3 --- /dev/null +++ b/ci/libvirt-centos-7.Dockerfile @@ -0,0 +1,92 @@ +FROM centos:7 + +RUN echo -e '[openvz]\n\ +name=3DOpenVZ addons\n\ +baseurl=3Dhttps://download.openvz.org/virtuozzo/releases/openvz-7.0.11-235= /x86_64/os/\n\ +enabled=3D1\n\ +gpgcheck=3D1\n\ +skip_if_unavailable=3D0\n\ +metadata_expire=3D6h\n\ +priority=3D90\n\ +includepkgs=3Dlibprl*' > /etc/yum.repos.d/openvz.repo && \ + echo -e '-----BEGIN PGP PUBLIC KEY BLOCK-----\n\ +Version: GnuPG v2.0.22 (GNU/Linux)\n\ +\n\ +mI0EVl80nQEEAKrEeyeTCwrzS9kYedZ/sAc/GUqlb81C7pA9SaR3fyck5mVw1Ogk\n\ +YdmNBPM2kY7QDxR9F0EpSpnxSCAXZXugsQ8KzZ0DRLVeBDQyGs9IGK5hI0zzxIil\n\ +BzfvIexLiQQhLy7YlIi8Jt/uUqKkW0pIMNMGcduY97VATtczpncpkmSzABEBAAG0\n\ +SFZpcnR1b3p6byBUZWFtIChHUEcga2V5IHNpZ25hdHVyZSBmb3IgcGFja2FnZXMp\n\ +IDxzZWN1cml0eUB2aXJ0dW96em8uY29tPoi5BBMBAgAjBQJWXzSdAhsDBwsJCAcD\n\ +AgEGFQgCCQoLBBYCAwECHgECF4AACgkQygt9GUTNrSruIgP/er70Eyo73A1gfrjv\n\ +oPUkyo4rslVRZu3qqCwoMFtJc/Z/UxWgEka1buorlcGLa6eO/EZ49c0n+KGa4Kvt\n\ +EUboIq0yEu5i0FyAj92ifm+hNhoAbGfm0cZ4/fD0oGr3l8OsQo4+iHX4xAPwFe7Y\n\ +zABuB8I1ZDZ4OIp5tDfTTuF2LT24jQRWXzSdAQQAog2Aqb+Ptl68O7cQhWLjVGkj\n\ +yyigZrdeReLx3HloKJPBeQ/kA6uvMJc/IYS3uppMWXv9v+QenS6uhP1TUJ2k9FvM\n\ +t94MQZfALN7Vpf8AF+UeWu4Ru+y4BNzcFhrPhIFNFChOR2QqW6FkgE57D9I177NC\n\ +oJMyrlNe8wcGa178An8AEQEAAYifBBgBAgAJBQJWXzSdAhsMAAoJEMoLfRlEza0q\n\ +bKwD/3+OFVIEXnIv5XgdGRNX5fHggsUN1bb8gva7HANRlKdd4LD8foDM3F/yv/3V\n\ +igG14D5EjKz56SaBDNgiI4++hOzb2M8jhAsR86jxkXFrrP1U3ZNRKg6av9DPFAPS\n\ +WEiJKtQrZDJloqtyi/mmRa1VsV7RYR0VPJjhK/R8EQ7Ysshy\n\ +=3DfRMg\n\ +-----END PGP PUBLIC KEY BLOCK-----' > /etc/pki/rpm-gpg/RPM-GPG-KEY-OpenVZ = && \ + rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-OpenVZ && \ + yum install -y epel-release && \ + yum update -y && \ + yum install -y \ + autoconf \ + automake \ + bash \ + bash-completion \ + ca-certificates \ + ccache \ + chrony \ + gcc \ + gdb \ + gettext \ + gettext-devel \ + git \ + glib2-devel \ + glibc-common \ + glibc-devel \ + gnutls-devel \ + libnl3-devel \ + libtirpc-devel \ + libtool \ + libxml2 \ + libxml2-devel \ + libxslt \ + lsof \ + make \ + net-tools \ + ninja-build \ + patch \ + perl \ + php-devel \ + php-pecl-imagick \ + pkgconfig \ + python3 \ + python3-pip \ + python3-setuptools \ + python3-wheel \ + python36-docutils \ + rpm-build \ + screen \ + strace \ + sudo \ + vim && \ + yum autoremove -y && \ + yum clean all -y && \ + mkdir -p /usr/libexec/ccache-wrappers && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/cc && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/$(basename /usr/bin= /gcc) + +RUN pip3 install \ + meson=3D=3D0.49.0 + +ENV LANG "en_US.UTF-8" + +ENV MAKE "/usr/bin/make" +ENV NINJA "/usr/bin/ninja-build" +ENV PYTHON "/usr/bin/python3" + +ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" diff --git a/ci/libvirt-debian-10.Dockerfile b/ci/libvirt-debian-10.Dockerf= ile new file mode 100644 index 0000000..a2dea62 --- /dev/null +++ b/ci/libvirt-debian-10.Dockerfile @@ -0,0 +1,64 @@ +FROM debian:10 + +RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ + apt-get update && \ + apt-get dist-upgrade -y && \ + apt-get install --no-install-recommends -y \ + autoconf \ + automake \ + autopoint \ + bash \ + bash-completion \ + ca-certificates \ + ccache \ + chrony \ + gcc \ + gdb \ + gettext \ + git \ + libc-dev-bin \ + libc6-dev \ + libglib2.0-dev \ + libgnutls28-dev \ + libnl-3-dev \ + libnl-route-3-dev \ + libtirpc-dev \ + libtool \ + libtool-bin \ + libxml2-dev \ + libxml2-utils \ + locales \ + lsof \ + make \ + meson \ + net-tools \ + ninja-build \ + patch \ + perl \ + php-dev \ + php-imagick \ + pkgconf \ + python3 \ + python3-docutils \ + python3-setuptools \ + python3-wheel \ + screen \ + strace \ + sudo \ + vim \ + xsltproc && \ + apt-get autoremove -y && \ + apt-get autoclean -y && \ + sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \ + dpkg-reconfigure locales && \ + mkdir -p /usr/libexec/ccache-wrappers && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/cc && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/$(basename /usr/bin= /gcc) + +ENV LANG "en_US.UTF-8" + +ENV MAKE "/usr/bin/make" +ENV NINJA "/usr/bin/ninja" +ENV PYTHON "/usr/bin/python3" + +ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" diff --git a/ci/libvirt-debian-9.Dockerfile b/ci/libvirt-debian-9.Dockerfile new file mode 100644 index 0000000..c92f733 --- /dev/null +++ b/ci/libvirt-debian-9.Dockerfile @@ -0,0 +1,67 @@ +FROM debian:9 + +RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ + apt-get update && \ + apt-get dist-upgrade -y && \ + apt-get install --no-install-recommends -y \ + autoconf \ + automake \ + autopoint \ + bash \ + bash-completion \ + ca-certificates \ + ccache \ + chrony \ + gcc \ + gdb \ + gettext \ + git \ + libc-dev-bin \ + libc6-dev \ + libglib2.0-dev \ + libgnutls28-dev \ + libnl-3-dev \ + libnl-route-3-dev \ + libtirpc-dev \ + libtool \ + libtool-bin \ + libxml2-dev \ + libxml2-utils \ + locales \ + lsof \ + make \ + net-tools \ + ninja-build \ + patch \ + perl \ + php-dev \ + php-imagick \ + pkgconf \ + python3 \ + python3-docutils \ + python3-pip \ + python3-setuptools \ + python3-wheel \ + screen \ + strace \ + sudo \ + vim \ + xsltproc && \ + apt-get autoremove -y && \ + apt-get autoclean -y && \ + sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \ + dpkg-reconfigure locales && \ + mkdir -p /usr/libexec/ccache-wrappers && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/cc && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/$(basename /usr/bin= /gcc) + +RUN pip3 install \ + meson=3D=3D0.49.0 + +ENV LANG "en_US.UTF-8" + +ENV MAKE "/usr/bin/make" +ENV NINJA "/usr/bin/ninja" +ENV PYTHON "/usr/bin/python3" + +ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" diff --git a/ci/libvirt-debian-sid.Dockerfile b/ci/libvirt-debian-sid.Docke= rfile new file mode 100644 index 0000000..eddd9c1 --- /dev/null +++ b/ci/libvirt-debian-sid.Dockerfile @@ -0,0 +1,64 @@ +FROM debian:sid + +RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ + apt-get update && \ + apt-get dist-upgrade -y && \ + apt-get install --no-install-recommends -y \ + autoconf \ + automake \ + autopoint \ + bash \ + bash-completion \ + ca-certificates \ + ccache \ + chrony \ + gcc \ + gdb \ + gettext \ + git \ + libc-dev-bin \ + libc6-dev \ + libglib2.0-dev \ + libgnutls28-dev \ + libnl-3-dev \ + libnl-route-3-dev \ + libtirpc-dev \ + libtool \ + libtool-bin \ + libxml2-dev \ + libxml2-utils \ + locales \ + lsof \ + make \ + meson \ + net-tools \ + ninja-build \ + patch \ + perl \ + php-dev \ + php-imagick \ + pkgconf \ + python3 \ + python3-docutils \ + python3-setuptools \ + python3-wheel \ + screen \ + strace \ + sudo \ + vim \ + xsltproc && \ + apt-get autoremove -y && \ + apt-get autoclean -y && \ + sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \ + dpkg-reconfigure locales && \ + mkdir -p /usr/libexec/ccache-wrappers && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/cc && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/$(basename /usr/bin= /gcc) + +ENV LANG "en_US.UTF-8" + +ENV MAKE "/usr/bin/make" +ENV NINJA "/usr/bin/ninja" +ENV PYTHON "/usr/bin/python3" + +ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" diff --git a/ci/libvirt-fedora-31.Dockerfile b/ci/libvirt-fedora-31.Dockerf= ile new file mode 100644 index 0000000..d0d55b1 --- /dev/null +++ b/ci/libvirt-fedora-31.Dockerfile @@ -0,0 +1,60 @@ +FROM fedora:31 + +RUN dnf update -y && \ + dnf install -y \ + autoconf \ + automake \ + bash \ + bash-completion \ + ca-certificates \ + ccache \ + chrony \ + cppi \ + gcc \ + gdb \ + gettext \ + gettext-devel \ + git \ + glib2-devel \ + glibc-devel \ + glibc-langpack-en \ + gnutls-devel \ + libnl3-devel \ + libtirpc-devel \ + libtool \ + libxml2 \ + libxml2-devel \ + libxslt \ + lsof \ + make \ + meson \ + net-tools \ + ninja-build \ + patch \ + perl \ + php-devel \ + php-pecl-imagick \ + pkgconfig \ + python3 \ + python3-docutils \ + python3-setuptools \ + python3-wheel \ + rpcgen \ + rpm-build \ + screen \ + strace \ + sudo \ + vim && \ + dnf autoremove -y && \ + dnf clean all -y && \ + mkdir -p /usr/libexec/ccache-wrappers && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/cc && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/$(basename /usr/bin= /gcc) + +ENV LANG "en_US.UTF-8" + +ENV MAKE "/usr/bin/make" +ENV NINJA "/usr/bin/ninja" +ENV PYTHON "/usr/bin/python3" + +ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" diff --git a/ci/libvirt-fedora-32.Dockerfile b/ci/libvirt-fedora-32.Dockerf= ile new file mode 100644 index 0000000..66719ae --- /dev/null +++ b/ci/libvirt-fedora-32.Dockerfile @@ -0,0 +1,60 @@ +FROM fedora:32 + +RUN dnf update -y && \ + dnf install -y \ + autoconf \ + automake \ + bash \ + bash-completion \ + ca-certificates \ + ccache \ + chrony \ + cppi \ + gcc \ + gdb \ + gettext \ + gettext-devel \ + git \ + glib2-devel \ + glibc-devel \ + glibc-langpack-en \ + gnutls-devel \ + libnl3-devel \ + libtirpc-devel \ + libtool \ + libxml2 \ + libxml2-devel \ + libxslt \ + lsof \ + make \ + meson \ + net-tools \ + ninja-build \ + patch \ + perl \ + php-devel \ + php-pecl-imagick \ + pkgconfig \ + python3 \ + python3-docutils \ + python3-setuptools \ + python3-wheel \ + rpcgen \ + rpm-build \ + screen \ + strace \ + sudo \ + vim && \ + dnf autoremove -y && \ + dnf clean all -y && \ + mkdir -p /usr/libexec/ccache-wrappers && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/cc && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/$(basename /usr/bin= /gcc) + +ENV LANG "en_US.UTF-8" + +ENV MAKE "/usr/bin/make" +ENV NINJA "/usr/bin/ninja" +ENV PYTHON "/usr/bin/python3" + +ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" diff --git a/ci/libvirt-fedora-rawhide.Dockerfile b/ci/libvirt-fedora-rawhi= de.Dockerfile new file mode 100644 index 0000000..372ffa7 --- /dev/null +++ b/ci/libvirt-fedora-rawhide.Dockerfile @@ -0,0 +1,61 @@ +FROM fedora:rawhide + +RUN dnf update -y --nogpgcheck fedora-gpg-keys && \ + dnf update -y && \ + dnf install -y \ + autoconf \ + automake \ + bash \ + bash-completion \ + ca-certificates \ + ccache \ + chrony \ + cppi \ + gcc \ + gdb \ + gettext \ + gettext-devel \ + git \ + glib2-devel \ + glibc-devel \ + glibc-langpack-en \ + gnutls-devel \ + libnl3-devel \ + libtirpc-devel \ + libtool \ + libxml2 \ + libxml2-devel \ + libxslt \ + lsof \ + make \ + meson \ + net-tools \ + ninja-build \ + patch \ + perl \ + php-devel \ + php-pecl-imagick \ + pkgconfig \ + python3 \ + python3-docutils \ + python3-setuptools \ + python3-wheel \ + rpcgen \ + rpm-build \ + screen \ + strace \ + sudo \ + vim && \ + dnf autoremove -y && \ + dnf clean all -y && \ + mkdir -p /usr/libexec/ccache-wrappers && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/cc && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/$(basename /usr/bin= /gcc) + +ENV LANG "en_US.UTF-8" + +ENV MAKE "/usr/bin/make" +ENV NINJA "/usr/bin/ninja" +ENV PYTHON "/usr/bin/python3" + +ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" diff --git a/ci/libvirt-opensuse-151.Dockerfile b/ci/libvirt-opensuse-151.D= ockerfile new file mode 100644 index 0000000..720978c --- /dev/null +++ b/ci/libvirt-opensuse-151.Dockerfile @@ -0,0 +1,62 @@ +FROM opensuse/leap:15.1 + +RUN zypper update -y && \ + zypper install -y \ + autoconf \ + automake \ + bash \ + bash-completion \ + ca-certificates \ + ccache \ + chrony \ + cppi \ + gcc \ + gdb \ + gettext \ + gettext-devel \ + git \ + glib2-devel \ + glibc-devel \ + glibc-locale \ + libgnutls-devel \ + libnl3-devel \ + libtirpc-devel \ + libtool \ + libxml2 \ + libxml2-devel \ + libxslt \ + lsof \ + make \ + net-tools \ + ninja \ + patch \ + perl \ + php-devel \ + php-imagick \ + pkgconfig \ + python3 \ + python3-docutils \ + python3-pip \ + python3-setuptools \ + python3-wheel \ + rpcgen \ + rpm-build \ + screen \ + strace \ + sudo \ + vim && \ + zypper clean --all && \ + mkdir -p /usr/libexec/ccache-wrappers && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/cc && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/$(basename /usr/bin= /gcc) + +RUN pip3 install \ + meson=3D=3D0.49.0 + +ENV LANG "en_US.UTF-8" + +ENV MAKE "/usr/bin/make" +ENV NINJA "/usr/bin/ninja" +ENV PYTHON "/usr/bin/python3" + +ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" diff --git a/ci/libvirt-ubuntu-1804.Dockerfile b/ci/libvirt-ubuntu-1804.Doc= kerfile new file mode 100644 index 0000000..5c5c147 --- /dev/null +++ b/ci/libvirt-ubuntu-1804.Dockerfile @@ -0,0 +1,67 @@ +FROM ubuntu:18.04 + +RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ + apt-get update && \ + apt-get dist-upgrade -y && \ + apt-get install --no-install-recommends -y \ + autoconf \ + automake \ + autopoint \ + bash \ + bash-completion \ + ca-certificates \ + ccache \ + chrony \ + gcc \ + gdb \ + gettext \ + git \ + libc-dev-bin \ + libc6-dev \ + libglib2.0-dev \ + libgnutls28-dev \ + libnl-3-dev \ + libnl-route-3-dev \ + libtirpc-dev \ + libtool \ + libtool-bin \ + libxml2-dev \ + libxml2-utils \ + locales \ + lsof \ + make \ + net-tools \ + ninja-build \ + patch \ + perl \ + php-dev \ + php-imagick \ + pkgconf \ + python3 \ + python3-docutils \ + python3-pip \ + python3-setuptools \ + python3-wheel \ + screen \ + strace \ + sudo \ + vim \ + xsltproc && \ + apt-get autoremove -y && \ + apt-get autoclean -y && \ + sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \ + dpkg-reconfigure locales && \ + mkdir -p /usr/libexec/ccache-wrappers && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/cc && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/$(basename /usr/bin= /gcc) + +RUN pip3 install \ + meson=3D=3D0.49.0 + +ENV LANG "en_US.UTF-8" + +ENV MAKE "/usr/bin/make" +ENV NINJA "/usr/bin/ninja" +ENV PYTHON "/usr/bin/python3" + +ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" diff --git a/ci/libvirt-ubuntu-2004.Dockerfile b/ci/libvirt-ubuntu-2004.Doc= kerfile new file mode 100644 index 0000000..0148720 --- /dev/null +++ b/ci/libvirt-ubuntu-2004.Dockerfile @@ -0,0 +1,64 @@ +FROM ubuntu:20.04 + +RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ + apt-get update && \ + apt-get dist-upgrade -y && \ + apt-get install --no-install-recommends -y \ + autoconf \ + automake \ + autopoint \ + bash \ + bash-completion \ + ca-certificates \ + ccache \ + chrony \ + gcc \ + gdb \ + gettext \ + git \ + libc-dev-bin \ + libc6-dev \ + libglib2.0-dev \ + libgnutls28-dev \ + libnl-3-dev \ + libnl-route-3-dev \ + libtirpc-dev \ + libtool \ + libtool-bin \ + libxml2-dev \ + libxml2-utils \ + locales \ + lsof \ + make \ + meson \ + net-tools \ + ninja-build \ + patch \ + perl \ + php-dev \ + php-imagick \ + pkgconf \ + python3 \ + python3-docutils \ + python3-setuptools \ + python3-wheel \ + screen \ + strace \ + sudo \ + vim \ + xsltproc && \ + apt-get autoremove -y && \ + apt-get autoclean -y && \ + sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \ + dpkg-reconfigure locales && \ + mkdir -p /usr/libexec/ccache-wrappers && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/cc && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/$(basename /usr/bin= /gcc) + +ENV LANG "en_US.UTF-8" + +ENV MAKE "/usr/bin/make" +ENV NINJA "/usr/bin/ninja" +ENV PYTHON "/usr/bin/python3" + +ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" diff --git a/ci/refresh b/ci/refresh new file mode 100755 index 0000000..fbeb80e --- /dev/null +++ b/ci/refresh @@ -0,0 +1,22 @@ +#!/bin/sh + +if test -z "$1" +then + echo "syntax: $0 PATH-TO-LCITOOL" + exit 1 +fi + +LCITOOL=3D$1 + +if ! test -x "$LCITOOL" +then + echo "$LCITOOL is not executable" + exit 1 +fi + +HOSTS=3D$($LCITOOL hosts | grep -v freebsd | grep -v libvirt-centos-8) + +for host in $HOSTS +do + $LCITOOL dockerfile $host libvirt+minimal,libvirt-php > $host.Dockerfi= le +done --=20 2.26.2 From nobody Mon Apr 29 04:19:46 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 205.139.110.120 as permitted sender) client-ip=205.139.110.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 205.139.110.120 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1588614082; cv=none; d=zohomail.com; s=zohoarc; b=IX5nylWZTVWGj6AHoCfBXRuZMI+6FATm7OZDsYQ4x730AnaTSQIt0hUToxhB5CFHv6aBF4j6csdR6LVD4wggnRglFHVRjD8n34m7NMekmu6ltNlk5hdtwB6h03zMzmv2857VU4nt+dheDj0TrpKrFCEEotDthyzlcKaQ/5BqZXY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1588614082; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=ooF2g+1Po6T1wcyoozUrbsD/y63yadb34wqDeRud190=; b=U0dpzpFqv5TN4NnebREO+w4CLeQqhy85/z4/8bgSBVDNWK0xGjnQ0AMERVfiJOlfORFLCmTPd5PixtqknPABVGDQqVBPvxNc0mpNguJZeb8GKI9NOX1V3RxYwtYX2wu2M4VpdgbXGILlV8b0hflvcdH1H2u4akgjjIFr3RYVm68= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.120 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [205.139.110.120]) by mx.zohomail.com with SMTPS id 1588614082752705.3146969776793; Mon, 4 May 2020 10:41:22 -0700 (PDT) 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-342-LWnBtZI9PlKvooF1vbcp7w-1; Mon, 04 May 2020 13:41:18 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 8939C461; Mon, 4 May 2020 17:41:13 +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 607F060E1C; Mon, 4 May 2020 17:41:13 +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 213224E565; Mon, 4 May 2020 17:41:13 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 044Hf2CG016331 for ; Mon, 4 May 2020 13:41:02 -0400 Received: by smtp.corp.redhat.com (Postfix) id 36B806FDAB; Mon, 4 May 2020 17:41:02 +0000 (UTC) Received: from localhost.localdomain.com (unknown [10.36.110.51]) by smtp.corp.redhat.com (Postfix) with ESMTP id 454E46F133; Mon, 4 May 2020 17:41:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1588614081; 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: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=ooF2g+1Po6T1wcyoozUrbsD/y63yadb34wqDeRud190=; b=KCculoOlhdDtFW0hW8kTIcsgYqSKfNp+AKH1guGnLQa4T+e62THOpaqhc2/bHbxNf24jfz sBuELhsAYbyD5eloUPAFQyfRkZGFIIhKvU9S6c0MNe2b3qwoK+dS+rMF2cRagVRcAiK/DY 0LcQhr1Urw8FKqrnmZUOrPSy6hn9ruY= X-MC-Unique: LWnBtZI9PlKvooF1vbcp7w-1 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: libvir-list@redhat.com Subject: [libvirt-php 6/6] gitlab: add CONTRIBUTING.rst file to indicate use of merge requests Date: Mon, 4 May 2020 18:40:46 +0100 Message-Id: <20200504174046.763123-7-berrange@redhat.com> In-Reply-To: <20200504174046.763123-1-berrange@redhat.com> References: <20200504174046.763123-1-berrange@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 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.79 on 10.5.11.12 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" With the introduction of automated CI pipelines, we are now ready to switch to using merge requests for the project. With this switch we longer wish to have patches sent to the mailing list, and thus the git-publish config is removed. Signed-off-by: Daniel P. Berrang=C3=A9 Reviewed-by: Michal Privoznik --- .gitpublish | 4 ---- CONTRIBUTING.rst | 28 ++++++++++++++++++++++++++++ 2 files changed, 28 insertions(+), 4 deletions(-) delete mode 100644 .gitpublish create mode 100644 CONTRIBUTING.rst diff --git a/.gitpublish b/.gitpublish deleted file mode 100644 index 2aa35a2..0000000 --- a/.gitpublish +++ /dev/null @@ -1,4 +0,0 @@ -[gitpublishprofile "default"] -base =3D master -to =3D libvir-list@redhat.com -prefix =3D libvirt-php PATCH diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst new file mode 100644 index 0000000..5bf29a6 --- /dev/null +++ b/CONTRIBUTING.rst @@ -0,0 +1,28 @@ +=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D +Contributing to libvirt-php +=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D + +The libvirt PHP API binding accepts code contributions via merge requests +on the GitLab project: + +https://gitlab.com/libvirt/libvirt-php/-/merge_requests + +It is required that automated CI pipelines succeed before a merge request +will be accepted. The global pipeline status for the ``master`` branch is +visible at: + +https://gitlab.com/libvirt/libvirt-php/pipelines + +CI pipeline results for merge requests will be visible via the contributor= s' +own private repository fork: + +https://gitlab.com/yourusername/libvirt-php/pipelines + +Contributions submitted to the project must be in compliance with the +Developer Certificate of Origin Version 1.1. This is documented at: + +https://developercertificate.org/ + +To indicate compliance, each commit in a series must have a "Signed-off-by" +tag with the submitter's name and email address. This can be added by pass= ing +the ``-s`` flag to ``git commit`` when creating the patches. --=20 2.26.2