From nobody Sat Feb 7 07:31:04 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=1675691621; cv=none; d=zohomail.com; s=zohoarc; b=O/QnXKSPgNrDTfYwoRGwI8tcVmvBmkoXtqTyBXeIRKO8owXIjB0ZZqSNJfSfjUnoEpTKsu7FcK5VR+O/+MhTsgCKJlp4EUM4+SzLs6sQ/UDR2u5YVOD6Gf3m+DIgMb2pmQ34eBMtIaEPU5LW9yXuqNGJO3Aj9QPzweZH/yv9VZ0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1675691621; 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=JV40pYU06GHXZylEibLDnZdmSnAZW2IzLv4cWtER3Wo=; b=hfEtHmuzkT3IARQTgiGTblqJu5bIUlGd/kc7Y7PUkjI0r+vUmWPqVgBCq4mcRAOFMznDy7ByLtnnkUxrL0gABDIzielsgucAwGfR6+0JrIuCmXzefR9LeLgqcJ62A4ZlUh6fUhdY/hXryVHqzyqeC6NgggBQL6GomhegdO9fbtY= 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 16756916213122.4082552158034787; Mon, 6 Feb 2023 05:53:41 -0800 (PST) Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-35-QRTibMNhN7-RPM7GFjm2fQ-1; Mon, 06 Feb 2023 08:53:37 -0500 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 7C5933C0F66B; Mon, 6 Feb 2023 13:53:30 +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 6753D440BC; Mon, 6 Feb 2023 13:53:30 +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 5719A194658C; Mon, 6 Feb 2023 13:53:30 +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 2B6F01946589 for ; Mon, 6 Feb 2023 13:53:29 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 1127F14171B6; Mon, 6 Feb 2023 13:53:29 +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 8323A14171BE; Mon, 6 Feb 2023 13:53:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1675691620; 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=JV40pYU06GHXZylEibLDnZdmSnAZW2IzLv4cWtER3Wo=; b=ZEd5M+cs7OAXJWu0akYz/YdvrjBtlAzWoJOs+DkZXvvyn/+1LxOKGuId0SFKKTgy0nXI2h itOtr+x4JgiVcGzSAV7QaXsV84m0HItd23N5ky0um00MWSs/1smpXYtdq/4J4Eu2Dvqd0W cwQA98zyFYv9YFeDn7m5WpuOo6JmL/o= X-MC-Unique: QRTibMNhN7-RPM7GFjm2fQ-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Erik Skultety To: libvir-list@redhat.com Subject: [libvirt PATCH 13/20] ci: build.sh: Wire up the individual job functions to the CLI Date: Mon, 6 Feb 2023 14:53:10 +0100 Message-Id: <085c059db9cf7201b34bf43552c732621ea405da.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.5 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: 1675691622727100016 Content-Type: text/plain; charset="utf-8"; x-default="true" Now that we have the GitLab job helper functions in place, we can wire them up to the CLI interface. Signed-off-by: Erik Skultety --- ci/Makefile | 5 ++--- ci/build.sh | 39 +++++++++++++++++++++++++++++++++++++-- 2 files changed, 39 insertions(+), 5 deletions(-) diff --git a/ci/Makefile b/ci/Makefile index 217eda3cc0..8525b2ff88 100644 --- a/ci/Makefile +++ b/ci/Makefile @@ -208,11 +208,10 @@ ci-shell@%: $(MAKE) -C $(CI_ROOTDIR) ci-run-command@$* CI_COMMAND=3D"/bin/bash" =20 ci-build@%: - $(MAKE) -C $(CI_ROOTDIR) ci-run-command@$* CI_COMMAND=3D"$(CI_USER_HOME)/= build" + $(MAKE) -C $(CI_ROOTDIR) ci-run-command@$* CI_COMMAND=3D"$(CI_USER_HOME)/= build --build" =20 ci-test@%: - $(MAKE) -C $(CI_ROOTDIR) ci-build@$* - + $(MAKE) -C $(CI_ROOTDIR) ci-run-command@$* CI_COMMAND=3D"$(CI_USER_HOME)/= build --build --test" ci-help: @echo @echo diff --git a/ci/build.sh b/ci/build.sh index f169dd01a1..aeb1bf4b05 100644 --- a/ci/build.sh +++ b/ci/build.sh @@ -65,9 +65,44 @@ run_website_build() { } =20 main() { + ACTIONS=3D"" + + while [ "$#" -ne 0 ] + do + case "$1" in + --build) + ACTIONS=3D"$ACTIONS run_build" + ;; + --potfile) + ACTIONS=3D"$ACTIONS run_potfile" + ;; + --codestyle) + ACTIONS=3D"$ACTIONS run_codestyle" + ;; + --rpmbuild) + ACTIONS=3D"$ACTIONS run_rpmbuild" + ;; + --test) + ACTIONS=3D"$ACTIONS run_test" + ;; + --website) + ACTIONS=3D"$ACTIONS run_website_build" + ;; + *) + echo "Error: Unknown action '$1'" + exit 1 + ;; + esac + shift + done + + ACTIONS=3D${ACTIONS:=3Drun_build} + run_meson_setup - run_build - run_test + for action in $ACTIONS + do + $action + done } =20 main "$@" --=20 2.39.1