From nobody Sat Dec 21 18:34:47 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.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.133.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=1694439873; cv=none; d=zohomail.com; s=zohoarc; b=ceUJUHW+ekdrtnYYML2Eqc2SkM2AI+4Cep0uwhcc8yCxGBborxWQNFvAC+2wYsTKxyCoOxVZkZnBmotlEP6/hjLTJgY7FLA28qQwNxK+IFmqrbKZxZYhbrzulbfmLLB4+A2GEjueqVHFYQMdPVwCiYumyiMXe9i1jSnuS3K2LOY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1694439873; 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=CQPzmZwtrPf7H6ZK4rLNOt8VnmkZSAEhdFqAjSJb3Sw=; b=ZBF5AIgPlBtG0WXdVnjILe/RR3ySJfgR9EL0x1R4IknylCULP5aRvWY7Sdpgk9uRHR8uar7j6bLHZ1W/68XkYEwW8DMd4lLROS17F94l1QFWKlePiapL0rbpYArpEYF+3av/zVtKqA61qc/yDbfewkvRqKJYCq5b1pRvZDGCBdY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.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.133.124]) by mx.zohomail.com with SMTPS id 1694439873970993.7986100786984; Mon, 11 Sep 2023 06:44:33 -0700 (PDT) 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-16-VrVYyvI9MEeKXdWutpZdQA-1; Mon, 11 Sep 2023 09:44:30 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id DF2A5927AB0; Mon, 11 Sep 2023 13:44:10 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id C4E444404C; Mon, 11 Sep 2023 13:44:10 +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 064D019451FD; Mon, 11 Sep 2023 13:43:56 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id EB7201946A4F for ; Mon, 11 Sep 2023 13:43:52 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id DC7592027046; Mon, 11 Sep 2023 13:43:52 +0000 (UTC) Received: from orca.home.lan (unknown [10.45.225.151]) by smtp.corp.redhat.com (Postfix) with ESMTP id 44CF02023499; Mon, 11 Sep 2023 13:43:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1694439873; 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=CQPzmZwtrPf7H6ZK4rLNOt8VnmkZSAEhdFqAjSJb3Sw=; b=CeQffciX54SMcEy5HZ+oBvXjUQhkW9CHJFatjskjqT83I892BKJksX+Sr7d1lA+eAhiqXr dnTl9MxVjtusPVMIgsCy89jBSpVmSj4y+SY42XCVATFjsqIIOnLCzx92f6iiELNm8G/yOc 52hWk2onybj+ILhmxaZ9k9Qu8FR6dGE= X-MC-Unique: VrVYyvI9MEeKXdWutpZdQA-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Erik Skultety To: libvir-list@redhat.com Subject: [libvirt PATCH v2 18/35] .gitlab-ci.yml: Convert the native build job to the build.sh usage Date: Mon, 11 Sep 2023 15:43:19 +0200 Message-ID: <2848bf5e8aecf2a6d90c1f1483b7da9d41c85abf.1694439815.git.eskultet@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.4 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.5 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1694439875168100011 Individual shell command executions are replaced by respective functions in the ci/build.sh base script. This will make sure we use the same recipes in GitLab jobs as well as in local executions. Signed-off-by: Erik Skultety Reviewed-by: Daniel P. Berrang=C3=A9 Erik Skultety : --- .gitlab-ci.yml | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 1c6af8f8b3..c837812091 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -25,15 +25,13 @@ include: - ccache/ key: "$CI_JOB_NAME" script: - - *script_variables - - meson setup build --werror $MESON_ARGS || (cat build/meson-logs/meso= n-log.txt && exit 1) - - meson dist -C build --no-tests + - source ci/jobs.sh - if test -x /usr/bin/rpmbuild && test "$RPM" !=3D "skip"; then - rpmbuild --clean --nodeps --define "_without_mingw 1" -ta build/me= son-dist/libvirt-*.tar.xz; + run_rpmbuild; else - meson compile -C build; - meson test -C build --no-suite syntax-check --print-errorlogs; + run_build; + run_test; fi after_script: - test "$CI_JOB_STATUS" !=3D "success" && exit 1; --=20 2.41.0