From nobody Thu Nov 13 14:57:00 2025 Delivered-To: importer@patchew.org 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; Authentication-Results: mx.zohomail.com; dkim=fail; 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=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1581414750858480.98312797245285; Tue, 11 Feb 2020 01:52:30 -0800 (PST) Received: from localhost ([::1]:46748 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j1SDV-0000gz-Jk for importer@patchew.org; Tue, 11 Feb 2020 04:52:29 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:46783) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j1SBR-0006SF-Su for qemu-devel@nongnu.org; Tue, 11 Feb 2020 04:50:23 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1j1SBQ-0001Hq-Kg for qemu-devel@nongnu.org; Tue, 11 Feb 2020 04:50:21 -0500 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:57228 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1j1SBQ-0001Ha-GE for qemu-devel@nongnu.org; Tue, 11 Feb 2020 04:50:20 -0500 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-304-SbZGpjPLPw2L73nFwgDchQ-1; Tue, 11 Feb 2020 04:50:15 -0500 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 1E9941093D80 for ; Tue, 11 Feb 2020 09:50:15 +0000 (UTC) Received: from x1w.redhat.com (ovpn-205-81.brq.redhat.com [10.40.205.81]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 40DFA10016DA; Tue, 11 Feb 2020 09:50:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1581414620; 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; bh=I/QS6QzeIWG5iv9yWE9Vw+sGPF69fQbBmrDYUidEQe4=; b=izmUFSQJmygXLzOQKbnn8AODb4wkx/+2T3RQnDeYB79FYD9si09IuCTjQWVpnfEEe20rqR SZT772GmhuzJ3/DXHFDmrZT7jEPGm8fFH2oPCK+ZqjV39Joc7UoEFxEgsdx79pDgFciPuo his4JskT3FuAJETjtACfF2IzsqCB+N4= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH v2] gitlab-ci: Move EDK2 YAML config to .gitlab-ci.d directory Date: Tue, 11 Feb 2020 10:50:04 +0100 Message-Id: <20200211095004.29647-1-philmd@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-MC-Unique: SbZGpjPLPw2L73nFwgDchQ-1 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 205.139.110.120 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Thomas Huth , Laszlo Ersek , Wainer dos Santos Moschetta Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" We plan to let maintainers managing their own GitLab CI jobs. The .gitlab-ci.d directory will contain all the new GitLab files, to keep the root directory cleaner. The EDK2 job was introduced before .gitlab-ci.d was suggested as a common directory. Move the YAML file, update its references. Suggested-by: Wainer dos Santos Moschetta Reviewed-by: Laszlo Ersek Acked-by: Thomas Huth Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Wainer dos Santos Moschetta --- Supersedes: <20200211065022.11134-1-philmd@redhat.com> v2: Reworded subject/description (Thomas) --- .gitignore | 1 + .gitlab-ci-edk2.yml =3D> .gitlab-ci.d/edk2.yml | 2 +- .gitlab-ci.yml | 2 +- MAINTAINERS | 3 +-- 4 files changed, 4 insertions(+), 4 deletions(-) rename .gitlab-ci-edk2.yml =3D> .gitlab-ci.d/edk2.yml (98%) diff --git a/.gitignore b/.gitignore index bc0a035f9c..18288eacd1 100644 --- a/.gitignore +++ b/.gitignore @@ -95,6 +95,7 @@ *.tp *.vr *.d +!/.gitlab-ci.d !/scripts/qemu-guest-agent/fsfreeze-hook.d *.o .sdk diff --git a/.gitlab-ci-edk2.yml b/.gitlab-ci.d/edk2.yml similarity index 98% rename from .gitlab-ci-edk2.yml rename to .gitlab-ci.d/edk2.yml index 088ba4b43a..a9990b7147 100644 --- a/.gitlab-ci-edk2.yml +++ b/.gitlab-ci.d/edk2.yml @@ -2,7 +2,7 @@ docker-edk2: stage: build rules: # Only run this job when the Dockerfile is modified - changes: - - .gitlab-ci-edk2.yml + - .gitlab-ci.d/edk2.yml - .gitlab-ci.d/edk2/Dockerfile when: always image: docker:19.03.1 diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index c15e394f09..dae6045d78 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,5 +1,5 @@ include: - - local: '/.gitlab-ci-edk2.yml' + - local: '/.gitlab-ci.d/edk2.yml' =20 before_script: - apt-get update -qq diff --git a/MAINTAINERS b/MAINTAINERS index c7717df720..fb00a55f41 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -2391,8 +2391,7 @@ F: roms/edk2 F: roms/edk2-* F: tests/data/uefi-boot-images/ F: tests/uefi-test-tools/ -F: .gitlab-ci-edk2.yml -F: .gitlab-ci.d/edk2/ +F: .gitlab-ci.d/edk2* =20 Usermode Emulation ------------------ --=20 2.21.1