Merged as b8a3eec88cc7..59a952d9ab00 Thanks.
Regards, Sami Mujawar On 14/12/2023, 13:54, "Sami Mujawar" <sami.muja...@arm.com <mailto:sami.muja...@arm.com>> wrote: Hi Laszlo, On 14/12/2023, 12:28, "Laszlo Ersek" <ler...@redhat.com <mailto:ler...@redhat.com> <mailto:ler...@redhat.com <mailto:ler...@redhat.com>>> wrote: On 12/13/23 16:13, Sami Mujawar wrote: > From: Jianyong Wu <jianyong...@arm.com <mailto:jianyong...@arm.com> > <mailto:jianyong...@arm.com <mailto:jianyong...@arm.com>>> > > Add the long lost CI for CloudHv on AArch64. > As CloudHv CI works nearly the same way with other VMMs like KvmTool, > thus we can easily create its CI configuration based on KvmTool. > > Reviewed-by: Laszlo Ersek <ler...@redhat.com <mailto:ler...@redhat.com> > <mailto:ler...@redhat.com <mailto:ler...@redhat.com>>> > Signed-off-by: Jianyong Wu <jianyong...@arm.com <mailto:jianyong...@arm.com> > <mailto:jianyong...@arm.com <mailto:jianyong...@arm.com>>> > Signed-off-by: Sami Mujawar <sami.muja...@arm.com > <mailto:sami.muja...@arm.com> <mailto:sami.muja...@arm.com > <mailto:sami.muja...@arm.com>>> > --- > > The changes can be seen at: > https://github.com/samimujawar/edk2/tree/2897_cloudhv_ci_v3 > <https://github.com/samimujawar/edk2/tree/2897_cloudhv_ci_v3> > <https://github.com/samimujawar/edk2/tree/2897_cloudhv_ci_v3> > <https://github.com/samimujawar/edk2/tree/2897_cloudhv_ci_v3>> > > Notes: > v3: > - CI fails to build when merging this patch [Laszlo] > Ref: https://edk2.groups.io/g/devel/message/112321 > <https://edk2.groups.io/g/devel/message/112321> > <https://edk2.groups.io/g/devel/message/112321> > <https://edk2.groups.io/g/devel/message/112321>> > - Added missing comma in supported architecture lists [Sami] > in CloudHvBuild.py to fix the issue. Huh, singleton tuple! https://docs.python.org/3/library/stdtypes.html#tuple <https://docs.python.org/3/library/stdtypes.html#tuple> <https://docs.python.org/3/library/stdtypes.html#tuple> <https://docs.python.org/3/library/stdtypes.html#tuple>> "Using a trailing comma for a singleton tuple: a, or (a,)" I guess that broke with the ArchSupported update from v1 to v2: - ArchSupported = ("AARCH64", "ARM") + ArchSupported = ("AARCH64") Sami, you have push right; can you merge this? [SAMI] I will get this merged, no problem. Regards, Sami Mujawar Thanks! Laszlo > > ArmVirtPkg/PlatformCI/.azurepipelines/Ubuntu-GCC5.yml | 13 ++++++++ > ArmVirtPkg/PlatformCI/CloudHvBuild.py | 32 ++++++++++++++++++++ > 2 files changed, 45 insertions(+) > > diff --git a/ArmVirtPkg/PlatformCI/.azurepipelines/Ubuntu-GCC5.yml > b/ArmVirtPkg/PlatformCI/.azurepipelines/Ubuntu-GCC5.yml > index > d1772a65fc3a84f7f981971ff4ed6c37d7ba84f6..ab8a2db53026db686ae4e5943044235c63ab3a80 > 100644 > --- a/ArmVirtPkg/PlatformCI/.azurepipelines/Ubuntu-GCC5.yml > +++ b/ArmVirtPkg/PlatformCI/.azurepipelines/Ubuntu-GCC5.yml > @@ -140,6 +140,19 @@ jobs: > Build.Target: "RELEASE" > Run: false > > + CLOUDHV_AARCH64_DEBUG: > + Build.File: "$(package)/PlatformCI/CloudHvBuild.py" > + Build.Arch: "AARCH64" > + Build.Flags: "" > + Build.Target: "DEBUG" > + Run: false > + CLOUDHV_AARCH64_RELEASE: > + Build.File: "$(package)/PlatformCI/CloudHvBuild.py" > + Build.Arch: "AARCH64" > + Build.Flags: "" > + Build.Target: "RELEASE" > + Run: false > + > workspace: > clean: all > > diff --git a/ArmVirtPkg/PlatformCI/CloudHvBuild.py > b/ArmVirtPkg/PlatformCI/CloudHvBuild.py > new file mode 100644 > index > 0000000000000000000000000000000000000000..5100a56f3be5ad6d2b156352a521900f93d1de27 > --- /dev/null > +++ b/ArmVirtPkg/PlatformCI/CloudHvBuild.py > @@ -0,0 +1,32 @@ > +# @file > +# Script to Build ArmVirtPkg UEFI firmware > +# > +# Copyright (c) Microsoft Corporation. > +# SPDX-License-Identifier: BSD-2-Clause-Patent > +## > +import os > +import sys > + > +sys.path.append(os.path.dirname(os.path.abspath(__file__))) > +from PlatformBuildLib import SettingsManager > +from PlatformBuildLib import PlatformBuilder > + > + # > ####################################################################################### > # > + # Common Configuration # > + # > ####################################################################################### > # > +class CommonPlatform(): > + ''' Common settings for this platform. Define static data here and use > + for the different parts of stuart > + ''' > + PackagesSupported = ("ArmVirtPkg",) > + ArchSupported = ("AARCH64",) > + TargetsSupported = ("DEBUG", "RELEASE") > + Scopes = ('armvirt', 'edk2-build') > + WorkspaceRoot = os.path.realpath(os.path.join( > + os.path.dirname(os.path.abspath(__file__)), "..", "..")) > + > + DscName = os.path.join("ArmVirtPkg", "ArmVirtCloudHv.dsc") > + FvQemuArg = "" # ignored > + > +import PlatformBuildLib > +PlatformBuildLib.CommonPlatform = CommonPlatform -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#112539): https://edk2.groups.io/g/devel/message/112539 Mute This Topic: https://groups.io/mt/103150734/21656 Group Owner: devel+ow...@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
