From nobody Tue May 7 22:46:50 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 63.128.21.74 as permitted sender) client-ip=63.128.21.74; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-74.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.74 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=1585329381; cv=none; d=zohomail.com; s=zohoarc; b=OONpdXdA7rO0gg0hiIWjqdK6SAMD3J0SMB65CDfMqdrYg+lJ6Tz5NfkVbTzZsQrv/fBr2K9aAId/kMQSEJE6Dfj2OyhW4ywpiuLx0SUOt97jqSdFIP4dP9bc4Jcml5jHP9djRzCBuziBUfaoEVzFEYbgFsoBAI5xpS10yWLAXqo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1585329381; 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=y9VFuYhKgcY7HPYGcGL+Vw472LiVqBM5MKsXxkn0ng0=; b=PyPQgtA05AAWJ9E5LAW1DjwgmODklBjHtsp32e5v+pcMdQi/q5b7aF2Vc+KmiBAgnoxANClKoLuYnu7gKjmWexXX5PpRjIEcFMgq9cYzDUsUfTY+7xg/aFCOPKFxXbIQRSwl1SKHIC6DseF8PQImhG5z6N/tAKmmxEF1O5HFbgw= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.74 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-74.mimecast.com (us-smtp-delivery-74.mimecast.com [63.128.21.74]) by mx.zohomail.com with SMTPS id 1585329381876656.6723253347959; Fri, 27 Mar 2020 10:16:21 -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-190-JEezrzitNWCSi4eT36biQQ-1; Fri, 27 Mar 2020 13:16:17 -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 33B83800D5F; Fri, 27 Mar 2020 17:16:12 +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 D31E560BF3; Fri, 27 Mar 2020 17:16:11 +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 8AD0518089CF; Fri, 27 Mar 2020 17:16:11 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 02RHG9Vk014839 for ; Fri, 27 Mar 2020 13:16:09 -0400 Received: by smtp.corp.redhat.com (Postfix) id 87F4ECDBD9; Fri, 27 Mar 2020 17:16:09 +0000 (UTC) Received: from kinshicho.usersys.redhat.com (unknown [10.40.195.82]) by smtp.corp.redhat.com (Postfix) with ESMTPS id B6FC7CDBD2 for ; Fri, 27 Mar 2020 17:16:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1585329380; 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=y9VFuYhKgcY7HPYGcGL+Vw472LiVqBM5MKsXxkn0ng0=; b=Yd5OnWryBeNDogleOUhLqt7EAJ+KvBfxRbRbsuY2gnvC861DoMKFq0jeXBtdtZpa7Zz+rz xeYKSnB2kYLoy9ihx/h6mXB7HaTQ+3KkFtfFCvyb5w+FLHRgW1QiJvsemGicQLkxtqtrg9 ua5jNl3SSLk1zW6sFXDOereKR2pfrxU= X-MC-Unique: JEezrzitNWCSi4eT36biQQ-1 From: Andrea Bolognani To: libvir-list@redhat.com Subject: [libvirt PATCH 1/2] gitlab: Add and use 'environment' template Date: Fri, 27 Mar 2020 18:15:58 +0100 Message-Id: <20200327171559.1109515-2-abologna@redhat.com> In-Reply-To: <20200327171559.1109515-1-abologna@redhat.com> References: <20200327171559.1109515-1-abologna@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 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 template provides a standardized place where environment variables, which might not be static but depend on the output of some shell command, can be defined for later use. It's not very interesting right now, but we'll put it to good use in a second. This pattern is already used in libosinfo's GitLab CI integration. Signed-off-by: Andrea Bolognani --- .gitlab-ci.yml | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 1e3675ace0..eeeff7ed48 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,5 +1,4 @@ variables: - MAKE: make GIT_DEPTH: 100 =20 stages: @@ -7,6 +6,8 @@ stages: - native_build - cross_build =20 +.environment: &environment | + export MAKE=3D"make" =20 # Common templates =20 @@ -18,6 +19,7 @@ stages: - ccache/ key: "$CI_JOB_NAME" before_script: + - *environment - mkdir -p ccache - export CC=3D"ccache gcc" - export CCACHE_BASEDIR=3D${PWD} @@ -45,6 +47,7 @@ stages: - ccache/ key: "$CI_JOB_NAME" before_script: + - *environment - mkdir -p ccache - export CC=3D"ccache ${ABI}-gcc" - export CCACHE_BASEDIR=3D${PWD} @@ -163,6 +166,8 @@ mingw64-fedora-30: # https://gitlab.com/libvirt/libvirt/-/jobs/artifacts/master/download?j= ob=3Dwebsite website: stage: prebuild + before_script: + - *environment script: - mkdir build - cd build @@ -183,6 +188,8 @@ website: =20 codestyle: stage: prebuild + before_script: + - *environment script: - mkdir build - cd build @@ -198,6 +205,8 @@ potfile: stage: prebuild only: - master + before_script: + - *environment script: - mkdir build - cd build @@ -222,6 +231,8 @@ potfile: dco: stage: prebuild image: quay.io/libvirt/buildenv-libvirt-fedora-31:latest + before_script: + - *environment script: - ./scripts/require-dco.py only: --=20 2.25.1 From nobody Tue May 7 22:46:50 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.74 as permitted sender) client-ip=216.205.24.74; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-74.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.74 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=1585329423; cv=none; d=zohomail.com; s=zohoarc; b=OgBFhMIhAMY3h9lRvn0E87Axo/xIvbzHQBaQ4obv/4WTKukpDSqVLhndA4l0x7e/yDnvvZxVQA2bWuIR9aCHYwn8Q9GLM3G1I+6icPCi1Nml2S61PfP4Zysl3NR7iH+dTWXp15YYBaws3jmpAD7+5+nP5Ay7I/X1xbDFu7snpgs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1585329423; 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=fy3d5xObrKDAnO//lcw90jHm/qRvzoImY7n7XAYFAnM=; b=VwfhaRiBCPVuXna7PB1jT6mdC9qt0YA+ZQ2T07vs0tdh3wZopXJ4vMc2Ya3bejhCrwP4akLn35p2n/Kw+SoaacKg8yCM5PAq0Jk1mvuvfumW5KhkW/pfIfNAZ9Dy93roG7++UAOd1SEqWFnbVeTepCzopjIKxOlMSo8nkxeMgMc= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.74 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-74.mimecast.com (us-smtp-delivery-74.mimecast.com [216.205.24.74]) by mx.zohomail.com with SMTPS id 1585329423986725.7982108230992; Fri, 27 Mar 2020 10:17:03 -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-101-MV8W5YhHMey0lw496VM70A-1; Fri, 27 Mar 2020 13:16:20 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 576DE13F7; Fri, 27 Mar 2020 17:16:14 +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 2F3035E034; Fri, 27 Mar 2020 17:16:14 +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 9C1E818089D5; Fri, 27 Mar 2020 17:16:13 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 02RHGADh014849 for ; Fri, 27 Mar 2020 13:16:11 -0400 Received: by smtp.corp.redhat.com (Postfix) id F1472CDBD2; Fri, 27 Mar 2020 17:16:10 +0000 (UTC) Received: from kinshicho.usersys.redhat.com (unknown [10.40.195.82]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 2C859CDBDD for ; Fri, 27 Mar 2020 17:16:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1585329422; 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=fy3d5xObrKDAnO//lcw90jHm/qRvzoImY7n7XAYFAnM=; b=aKZSqlJZABfjR/VHZZw/e9QJvYAf3WBqOQ88SbR211bCTZiMpNubtjsPhe9CTD0KKkGphq UGJLwVWnVflXsbPmpEv5kJkvg4Nbv5I5JwOlnypz2XQVrdr0h23fCf5fnDkFeJi4pqZwps JDx23ivIGqvpuw4oVuvvA2efZPWw3ls= X-MC-Unique: MV8W5YhHMey0lw496VM70A-1 From: Andrea Bolognani To: libvir-list@redhat.com Subject: [libvirt PATCH 2/2] gitlab: Define $MAKEFLAGS in environment Date: Fri, 27 Mar 2020 18:15:59 +0100 Message-Id: <20200327171559.1109515-3-abologna@redhat.com> In-Reply-To: <20200327171559.1109515-1-abologna@redhat.com> References: <20200327171559.1109515-1-abologna@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 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.15 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 way we don't need to call getconf over and over, and the actual build steps don't end up drowned in the noise. Signed-off-by: Andrea Bolognani Reviewed-by: Daniel P. Berrang=C3=A9 --- .gitlab-ci.yml | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index eeeff7ed48..a5c5dfc52f 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -8,6 +8,7 @@ stages: =20 .environment: &environment | export MAKE=3D"make" + export MAKEFLAGS=3D"-j$(getconf _NPROCESSORS_ONLN)" =20 # Common templates =20 @@ -28,7 +29,7 @@ stages: - mkdir build - cd build - ../autogen.sh || (cat config.log && exit 1) - - $MAKE -j $(getconf _NPROCESSORS_ONLN) distcheck + - $MAKE distcheck =20 # Extra native build jobs that are only run post-merge, or # when code is pushed to a branch with "ci-full-" name prefix @@ -56,7 +57,7 @@ stages: - mkdir build - cd build - ../autogen.sh $CONFIGURE_OPTS || (cat config.log && exit 1) - - $MAKE -j $(getconf _NPROCESSORS_ONLN) + - $MAKE =20 # Extra cross build jobs that are only run post-merge, or # when code is pushed to a branch with "ci-full-" name prefix @@ -172,8 +173,8 @@ website: - mkdir build - cd build - ../autogen.sh --prefix=3D$(pwd)/../vroot || (cat config.log && exit = 1) - - $MAKE -j $(getconf _NPROCESSORS_ONLN) -C docs - - $MAKE -j $(getconf _NPROCESSORS_ONLN) -C docs install + - $MAKE -C docs + - $MAKE -C docs install - cd .. - mv vroot/share/doc/libvirt/html/ website image: quay.io/libvirt/buildenv-libvirt-fedora-31:latest @@ -194,7 +195,7 @@ codestyle: - mkdir build - cd build - ../autogen.sh || (cat config.log && exit 1) - - $MAKE -j $(getconf _NPROCESSORS_ONLN) syntax-check + - $MAKE syntax-check image: quay.io/libvirt/buildenv-libvirt-fedora-31:latest =20 =20 @@ -211,8 +212,8 @@ potfile: - mkdir build - cd build - ../autogen.sh || (cat config.log && exit 1) - - $MAKE -j $(getconf _NPROCESSORS_ONLN) -C src generated-sources - - $MAKE -j $(getconf _NPROCESSORS_ONLN) -C po libvirt.pot + - $MAKE -C src generated-sources + - $MAKE -C po libvirt.pot - cd .. - mv build/po/libvirt.pot libvirt.pot image: quay.io/libvirt/buildenv-libvirt-fedora-31:latest --=20 2.25.1