From nobody Sun Feb 8 22:42:53 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) client-ip=170.10.129.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.124 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=1675691705; cv=none; d=zohomail.com; s=zohoarc; b=Miz/MDUww+iAKTfDyobsXCHxlL0kR5njzg1yIyRm9EBwkreJeP922xmBNZO31VLl5/XzikRGs98pog2bb/PVakHNZRkPGImf99DrdVBs9hAYuSsg9ItffEgSmVs7v3YRYLVa7F9fzEgR6xkxkc0i8LTIvCAWC/UhRzoVwLDScDg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1675691705; h=Content-Type:Content-Transfer-Encoding:Cc: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=RL+2tKAEc9GegeAIjVcBvhkJFxkhepcIdbY67Ee/dXw=; b=Orzofrhj7OvpemoufIliACxA/yUkP4j3jCr9AEcYuglqM9QHDV58U1IVWO9uiKGB8w/Aw5PNjLi7gv/8tYbp6Iq2aVZgXWoOY/T9jX1J8TGPm9e9Lwb+TUGhrYUkQgonJqa+cOS4inh/5r2PxEqRbqGgbVStCyA5N2kumRCKcLI= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mx.zohomail.com with SMTPS id 1675691705437184.5295975425579; Mon, 6 Feb 2023 05:55:05 -0800 (PST) Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-636-bPaMr8rYO92Xa5zslANd8Q-1; Mon, 06 Feb 2023 08:53:39 -0500 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 96ED8857A93; Mon, 6 Feb 2023 13:53:36 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (unknown [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 4D5062166B29; Mon, 6 Feb 2023 13:53:36 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 4187E19465A8; Mon, 6 Feb 2023 13:53:36 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.rdu2.redhat.com [10.11.54.7]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 87AE0194658F for ; Mon, 6 Feb 2023 13:53:35 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 75F6F14171C4; Mon, 6 Feb 2023 13:53:35 +0000 (UTC) Received: from ridgehead.redhat.com (ovpn-193-197.brq.redhat.com [10.40.193.197]) by smtp.corp.redhat.com (Postfix) with ESMTP id E68BF140EBF6; Mon, 6 Feb 2023 13:53:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1675691704; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc: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=RL+2tKAEc9GegeAIjVcBvhkJFxkhepcIdbY67Ee/dXw=; b=Z/zyto1xbZg+WCLwKpvZaljWzkbJhcV3scV3hFsUKHTPoU3qt/ogrWci8qclqqRwQ5SeA4 9G47ESy9evvAOZQA/ngswgTbBJpbWaP5UWh2pDpqDm0aKEky31FBT4+dF8l2qYpHwr+uxK U5fspPt2Iowp5xKqHoJjNqQlKbSqKzI= X-MC-Unique: bPaMr8rYO92Xa5zslANd8Q-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Erik Skultety To: libvir-list@redhat.com Subject: [libvirt PATCH 20/20] gitlab-ci.yml: Drop the usage of script variables reference Date: Mon, 6 Feb 2023 14:53:17 +0100 Message-Id: <0c9039dd04d5dbb10b389bdc59bb6447228b3fb6.1675691295.git.eskultet@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.7 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Erik Skultety Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 3.1 on 10.11.54.6 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1675691705929100001 Content-Type: text/plain; charset="utf-8"; x-default="true" ci/build.sh is already exporting all of those and there's no need for these variables to necessarily be defined and exported by GitLab explicitly, this can be transparent to the job definition plus it keeps everything important in a single place. Signed-off-by: Erik Skultety --- .gitlab-ci.yml | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 747209dca9..7cbccb5fe6 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -7,14 +7,6 @@ stages: - integration_tests - sanity_checks =20 -.script_variables: &script_variables | - export CCACHE_BASEDIR=3D"$(pwd)" - export CCACHE_DIR=3D"$CCACHE_BASEDIR/ccache" - export CCACHE_MAXSIZE=3D"500M" - export PATH=3D"$CCACHE_WRAPPERSDIR:$PATH" - export VIR_TEST_VERBOSE=3D"1" - export VIR_TEST_DEBUG=3D"1" - include: - '/ci/gitlab.yml' - '/ci/integration.yml' @@ -25,7 +17,6 @@ include: - ccache/ key: "$CI_JOB_NAME" script: - - *script_variables - if test -x /usr/bin/rpmbuild && test "$RPM" !=3D "skip"; then ci/build.sh --rpmbuild; @@ -57,7 +48,6 @@ include: - ccache/ key: "$CI_JOB_NAME" script: - - *script_variables - ci/build.sh --build - if test "$CROSS" =3D "i686" ; then @@ -83,7 +73,6 @@ include: # https://gitlab.com/libvirt/libvirt/-/jobs/artifacts/master/download?j= ob=3Dwebsite .website_job: script: - - *script_variables - ci/build.sh --website after_script: - test "$CI_JOB_STATUS" !=3D "success" && exit 1; @@ -118,7 +107,6 @@ website_local_env: .codestyle_job: stage: sanity_checks script: - - *script_variables - ci/build.sh --codestyle =20 codestyle_prebuilt_env: @@ -157,8 +145,6 @@ potfile: - if: '$CI_PROJECT_NAMESPACE =3D=3D $RUN_UPSTREAM_NAMESPACE && $CI_PIP= ELINE_SOURCE =3D=3D "push" && $CI_COMMIT_BRANCH =3D=3D $CI_DEFAULT_BRANCH' when: on_success - when: never - before_script: - - *script_variables script: - ci/build.sh --potfile after_script: --=20 2.39.1