From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga11.intel.com (mga11.intel.com []) by mx.groups.io with SMTP id smtpd.web10.7965.1601068898790054521 for ; Fri, 25 Sep 2020 14:21:39 -0700 Authentication-Results: mx.groups.io; dkim=missing; spf=fail (domain: intel.com, ip: , mailfrom: michael.d.kinney@intel.com) IronPort-SDR: sSPJZ7leJ13tAbjALdZK3eahbF4G6KTb0XfdmDhfdTbK75udmGeGiRU6wiztAb6pXrOrKaV1Ku P3QKqPxB8WXw== X-IronPort-AV: E=McAfee;i="6000,8403,9755"; a="158989099" X-IronPort-AV: E=Sophos;i="5.77,303,1596524400"; d="scan'208";a="158989099" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga001.jf.intel.com ([10.7.209.18]) by fmsmga102.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 25 Sep 2020 14:21:37 -0700 IronPort-SDR: bsYByhL3PXsd1ysT/ceJXZIfqryUz5cIxVsaSFwS39QTrcHa4ChOske3wiOn8vJV+/buqt7iq3 TH4GV8aKQT9Q== X-IronPort-AV: E=Sophos;i="5.77,303,1596524400"; d="scan'208";a="383658098" Received: from mdkinney-mobl2.amr.corp.intel.com ([10.209.12.17]) by orsmga001-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 25 Sep 2020 14:21:37 -0700 From: "Michael D Kinney" To: devel@edk2.groups.io Cc: Jordan Justen , Andrew Fish , Ray Ni , Divneil Rai Wadhawan , Sean Brogan Subject: [Patch V3 1/2] EmulatorPkg: Add CI build for SECURE_BOOT_ENABLE Date: Fri, 25 Sep 2020 14:21:32 -0700 Message-Id: <20200925212133.21844-2-michael.d.kinney@intel.com> X-Mailer: git-send-email 2.21.0.windows.1 In-Reply-To: <20200925212133.21844-1-michael.d.kinney@intel.com> References: <20200925212133.21844-1-michael.d.kinney@intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit https://bugzilla.tianocore.org/show_bug.cgi?id=2979 Add EmulatorPkg CI builds for SECURE_BOOT_ENABLE=TRUE for IA32/X64 and DEBUG/RELEASE/NOOPT. Label these as FULL builds, so if additional build options are added in the future, they can be added to these FULL builds. Cc: Jordan Justen Cc: Andrew Fish Cc: Ray Ni Cc: Divneil Rai Wadhawan Cc: Sean Brogan Signed-off-by: Michael D Kinney Reviewed-by: Sean Brogan --- .../.azurepipelines/Ubuntu-GCC5.yml | 43 +++++++++++++++++++ .../.azurepipelines/Windows-VS2019.yml | 43 +++++++++++++++++++ EmulatorPkg/PlatformCI/ReadMe.md | 4 +- 3 files changed, 89 insertions(+), 1 deletion(-) diff --git a/EmulatorPkg/PlatformCI/.azurepipelines/Ubuntu-GCC5.yml b/EmulatorPkg/PlatformCI/.azurepipelines/Ubuntu-GCC5.yml index 12ef8226ff..0e5f4d9961 100644 --- a/EmulatorPkg/PlatformCI/.azurepipelines/Ubuntu-GCC5.yml +++ b/EmulatorPkg/PlatformCI/.azurepipelines/Ubuntu-GCC5.yml @@ -6,6 +6,7 @@ # Toolchain: GCC5 # # Copyright (c) Microsoft Corporation. +# Copyright (c) 2020, Intel Corporation. All rights reserved. # SPDX-License-Identifier: BSD-2-Clause-Patent ## trigger: @@ -65,6 +66,48 @@ jobs: Build.Target: "NOOPT" Run.Flags: $(run_flags) Run: $(should_run) + EmulatorPkg_X64_FULL_DEBUG: + Build.File: "$(package)/PlatformCI/PlatformBuild.py" + Build.Arch: "X64" + Build.Flags: "BLD_*_SECURE_BOOT_ENABLE=TRUE" + Build.Target: "DEBUG" + Run.Flags: $(run_flags) + Run: $(should_run) + EmulatorPkg_X64_FULL_RELEASE: + Build.File: "$(package)/PlatformCI/PlatformBuild.py" + Build.Arch: "X64" + Build.Flags: "BLD_*_SECURE_BOOT_ENABLE=TRUE" + Build.Target: "RELEASE" + Run.Flags: $(run_flags) + Run: $(should_run) + EmulatorPkg_X64_FULL_NOOPT: + Build.File: "$(package)/PlatformCI/PlatformBuild.py" + Build.Arch: "X64" + Build.Flags: "BLD_*_SECURE_BOOT_ENABLE=TRUE" + Build.Target: "NOOPT" + Run.Flags: $(run_flags) + Run: $(should_run) + EmulatorPkg_IA32_FULL_DEBUG: + Build.File: "$(package)/PlatformCI/PlatformBuild.py" + Build.Arch: "IA32" + Build.Flags: "BLD_*_SECURE_BOOT_ENABLE=TRUE" + Build.Target: "DEBUG" + Run.Flags: $(run_flags) + Run: $(should_run) + EmulatorPkg_IA32_FULL_RELEASE: + Build.File: "$(package)/PlatformCI/PlatformBuild.py" + Build.Arch: "IA32" + Build.Flags: "BLD_*_SECURE_BOOT_ENABLE=TRUE" + Build.Target: "RELEASE" + Run.Flags: $(run_flags) + Run: $(should_run) + EmulatorPkg_IA32_FULL_NOOPT: + Build.File: "$(package)/PlatformCI/PlatformBuild.py" + Build.Arch: "IA32" + Build.Flags: "BLD_*_SECURE_BOOT_ENABLE=TRUE" + Build.Target: "NOOPT" + Run.Flags: $(run_flags) + Run: $(should_run) workspace: clean: all diff --git a/EmulatorPkg/PlatformCI/.azurepipelines/Windows-VS2019.yml b/EmulatorPkg/PlatformCI/.azurepipelines/Windows-VS2019.yml index a5baf4b606..2bfce4e0af 100644 --- a/EmulatorPkg/PlatformCI/.azurepipelines/Windows-VS2019.yml +++ b/EmulatorPkg/PlatformCI/.azurepipelines/Windows-VS2019.yml @@ -6,6 +6,7 @@ # Toolchain: VS2019 # # Copyright (c) Microsoft Corporation. +# Copyright (c) 2020, Intel Corporation. All rights reserved. # SPDX-License-Identifier: BSD-2-Clause-Patent ## trigger: @@ -66,6 +67,48 @@ jobs: Build.Target: "NOOPT" Run.Flags: $(run_flags) Run: $(should_run) + EmulatorPkg_X64_FULL_DEBUG: + Build.File: "$(package)/PlatformCI/PlatformBuild.py" + Build.Arch: "X64" + Build.Flags: "BLD_*_SECURE_BOOT_ENABLE=TRUE" + Build.Target: "DEBUG" + Run.Flags: $(run_flags) + Run: $(should_run) + EmulatorPkg_X64_FULL_RELEASE: + Build.File: "$(package)/PlatformCI/PlatformBuild.py" + Build.Arch: "X64" + Build.Flags: "BLD_*_SECURE_BOOT_ENABLE=TRUE" + Build.Target: "RELEASE" + Run.Flags: $(run_flags) + Run: $(should_run) + EmulatorPkg_X64_FULL_NOOPT: + Build.File: "$(package)/PlatformCI/PlatformBuild.py" + Build.Arch: "X64" + Build.Flags: "BLD_*_SECURE_BOOT_ENABLE=TRUE" + Build.Target: "NOOPT" + Run.Flags: $(run_flags) + Run: $(should_run) + EmulatorPkg_IA32_FULL_DEBUG: + Build.File: "$(package)/PlatformCI/PlatformBuild.py" + Build.Arch: "IA32" + Build.Flags: "BLD_*_SECURE_BOOT_ENABLE=TRUE" + Build.Target: "DEBUG" + Run.Flags: $(run_flags) + Run: $(should_run) + EmulatorPkg_IA32_FULL_RELEASE: + Build.File: "$(package)/PlatformCI/PlatformBuild.py" + Build.Arch: "IA32" + Build.Flags: "BLD_*_SECURE_BOOT_ENABLE=TRUE" + Build.Target: "RELEASE" + Run.Flags: $(run_flags) + Run: $(should_run) + EmulatorPkg_IA32_FULL_NOOPT: + Build.File: "$(package)/PlatformCI/PlatformBuild.py" + Build.Arch: "IA32" + Build.Flags: "BLD_*_SECURE_BOOT_ENABLE=TRUE" + Build.Target: "NOOPT" + Run.Flags: $(run_flags) + Run: $(should_run) workspace: clean: all diff --git a/EmulatorPkg/PlatformCI/ReadMe.md b/EmulatorPkg/PlatformCI/ReadMe.md index c51838ec1a..91c40b2093 100644 --- a/EmulatorPkg/PlatformCI/ReadMe.md +++ b/EmulatorPkg/PlatformCI/ReadMe.md @@ -6,13 +6,15 @@ to use the same Pytools based build infrastructure locally. ## Supported Configuration Details This solution for building and running EmulatorPkg has only been validated with Windows 10 -with VS2019 and Ubuntu 18.04 with GCC5 toolchain. Two different firmware builds are +with VS2019 and Ubuntu 18.04 with GCC5 toolchain. Four different firmware builds are supported and are described below. | Configuration name | Architectures | DSC File |Additional Flags | | :---- | :----- | :---- | :---- | | IA32 | IA32 | EmulatorPkg.dsc | None | | X64 | X64 | EmulatorPkg.dsc | None | +| IA32 Full | IA32 | EmulatorPkg.dsc | SECURE_BOOT_ENABLE=TRUE | +| X64 Full | X64 | EmulatorPkg.dsc | SECURE_BOOT_ENABLE=TRUE | ## EDK2 Developer environment -- 2.21.0.windows.1