From nobody Fri May 3 17:42:44 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=1626793540; cv=none; d=zohomail.com; s=zohoarc; b=etaeypuPjBBECsoIiL9RUsxUDdVPAu3dzpaYcs9gKWkQjAWXpApV/JU/lSrz9KJHyrY1sU2DMiFYeqTwogqbaSRhkL6MAYQPjTasX+cV7nK8PKfIwsB5he3MOWd7YhDe2uBhtqWCa//gd9iyopWltVhlXP7NVOdE3+uzrgNg5UQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1626793540; h=Content-Type:Content-Transfer-Encoding:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To; bh=E4NgxFbMKwwvqy7kZ3dZo+iQL8pGVlkQrbVV8j5XX20=; b=XOqDUvZAn1LsoxhsTujoVvuCgUxzUXJi3GWqS+aiI17DX5o26us2d8NHbjosKBJ8oPuB2vpluXOnU7LclG9PruAzSFCx42yfIWAsG3e/5HB7/a9peq8cOJfMfX7xkQs1bItGyxS3vvdHDtb4mE0hjCTZHbcxIhHGoWNdHOcgYEo= 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 1626793540401302.890584039142; Tue, 20 Jul 2021 08:05:40 -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-216--UMaZtcjOJ6EQJtiL-96-w-1; Tue, 20 Jul 2021 11:05:36 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 2EC72C73A0; Tue, 20 Jul 2021 15:05:31 +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 043F610023B0; Tue, 20 Jul 2021 15:05:31 +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 966304A712; Tue, 20 Jul 2021 15:05:30 +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 16KF5TJG009108 for ; Tue, 20 Jul 2021 11:05:29 -0400 Received: by smtp.corp.redhat.com (Postfix) id 5D91C69CB4; Tue, 20 Jul 2021 15:05:29 +0000 (UTC) Received: from localhost.localdomain.com (ovpn-113-31.ams2.redhat.com [10.36.113.31]) by smtp.corp.redhat.com (Postfix) with ESMTP id B467569FAD; Tue, 20 Jul 2021 15:05:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1626793539; 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:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=E4NgxFbMKwwvqy7kZ3dZo+iQL8pGVlkQrbVV8j5XX20=; b=I218tg83m+9yfacAnL5vCr1PDnBis+d4/16BPLMX/mKCNeLfhG4fVMMYyuAbGnVeN780ER MKBB6bIy4UajgSOztAmvUhiU81i63rO+iM4VJk8EhzoUzYWIN/N7ueCMzubXWXT7PJEjt2 S9uM/q8QHWMM5uCKL/rGlNJD/sHtqhs= X-MC-Unique: -UMaZtcjOJ6EQJtiL-96-w-1 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: libvir-list@redhat.com Subject: [libvirt PATCH] ci: maximize cirrus CI ram/cpu allocation Date: Tue, 20 Jul 2021 16:05:22 +0100 Message-Id: <20210720150522.2686988-1-berrange@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.84 on 10.5.11.22 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com 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: 1626793541952100001 For macOS you always get the maximum configuration by default (12 CPUs, 24 GB RAM), but for FreeBSD you get 2 CPUs, 4 GBs by default. This change increases the allocation to 8 CPUs, 8 GBs for FreeBSD. Signed-off-by: Daniel P. Berrang=C3=A9 --- In theory this could make builds quicker. In practice I've not been able to measure a difference due to large variance between runs. .gitlab-ci.yml | 8 ++++++++ ci/cirrus/build.yml | 2 ++ 2 files changed, 10 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 3cb6ff5e6b..24588628f2 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -114,6 +114,8 @@ stages: -e "s|[@]CIRRUS_VM_INSTANCE_TYPE@|$CIRRUS_VM_INSTANCE_TYPE|g" -e "s|[@]CIRRUS_VM_IMAGE_SELECTOR@|$CIRRUS_VM_IMAGE_SELECTOR|g" -e "s|[@]CIRRUS_VM_IMAGE_NAME@|$CIRRUS_VM_IMAGE_NAME|g" + -e "s|[@]CIRRUS_VM_CPUS@|$CIRRUS_VM_CPUS|g" + -e "s|[@]CIRRUS_VM_RAM@|$CIRRUS_VM_RAM|g" -e "s|[@]UPDATE_COMMAND@|$UPDATE_COMMAND|g" -e "s|[@]UPGRADE_COMMAND@|$UPGRADE_COMMAND|g" -e "s|[@]INSTALL_COMMAND@|$INSTALL_COMMAND|g" @@ -423,6 +425,8 @@ x64-freebsd-12-build: CIRRUS_VM_INSTANCE_TYPE: freebsd_instance CIRRUS_VM_IMAGE_SELECTOR: image_family CIRRUS_VM_IMAGE_NAME: freebsd-12-2 + CIRRUS_VM_CPUS: 8 + CIRRUS_VM_RAM: 8G UPDATE_COMMAND: pkg update UPGRADE_COMMAND: pkg upgrade -y INSTALL_COMMAND: pkg install -y @@ -434,6 +438,8 @@ x64-freebsd-13-build: CIRRUS_VM_INSTANCE_TYPE: freebsd_instance CIRRUS_VM_IMAGE_SELECTOR: image_family CIRRUS_VM_IMAGE_NAME: freebsd-13-0 + CIRRUS_VM_CPUS: 8 + CIRRUS_VM_RAM: 8G UPDATE_COMMAND: pkg update UPGRADE_COMMAND: pkg upgrade -y INSTALL_COMMAND: pkg install -y @@ -445,6 +451,8 @@ x64-macos-11-build: CIRRUS_VM_INSTANCE_TYPE: osx_instance CIRRUS_VM_IMAGE_SELECTOR: image CIRRUS_VM_IMAGE_NAME: big-sur-base + CIRRUS_VM_CPUS: 12 + CIRRUS_VM_RAM: 24G UPDATE_COMMAND: brew update UPGRADE_COMMAND: brew upgrade INSTALL_COMMAND: brew install diff --git a/ci/cirrus/build.yml b/ci/cirrus/build.yml index 867d5f297b..e9ad427765 100644 --- a/ci/cirrus/build.yml +++ b/ci/cirrus/build.yml @@ -1,5 +1,7 @@ @CIRRUS_VM_INSTANCE_TYPE@: @CIRRUS_VM_IMAGE_SELECTOR@: @CIRRUS_VM_IMAGE_NAME@ + cpu: @CIRRUS_VM_CPUS@ + memory: @CIRRUS_VM_RAM@ =20 env: CI_REPOSITORY_URL: "@CI_REPOSITORY_URL@" --=20 2.31.1