Hi all,
Could you please help to review this patch? Thanks a lot!
Thanks,
Dun
-----Original Message-----
From: devel@edk2.groups.io <devel@edk2.groups.io> On Behalf Of duntan
Sent: Tuesday, November 22, 2022 7:48 PM
To: devel@edk2.groups.io
Cc: Sean Brogan <sean.bro...@microsoft.com>; Michael Kubacki
<mikub...@linux.microsoft.com>; Kinney, Michael D <michael.d.kin...@intel.com>;
Gao, Liming <gaolim...@byosoft.com.cn>; Ni, Ray <ray...@intel.com>
Subject: [edk2-devel] [PATCH 3/3] .azurepipelines: Expand PlatformCI template
for Shell UnitTest
Expand PlatformCI build and run steps template for Shell UnitTest. Add a new
parameter unit_test_list to support building and running specific Shell
UnitTest modules.
In stuart_pr_eval step, if the unit_test_list passed from platform yml file is
not null, it will select some packages from the packages which contain the
module in unit_test_list and set them into a new variable pkgs_to_build base on
its evaluation rule.
In stuart_build step, if unit_test_list is not null, '${{
parameters.unit_test_list}} -p $(pkgs_to_build)' will be added into the
arguments to build specific UnitTest modules in pkgs_to_build.
In 'Run to shell' step, if unit_test_list is not null, all the UnitTest modules
built in stuart_build step will runs in shell.
Signed-off-by: Dun Tan <dun....@intel.com>
Cc: Sean Brogan <sean.bro...@microsoft.com>
Cc: Michael Kubacki <mikub...@linux.microsoft.com>
Cc: Michael D Kinney <michael.d.kin...@intel.com>
Cc: Liming Gao <gaolim...@byosoft.com.cn>
Cc: Ray Ni <ray...@intel.com>
---
.azurepipelines/templates/platform-build-run-steps.yml | 21
+++++++++++++++++----
1 file changed, 17 insertions(+), 4 deletions(-)
diff --git a/.azurepipelines/templates/platform-build-run-steps.yml
b/.azurepipelines/templates/platform-build-run-steps.yml
index 40a31a509f..51503287c4 100644
--- a/.azurepipelines/templates/platform-build-run-steps.yml
+++ b/.azurepipelines/templates/platform-build-run-steps.yml
@@ -30,6 +30,9 @@ parameters:
- name: run_flags
type: string
default: ''
+- name: unit_test_list
+ type: string
+ default: ''
- name: extra_install_step
type: stepList
@@ -49,7 +52,9 @@ steps:
displayName: 'Install/Upgrade pip modules'
# Set default
-- bash: echo "##vso[task.setvariable variable=pkg_count]${{ 1 }}"
+- bash: |
+ echo "##vso[task.setvariable variable=pkg_count]${{ 1 }}"
+ echo "##vso[task.setvariable variable=pkgs_to_build]${{ 'all' }}"
# Fetch the target branch so that pr_eval can diff them.
# Seems like azure pipelines/github changed checkout process in nov 2020.
@@ -62,7 +67,7 @@ steps:
displayName: Check if ${{ parameters.build_pkg }} need testing
inputs:
filename: stuart_pr_eval
- arguments: -c ${{ parameters.build_file }} -t ${{
parameters.build_target}} -a ${{ parameters.build_arch}} --pr-target
origin/$(System.PullRequest.targetBranch) --output-count-format-string
"##vso[task.setvariable variable=pkg_count;isOutpout=true]{pkgcount}"
+ arguments: -c ${{ parameters.build_file }} -t ${{
+ parameters.build_target}} -a ${{ parameters.build_arch}} --pr-target
+ origin/$(System.PullRequest.targetBranch) --output-count-format-string
+ "##vso[task.setvariable variable=pkg_count;isOutpout=true]{pkgcount}"
+ --output-csv-format-string "##vso[task.setvariable
+ variable=pkgs_to_build]{pkgcsv}" ${{ parameters.unit_test_list}}
condition: eq(variables['Build.Reason'], 'PullRequest')
# Setup repo
@@ -97,14 +102,22 @@ steps:
inputs:
filename: stuart_build
arguments: -c ${{ parameters.build_file }} TOOL_CHAIN_TAG=${{
parameters.tool_chain_tag}} TARGET=${{ parameters.build_target}} -a ${{
parameters.build_arch}} ${{ parameters.build_flags}}
- condition: and(gt(variables.pkg_count, 0), succeeded())
+ condition: and(and(gt(variables.pkg_count, 0), succeeded()),
+ eq(variables.unit_test_list, ''))
+
+# Build specific pkg for UnitTest
+- task: CmdLine@1
+ displayName: Build UnitTest
+ inputs:
+ filename: stuart_build
+ arguments: ${{ parameters.unit_test_list}} -p $(pkgs_to_build) -c
+${{ parameters.build_file }} TOOL_CHAIN_TAG=${{
+parameters.tool_chain_tag}} TARGET=${{ parameters.build_target}} -a ${{
+parameters.build_arch}} ${{ parameters.build_flags}}
+ condition: and(and(gt(variables.pkg_count, 0), succeeded()),
+not(eq(variables.unit_test_list, '')))
# Run
- task: CmdLine@1
displayName: Run to shell
inputs:
filename: stuart_build
- arguments: -c ${{ parameters.build_file }} TOOL_CHAIN_TAG=${{
parameters.tool_chain_tag}} TARGET=${{ parameters.build_target}} -a ${{
parameters.build_arch}} ${{ parameters.build_flags}} ${{ parameters.run_flags
}} --FlashOnly
+ arguments: -c ${{ parameters.build_file }} TOOL_CHAIN_TAG=${{
+ parameters.tool_chain_tag}} TARGET=${{ parameters.build_target}} -a
+ ${{ parameters.build_arch}} ${{ parameters.build_flags}} ${{
+ parameters.run_flags }} --FlashOnly ${{ parameters.unit_test_list}}
condition: and(and(gt(variables.pkg_count, 0), succeeded()),
eq(variables['Run'], true))
timeoutInMinutes: 1
--
2.31.1.windows.1
-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#96649): https://edk2.groups.io/g/devel/message/96649
Mute This Topic: https://groups.io/mt/95306890/21656
Group Owner: devel+ow...@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
