From nobody Sun Feb 8 17:03:51 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1656522694; cv=none; d=zohomail.com; s=zohoarc; b=ZZpW/rEW8iIaP9d64XGzP/xzXF9x03fanfWz7EbFB2GRWg0EZyPAK0PjtfPuov92cTSRW7CQSKajwngdjFkbZt3qO5nT0KV/6Ej4AVIGo8SlkWEtwm0LJWj8KvOE5RtobHBNGEXDUJMYaLjoRTtGgZcDmSCMLyVsYeiuRM96q/g= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1656522694; 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=+iCs+NsZ87o2SQlQVrdGbg/0RCPb4MbAcXmvCK++uoM=; b=PPmTZp7Qily1nHHzcbp2rVEdK8j4GLQF4wW6bsPX4NFQCBZD8wZ8BTm2cRYvKeb2GAMrwgeKqfuAKIXZZ5ueN9RbseDrzQEqUm+5ZZMSD3dDeotjW1R0ETXt+bdC76oBW/xSo4JEPzM7u08LWAJzuVPdC3T6UvBjpeGNi8nmhB4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1656522694109527.1169110663448; Wed, 29 Jun 2022 10:11:34 -0700 (PDT) Received: from localhost ([::1]:57948 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1o6bDv-0006na-Uj for importer@patchew.org; Wed, 29 Jun 2022 13:11:32 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58998) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1o6b9O-0002JG-NU for qemu-devel@nongnu.org; Wed, 29 Jun 2022 13:06:50 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]:41738) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1o6b9K-0004gN-VL for qemu-devel@nongnu.org; Wed, 29 Jun 2022 13:06:49 -0400 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-99-D4UrhmvCMhWk8NQVCC6scA-1; Wed, 29 Jun 2022 13:06:44 -0400 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 847F0382ECD5; Wed, 29 Jun 2022 17:06:43 +0000 (UTC) Received: from localhost.localdomain.com (unknown [10.33.36.145]) by smtp.corp.redhat.com (Postfix) with ESMTP id 1C16E2166B29; Wed, 29 Jun 2022 17:06:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1656522405; h=from:from: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; bh=+iCs+NsZ87o2SQlQVrdGbg/0RCPb4MbAcXmvCK++uoM=; b=ReoADJi/C6PnNBlKWBa5pZPJS/n8ewmD+F4EL7lZfL32UhlTO2r86zzjNLF3eoQg7ePmNu NJboxXBPQiGeqZOp6RG4rI8UDidFGfvkpPD3/l51+pzLTZOFuqa5dI/RjHrKx0puIC/rba wutod56x7kwBtvQ5RSl3mpmPiyhfcPY= X-MC-Unique: D4UrhmvCMhWk8NQVCC6scA-1 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Alex=20Benn=C3=A9e?= , Thomas Huth , Wainer dos Santos Moschetta , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Bin Meng , Beraldo Leal , Gerd Hoffmann , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= Subject: [PATCH 1/3] gitlab: normalize indentation in edk2/opensbi rules Date: Wed, 29 Jun 2022 18:06:36 +0100 Message-Id: <20220629170638.520630-2-berrange@redhat.com> In-Reply-To: <20220629170638.520630-1-berrange@redhat.com> References: <20220629170638.520630-1-berrange@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 2.78 on 10.11.54.6 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=berrange@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -28 X-Spam_score: -2.9 X-Spam_bar: -- X-Spam_report: (-2.9 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.082, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1656522695914100001 The edk2/opensbi gitlab CI config was using single space indents which is not consistent with the rest of the gitlab CI config files. Signed-off-by: Daniel P. Berrang=C3=A9 Reviewed-by: Richard Henderson --- .gitlab-ci.d/edk2.yml | 108 +++++++++++++++++++------------------- .gitlab-ci.d/opensbi.yml | 110 +++++++++++++++++++-------------------- 2 files changed, 109 insertions(+), 109 deletions(-) diff --git a/.gitlab-ci.d/edk2.yml b/.gitlab-ci.d/edk2.yml index 13d0f8b019..fbe763a282 100644 --- a/.gitlab-ci.d/edk2.yml +++ b/.gitlab-ci.d/edk2.yml @@ -1,60 +1,60 @@ # All jobs needing docker-edk2 must use the same rules it uses. .edk2_job_rules: - rules: # Only run this job when ... - - changes: - # this file is modified - - .gitlab-ci.d/edk2.yml - # or the Dockerfile is modified - - .gitlab-ci.d/edk2/Dockerfile - # or roms/edk2/ is modified (submodule updated) - - roms/edk2/* - when: on_success - - if: '$CI_COMMIT_REF_NAME =3D~ /^edk2/' # or the branch/tag starts with = 'edk2' - when: on_success - - if: '$CI_COMMIT_MESSAGE =3D~ /edk2/i' # or last commit description cont= ains 'EDK2' - when: on_success + rules: # Only run this job when ... + - changes: + # this file is modified + - .gitlab-ci.d/edk2.yml + # or the Dockerfile is modified + - .gitlab-ci.d/edk2/Dockerfile + # or roms/edk2/ is modified (submodule updated) + - roms/edk2/* + when: on_success + - if: '$CI_COMMIT_REF_NAME =3D~ /^edk2/' # or the branch/tag starts wi= th 'edk2' + when: on_success + - if: '$CI_COMMIT_MESSAGE =3D~ /edk2/i' # or last commit description c= ontains 'EDK2' + when: on_success =20 docker-edk2: - extends: .edk2_job_rules - stage: containers - image: docker:19.03.1 - services: - - docker:19.03.1-dind - variables: - GIT_DEPTH: 3 - IMAGE_TAG: $CI_REGISTRY_IMAGE:edk2-cross-build - # We don't use TLS - DOCKER_HOST: tcp://docker:2375 - DOCKER_TLS_CERTDIR: "" - before_script: - - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY - script: - - docker pull $IMAGE_TAG || true - - docker build --cache-from $IMAGE_TAG --tag $CI_REGISTRY_IMAGE:$CI_COMMI= T_SHA - --tag $IMAGE_TAG .gitlab-ci.d/edk2 - - docker push $CI_REGISTRY_IMAGE:$CI_COMMIT_SHA - - docker push $IMAGE_TAG + extends: .edk2_job_rules + stage: containers + image: docker:19.03.1 + services: + - docker:19.03.1-dind + variables: + GIT_DEPTH: 3 + IMAGE_TAG: $CI_REGISTRY_IMAGE:edk2-cross-build + # We don't use TLS + DOCKER_HOST: tcp://docker:2375 + DOCKER_TLS_CERTDIR: "" + before_script: + - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGIS= TRY + script: + - docker pull $IMAGE_TAG || true + - docker build --cache-from $IMAGE_TAG --tag $CI_REGISTRY_IMAGE:$CI_CO= MMIT_SHA + --tag $IMAGE_TAG .gitlab-ci.d/e= dk2 + - docker push $CI_REGISTRY_IMAGE:$CI_COMMIT_SHA + - docker push $IMAGE_TAG =20 build-edk2: - extends: .edk2_job_rules - stage: build - needs: ['docker-edk2'] - artifacts: - paths: # 'artifacts.zip' will contains the following files: - - pc-bios/edk2*bz2 - - pc-bios/edk2-licenses.txt - - edk2-stdout.log - - edk2-stderr.log - image: $CI_REGISTRY_IMAGE:edk2-cross-build - variables: - GIT_DEPTH: 3 - script: # Clone the required submodules and build EDK2 - - git submodule update --init roms/edk2 - - git -C roms/edk2 submodule update --init -- - ArmPkg/Library/ArmSoftFloatLib/berkeley-softfloat-3 - BaseTools/Source/C/BrotliCompress/brotli - CryptoPkg/Library/OpensslLib/openssl - MdeModulePkg/Library/BrotliCustomDecompressLib/brotli - - export JOBS=3D$(($(getconf _NPROCESSORS_ONLN) + 1)) - - echo "=3D=3D=3D Using ${JOBS} simultaneous jobs =3D=3D=3D" - - make -j${JOBS} -C roms efi 2>&1 1>edk2-stdout.log | tee -a edk2-stderr.= log >&2 + extends: .edk2_job_rules + stage: build + needs: ['docker-edk2'] + artifacts: + paths: # 'artifacts.zip' will contains the following files: + - pc-bios/edk2*bz2 + - pc-bios/edk2-licenses.txt + - edk2-stdout.log + - edk2-stderr.log + image: $CI_REGISTRY_IMAGE:edk2-cross-build + variables: + GIT_DEPTH: 3 + script: # Clone the required submodules and build EDK2 + - git submodule update --init roms/edk2 + - git -C roms/edk2 submodule update --init -- + ArmPkg/Library/ArmSoftFloatLib/berkeley-softfloat-3 + BaseTools/Source/C/BrotliCompress/brotli + CryptoPkg/Library/OpensslLib/openssl + MdeModulePkg/Library/BrotliCustomDecompressLib/brotli + - export JOBS=3D$(($(getconf _NPROCESSORS_ONLN) + 1)) + - echo "=3D=3D=3D Using ${JOBS} simultaneous jobs =3D=3D=3D" + - make -j${JOBS} -C roms efi 2>&1 1>edk2-stdout.log | tee -a edk2-stde= rr.log >&2 diff --git a/.gitlab-ci.d/opensbi.yml b/.gitlab-ci.d/opensbi.yml index 29a22930d1..0745ccdf10 100644 --- a/.gitlab-ci.d/opensbi.yml +++ b/.gitlab-ci.d/opensbi.yml @@ -1,61 +1,61 @@ # All jobs needing docker-opensbi must use the same rules it uses. .opensbi_job_rules: - rules: # Only run this job when ... - - changes: - # this file is modified - - .gitlab-ci.d/opensbi.yml - # or the Dockerfile is modified - - .gitlab-ci.d/opensbi/Dockerfile - when: on_success - - changes: # or roms/opensbi/ is modified (submodule updated) - - roms/opensbi/* - when: on_success - - if: '$CI_COMMIT_REF_NAME =3D~ /^opensbi/' # or the branch/tag starts wi= th 'opensbi' - when: on_success - - if: '$CI_COMMIT_MESSAGE =3D~ /opensbi/i' # or last commit description c= ontains 'OpenSBI' - when: on_success + rules: # Only run this job when ... + - changes: + # this file is modified + - .gitlab-ci.d/opensbi.yml + # or the Dockerfile is modified + - .gitlab-ci.d/opensbi/Dockerfile + when: on_success + - changes: # or roms/opensbi/ is modified (submodule updated) + - roms/opensbi/* + when: on_success + - if: '$CI_COMMIT_REF_NAME =3D~ /^opensbi/' # or the branch/tag starts= with 'opensbi' + when: on_success + - if: '$CI_COMMIT_MESSAGE =3D~ /opensbi/i' # or last commit descriptio= n contains 'OpenSBI' + when: on_success =20 docker-opensbi: - extends: .opensbi_job_rules - stage: containers - image: docker:19.03.1 - services: - - docker:19.03.1-dind - variables: - GIT_DEPTH: 3 - IMAGE_TAG: $CI_REGISTRY_IMAGE:opensbi-cross-build - # We don't use TLS - DOCKER_HOST: tcp://docker:2375 - DOCKER_TLS_CERTDIR: "" - before_script: - - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY - script: - - docker pull $IMAGE_TAG || true - - docker build --cache-from $IMAGE_TAG --tag $CI_REGISTRY_IMAGE:$CI_COMMI= T_SHA - --tag $IMAGE_TAG .gitlab-ci.d/open= sbi - - docker push $CI_REGISTRY_IMAGE:$CI_COMMIT_SHA - - docker push $IMAGE_TAG + extends: .opensbi_job_rules + stage: containers + image: docker:19.03.1 + services: + - docker:19.03.1-dind + variables: + GIT_DEPTH: 3 + IMAGE_TAG: $CI_REGISTRY_IMAGE:opensbi-cross-build + # We don't use TLS + DOCKER_HOST: tcp://docker:2375 + DOCKER_TLS_CERTDIR: "" + before_script: + - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGIS= TRY + script: + - docker pull $IMAGE_TAG || true + - docker build --cache-from $IMAGE_TAG --tag $CI_REGISTRY_IMAGE:$CI_CO= MMIT_SHA + --tag $IMAGE_TAG .gitlab-ci.d/o= pensbi + - docker push $CI_REGISTRY_IMAGE:$CI_COMMIT_SHA + - docker push $IMAGE_TAG =20 build-opensbi: - extends: .opensbi_job_rules - stage: build - needs: ['docker-opensbi'] - artifacts: - paths: # 'artifacts.zip' will contains the following files: - - pc-bios/opensbi-riscv32-generic-fw_dynamic.bin - - pc-bios/opensbi-riscv64-generic-fw_dynamic.bin - - opensbi32-generic-stdout.log - - opensbi32-generic-stderr.log - - opensbi64-generic-stdout.log - - opensbi64-generic-stderr.log - image: $CI_REGISTRY_IMAGE:opensbi-cross-build - variables: - GIT_DEPTH: 3 - script: # Clone the required submodules and build OpenSBI - - git submodule update --init roms/opensbi - - export JOBS=3D$(($(getconf _NPROCESSORS_ONLN) + 1)) - - echo "=3D=3D=3D Using ${JOBS} simultaneous jobs =3D=3D=3D" - - make -j${JOBS} -C roms/opensbi clean - - make -j${JOBS} -C roms opensbi32-generic 2>&1 1>opensbi32-generic-stdou= t.log | tee -a opensbi32-generic-stderr.log >&2 - - make -j${JOBS} -C roms/opensbi clean - - make -j${JOBS} -C roms opensbi64-generic 2>&1 1>opensbi64-generic-stdou= t.log | tee -a opensbi64-generic-stderr.log >&2 + extends: .opensbi_job_rules + stage: build + needs: ['docker-opensbi'] + artifacts: + paths: # 'artifacts.zip' will contains the following files: + - pc-bios/opensbi-riscv32-generic-fw_dynamic.bin + - pc-bios/opensbi-riscv64-generic-fw_dynamic.bin + - opensbi32-generic-stdout.log + - opensbi32-generic-stderr.log + - opensbi64-generic-stdout.log + - opensbi64-generic-stderr.log + image: $CI_REGISTRY_IMAGE:opensbi-cross-build + variables: + GIT_DEPTH: 3 + script: # Clone the required submodules and build OpenSBI + - git submodule update --init roms/opensbi + - export JOBS=3D$(($(getconf _NPROCESSORS_ONLN) + 1)) + - echo "=3D=3D=3D Using ${JOBS} simultaneous jobs =3D=3D=3D" + - make -j${JOBS} -C roms/opensbi clean + - make -j${JOBS} -C roms opensbi32-generic 2>&1 1>opensbi32-generic-st= dout.log | tee -a opensbi32-generic-stderr.log >&2 + - make -j${JOBS} -C roms/opensbi clean + - make -j${JOBS} -C roms opensbi64-generic 2>&1 1>opensbi64-generic-st= dout.log | tee -a opensbi64-generic-stderr.log >&2 --=20 2.36.1 From nobody Sun Feb 8 17:03:51 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1656522849; cv=none; d=zohomail.com; s=zohoarc; b=cZO+J66anGZXC6p+jrAvcd7jHUUx7thUzwDsioQ5GwTBnLFsiqemfLtbRmBoggWdWoQcNYm5ApKaXWZv171TbkgIigrq2VGW57UVCahOIjEr2Lvdh5egWfNSlOWQEEOwq+lAqa6ybVMKOBgBMlukYxPX3G5axVd155s5SBMYOtc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1656522849; 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=l9+YeY2d1/5fxV3RtaC1jo8RN21d8IM5muG+VEZgFUU=; b=Socagnts1UYUvTR2ekcNbcgQl1pGQ2THgrgf3XtOq+K30tOHd3CbiGhcm8U8OB5+Hd9FB74qNgmJVCQKpEoCYgahlnRgf0f8+JspvGXokcbNGgznOoFbKIdzAMg8JhXxYls/+LS6eRmDF1OKZEmBUUABSfEBdrVyIUVf/B6zFRo= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1656522849856879.5723453179514; Wed, 29 Jun 2022 10:14:09 -0700 (PDT) Received: from localhost ([::1]:32784 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1o6bGS-0000ZU-QG for importer@patchew.org; Wed, 29 Jun 2022 13:14:08 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59004) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1o6b9O-0002JI-Q7 for qemu-devel@nongnu.org; Wed, 29 Jun 2022 13:06:53 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:47150) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1o6b9L-0004gV-Dd for qemu-devel@nongnu.org; Wed, 29 Jun 2022 13:06:50 -0400 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-664-HolhfBowOB6A_DFUOPWuTA-1; Wed, 29 Jun 2022 13:06:45 -0400 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 160EF85A580; Wed, 29 Jun 2022 17:06:45 +0000 (UTC) Received: from localhost.localdomain.com (unknown [10.33.36.145]) by smtp.corp.redhat.com (Postfix) with ESMTP id BB8A52166B29; Wed, 29 Jun 2022 17:06:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1656522406; h=from:from: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; bh=l9+YeY2d1/5fxV3RtaC1jo8RN21d8IM5muG+VEZgFUU=; b=f8JIZMBqnbonyEDpuwUgGQoTEvIPzQSCmNgC0qeB/J3nyzHQ10kEwGeOVYz0Fzu7Pi/O+w H8/wh0WueCenNyDA3EIXYk6dxZwB17ggd2IwpB0rIDbK5gmgOJaq7B3JoAzzmqLwMcRlcz nRMsI32JcSdudzZeo+Oxbc3rlEOaY74= X-MC-Unique: HolhfBowOB6A_DFUOPWuTA-1 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Alex=20Benn=C3=A9e?= , Thomas Huth , Wainer dos Santos Moschetta , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Bin Meng , Beraldo Leal , Gerd Hoffmann , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= Subject: [PATCH 2/3] gitlab: tweak comments in edk2/opensbi jobs Date: Wed, 29 Jun 2022 18:06:37 +0100 Message-Id: <20220629170638.520630-3-berrange@redhat.com> In-Reply-To: <20220629170638.520630-1-berrange@redhat.com> References: <20220629170638.520630-1-berrange@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 2.78 on 10.11.54.6 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=berrange@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -21 X-Spam_score: -2.2 X-Spam_bar: -- X-Spam_report: (-2.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.082, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1656522850574100001 Get rid of comments stating the obvious and re-arrange remaining comments. The opensbi split of rules for file matches is also merged into one rule. Signed-off-by: Daniel P. Berrang=C3=A9 Reviewed-by: Richard Henderson --- .gitlab-ci.d/edk2.yml | 14 ++++++++------ .gitlab-ci.d/opensbi.yml | 15 ++++++++------- 2 files changed, 16 insertions(+), 13 deletions(-) diff --git a/.gitlab-ci.d/edk2.yml b/.gitlab-ci.d/edk2.yml index fbe763a282..905e02440f 100644 --- a/.gitlab-ci.d/edk2.yml +++ b/.gitlab-ci.d/edk2.yml @@ -1,17 +1,19 @@ # All jobs needing docker-edk2 must use the same rules it uses. .edk2_job_rules: - rules: # Only run this job when ... + rules: + # Run if any files affecting the build output are touched - changes: - # this file is modified - .gitlab-ci.d/edk2.yml - # or the Dockerfile is modified - .gitlab-ci.d/edk2/Dockerfile - # or roms/edk2/ is modified (submodule updated) - roms/edk2/* when: on_success - - if: '$CI_COMMIT_REF_NAME =3D~ /^edk2/' # or the branch/tag starts wi= th 'edk2' + + # Run if the branch/tag starts with 'edk2' + - if: '$CI_COMMIT_REF_NAME =3D~ /^edk2/' when: on_success - - if: '$CI_COMMIT_MESSAGE =3D~ /edk2/i' # or last commit description c= ontains 'EDK2' + + # Run if last commit msg contains 'EDK2' (case insensitive) + - if: '$CI_COMMIT_MESSAGE =3D~ /edk2/i' when: on_success =20 docker-edk2: diff --git a/.gitlab-ci.d/opensbi.yml b/.gitlab-ci.d/opensbi.yml index 0745ccdf10..753a003f93 100644 --- a/.gitlab-ci.d/opensbi.yml +++ b/.gitlab-ci.d/opensbi.yml @@ -1,18 +1,19 @@ # All jobs needing docker-opensbi must use the same rules it uses. .opensbi_job_rules: - rules: # Only run this job when ... + rules: + # Run if any files affecting the build output are touched - changes: - # this file is modified - .gitlab-ci.d/opensbi.yml - # or the Dockerfile is modified - .gitlab-ci.d/opensbi/Dockerfile - when: on_success - - changes: # or roms/opensbi/ is modified (submodule updated) - roms/opensbi/* when: on_success - - if: '$CI_COMMIT_REF_NAME =3D~ /^opensbi/' # or the branch/tag starts= with 'opensbi' + + # Run if the branch/tag starts with 'opensbi' + - if: '$CI_COMMIT_REF_NAME =3D~ /^opensbi/' when: on_success - - if: '$CI_COMMIT_MESSAGE =3D~ /opensbi/i' # or last commit descriptio= n contains 'OpenSBI' + + # Run if the last commit msg contains 'OpenSBI' (case insensitive) + - if: '$CI_COMMIT_MESSAGE =3D~ /opensbi/i' when: on_success =20 docker-opensbi: --=20 2.36.1 From nobody Sun Feb 8 17:03:51 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1656523115; cv=none; d=zohomail.com; s=zohoarc; b=BZQ9L+gEo575PCs4g2Ao688H31xdbmVakn9/6dHD5+WhtuHlENXOju6n60Rw0e/F4zX1nGuw/+jjs73yb3kBndr22xjEDTrGtODUEs5rlWFfuDplAHwG0rgCMFd4eyP5xajButeXJWKdBWbEKGA16Zpq2iVryY+Y1Y8oZ3dvmZE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1656523115; 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=Yha2KE1fVIGSV7g0IFfqXt7wsJuo7s2LCE9p4mB0U5M=; b=AmL1/vp2X9a1hisGMQ97l3LHqDwzzjPPP68SLXyEoec7Mqp6ds2wjlHYkgk0PQzbfvXPXskvxm7KLr3Z+toZHzUTggBe39EH3B7q61hzJ6AMwMa/9zDWM/xc/KzaUV4fccINgymnxeKReJAjdKB1n3FOT/GIz3qvluzErENcF2c= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1656523115649174.860198820611; Wed, 29 Jun 2022 10:18:35 -0700 (PDT) Received: from localhost ([::1]:37608 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1o6bKj-0003yJ-Hh for importer@patchew.org; Wed, 29 Jun 2022 13:18:33 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59074) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1o6b9c-0002Pg-F4 for qemu-devel@nongnu.org; Wed, 29 Jun 2022 13:07:04 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]:46125) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1o6b9Y-0004gw-CN for qemu-devel@nongnu.org; Wed, 29 Jun 2022 13:07:04 -0400 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-373-Kzsxn3XFNNCoEJaYSPchYg-1; Wed, 29 Jun 2022 13:06:47 -0400 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 B0E56185A7B2; Wed, 29 Jun 2022 17:06:46 +0000 (UTC) Received: from localhost.localdomain.com (unknown [10.33.36.145]) by smtp.corp.redhat.com (Postfix) with ESMTP id 4DBC92166B29; Wed, 29 Jun 2022 17:06:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1656522411; h=from:from: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; bh=Yha2KE1fVIGSV7g0IFfqXt7wsJuo7s2LCE9p4mB0U5M=; b=de5Xl4OHp9hpm/y5Cx+iVM3SD0Wt2JEsbkVLenRO/EMjG3zQGZKSdsERnUcmIlr8Tzqf4L b3fB1akgFHl0cF1YJ+u2dfs7c7m9bPrukQTghS+joXAl5bVRvdb7bNSNClv5uA3iubM1N/ IRzU692O8Ln3bsmY6ty6OvFMz5uvsYQ= X-MC-Unique: Kzsxn3XFNNCoEJaYSPchYg-1 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Alex=20Benn=C3=A9e?= , Thomas Huth , Wainer dos Santos Moschetta , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Bin Meng , Beraldo Leal , Gerd Hoffmann , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= Subject: [PATCH 3/3] gitlab: honour QEMU_CI variable in edk2/opensbi jobs Date: Wed, 29 Jun 2022 18:06:38 +0100 Message-Id: <20220629170638.520630-4-berrange@redhat.com> In-Reply-To: <20220629170638.520630-1-berrange@redhat.com> References: <20220629170638.520630-1-berrange@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 2.78 on 10.11.54.6 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=berrange@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -28 X-Spam_score: -2.9 X-Spam_bar: -- X-Spam_report: (-2.9 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.082, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1656523116596100001 To preserve contributor CI credits we don't want jobs to run by default unless the QEMU_CI variable is set. For most jobs we can achieve this using the base template, but the edk2/opensbi jobs are a little special as they have some complex conditions we can't easily model in the base template. We duplicate existing rules and put them under control of QEMU_CI variable, such that QEMU_CI=3D1 creates manual jobs and QEMU_CI=3D2 immediately runs jobs. Signed-off-by: Daniel P. Berrang=C3=A9 --- .gitlab-ci.d/edk2.yml | 23 +++++++++++++++++++++++ .gitlab-ci.d/opensbi.yml | 23 +++++++++++++++++++++++ 2 files changed, 46 insertions(+) diff --git a/.gitlab-ci.d/edk2.yml b/.gitlab-ci.d/edk2.yml index 905e02440f..970bdbd315 100644 --- a/.gitlab-ci.d/edk2.yml +++ b/.gitlab-ci.d/edk2.yml @@ -1,6 +1,29 @@ # All jobs needing docker-edk2 must use the same rules it uses. .edk2_job_rules: rules: + # Forks don't get pipelines unless QEMU_CI=3D1 or QEMU_CI=3D2 is set + - if: '$QEMU_CI !=3D "1" && $QEMU_CI !=3D "2" && $CI_PROJECT_NAMESPACE= !=3D "qemu-project"' + when: never + + # In forks, if QEMU_CI=3D1 is set, then create manual job + # if any of the files affecting the build are touched + - if: '$QEMU_CI =3D=3D "1" && $CI_PROJECT_NAMESPACE !=3D "qemu-project= "' + changes: + - .gitlab-ci.d/edk2.yml + - .gitlab-ci.d/edk2/Dockerfile + - roms/edk2/* + when: manual + + # In forks, if QEMU_CI=3D1 is set, then create manual job + # if the branch/tag starts with 'edk2' + - if: '$QEMU_CI =3D=3D "1" && $CI_PROJECT_NAMESPACE !=3D "qemu-project= " && $CI_COMMIT_REF_NAME =3D~ /^edk2/' + when: manual + + # In forks, if QEMU_CI=3D1 is set, then create manual job + # if last commit msg contains 'EDK2' (case insensitive) + - if: '$QEMU_CI =3D=3D "1" && $CI_PROJECT_NAMESPACE !=3D "qemu-project= " && $CI_COMMIT_MESSAGE =3D~ /edk2/i' + when: on_success + # Run if any files affecting the build output are touched - changes: - .gitlab-ci.d/edk2.yml diff --git a/.gitlab-ci.d/opensbi.yml b/.gitlab-ci.d/opensbi.yml index 753a003f93..04ed5a3ea1 100644 --- a/.gitlab-ci.d/opensbi.yml +++ b/.gitlab-ci.d/opensbi.yml @@ -1,6 +1,29 @@ # All jobs needing docker-opensbi must use the same rules it uses. .opensbi_job_rules: rules: + # Forks don't get pipelines unless QEMU_CI=3D1 or QEMU_CI=3D2 is set + - if: '$QEMU_CI !=3D "1" && $QEMU_CI !=3D "2" && $CI_PROJECT_NAMESPACE= !=3D "qemu-project"' + when: never + + # In forks, if QEMU_CI=3D1 is set, then create manual job + # if any files affecting the build output are touched + - if: '$QEMU_CI =3D=3D "1" && $CI_PROJECT_NAMESPACE !=3D "qemu-project= "' + changes: + - .gitlab-ci.d/opensbi.yml + - .gitlab-ci.d/opensbi/Dockerfile + - roms/opensbi/* + when: manual + + # In forks, if QEMU_CI=3D1 is set, then create manual job + # if the branch/tag starts with 'opensbi' + - if: '$QEMU_CI =3D=3D "1" && $CI_PROJECT_NAMESPACE !=3D "qemu-project= " && $CI_COMMIT_REF_NAME =3D~ /^opensbi/' + when: manual + + # In forks, if QEMU_CI=3D1 is set, then create manual job + # if the last commit msg contains 'OpenSBI' (case insensitive) + - if: '$QEMU_CI =3D=3D "1" && $CI_PROJECT_NAMESPACE !=3D "qemu-project= " && $CI_COMMIT_MESSAGE =3D~ /opensbi/i' + when: manual + # Run if any files affecting the build output are touched - changes: - .gitlab-ci.d/opensbi.yml --=20 2.36.1