[Patch v2][edk2-stable202011 0/4] Address EDK II CI Failures

[Patch v2][edk2-stable202011 0/4] Address EDK II CI Failures

[Michael D Kinney]

* Always fetch the target branch of the PR (usually origin/master)
  so diffs between PR and the target branch can be performed. There
  is no guarantee that the target branch is fetched when a PR is
  evaluated by a CI agent.

* QEMU release for Windows from Nov 20, 2020 is installed into
  wrong directory. Use previous QEMU for Windows release from
  Aug 14, 2020.

* Update CryptoPkg unit tests to skip MD5 unit tests if
  ENABLE_MD5_DEPRECATED_INTERFACES is defined.

Cc: Sean Brogan sean.brogan@microsoft.com
Cc: Bret Barkelew Bret.Barkelew@microsoft.com
Cc: Liming Gao gaoliming@byosoft.com.cn
Cc: Jordan Justen jordan.l.justen@intel.com
Cc: Laszlo Ersek lersek@redhat.com
Cc: Ard Biesheuvel ard.biesheuvel@arm.com
Cc: Andrew Fish afish@apple.com
Cc: Leif Lindholm leif@nuviainc.com
Cc: Jiewen Yao jiewen.yao@intel.com
Cc: Jian J Wang jian.j.wang@intel.com
Cc: Xiaoyu Lu xiaoyux.lu@intel.com
Cc: Guomin Jiang guomin.jiang@intel.com
Signed-off-by: Michael D Kinney michael.d.kinney@intel.com

Michael D Kinney (2):
  OvmfPkg/PlatformCI/.azurepiplines: Use stable release of QEMU
  CryptoPkg/Test/UnitTest/Library/BaseCryptLib: Fix MD5 Hash tests

Sean Brogan (2):
  .azurepipelines/templates/pr-gate-steps.yml: Fetch target branch
  .azurepipelines/templates/platform-build-run-steps.yml: Fetch target
    branch

 .azurepipelines/templates/platform-build-run-steps.yml   | 6 ++++++
 .azurepipelines/templates/pr-gate-steps.yml              | 6 ++++++
 CryptoPkg/Test/UnitTest/Library/BaseCryptLib/HashTests.c | 7 ++++++-
 OvmfPkg/PlatformCI/.azurepipelines/Windows-VS2019.yml    | 2 +-
 4 files changed, 19 insertions(+), 2 deletions(-)

-- 
2.29.2.windows.2

[Patch v2][edk2-stable202011 1/4] .azurepipelines/templates/pr-gate-steps.yml: Fetch target branch

[Michael D Kinney]

From: Sean Brogan <sean.brogan@microsoft.com>

Add step to fetch target branch so that PR_EVAL can resolve diff

Cc: Bret Barkelew <Bret.Barkelew@microsoft.com>
Cc: Michael D Kinney <michael.d.kinney@intel.com>
Cc: Liming Gao <gaoliming@byosoft.com.cn>
Signed-off-by: Sean Brogan <sean.brogan@microsoft.com>
Reviewed-by: Michael D Kinney <michael.d.kinney@intel.com>
---
 .azurepipelines/templates/pr-gate-steps.yml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/.azurepipelines/templates/pr-gate-steps.yml b/.azurepipelines/templates/pr-gate-steps.yml
index c1c0c04d6c17..70c19a462194 100644
--- a/.azurepipelines/templates/pr-gate-steps.yml
+++ b/.azurepipelines/templates/pr-gate-steps.yml
@@ -31,6 +31,12 @@ steps:
     echo "##vso[task.setvariable variable=pkgs_to_build]${{ parameters.build_pkgs }}"
     echo "##vso[task.setvariable variable=pkg_count]${{ 1 }}"
 
+# Fetch the target branch so that pr_eval can diff them.
+# Seems like azure pipelines/github changed checkout process in nov 2020.
+- script: git fetch origin $(System.PullRequest.targetBranch)
+  displayName: fetch target branch
+  condition: eq(variables['Build.Reason'], 'PullRequest')
+
 # trim the package list if this is a PR
 - task: CmdLine@1
   displayName: Check if ${{ parameters.build_pkgs }} need testing
-- 
2.29.2.windows.2

[Patch v2][edk2-stable202011 2/4] .azurepipelines/templates/platform-build-run-steps.yml: Fetch target branch

[Michael D Kinney]

From: Sean Brogan <sean.brogan@microsoft.com>

Update Platform build steps process to fetch target branch

Cc: Bret Barkelew <Bret.Barkelew@microsoft.com>
Cc: Michael D Kinney <michael.d.kinney@intel.com>
Cc: Liming Gao <gaoliming@byosoft.com.cn>
Signed-off-by: Sean Brogan <sean.brogan@microsoft.com>
Reviewed-by: Michael D Kinney <michael.d.kinney@intel.com>
---
 .azurepipelines/templates/platform-build-run-steps.yml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/.azurepipelines/templates/platform-build-run-steps.yml b/.azurepipelines/templates/platform-build-run-steps.yml
index ebf674bfc7d8..97e7faa26682 100644
--- a/.azurepipelines/templates/platform-build-run-steps.yml
+++ b/.azurepipelines/templates/platform-build-run-steps.yml
@@ -51,6 +51,12 @@ steps:
 # Set default
 - bash: echo "##vso[task.setvariable variable=pkg_count]${{ 1 }}"
 
+# Fetch the target branch so that pr_eval can diff them.
+# Seems like azure pipelines/github changed checkout process in nov 2020.
+- script: git fetch origin $(System.PullRequest.targetBranch)
+  displayName: fetch target branch
+  condition: eq(variables['Build.Reason'], 'PullRequest')
+
 # trim the package list if this is a PR
 - task: CmdLine@1
   displayName: Check if ${{ parameters.build_pkg }} need testing
-- 
2.29.2.windows.2

[Patch v2][edk2-stable202011 3/4] OvmfPkg/PlatformCI/.azurepiplines: Use stable release of QEMU

[Michael D Kinney]

Install the 2020.08.14 release of QEMU for Windows.

The QEMU release from 2020.11.20 is installed into the incorrect
directory and is causing EDK II CI failures in the run to shell
step.

Cc: Sean Brogan <sean.brogan@microsoft.com>
Cc: Bret Barkelew <Bret.Barkelew@microsoft.com>
Cc: Liming Gao <gaoliming@byosoft.com.cn>
Cc: Jordan Justen <jordan.l.justen@intel.com>
Cc: Laszlo Ersek <lersek@redhat.com>
Cc: Ard Biesheuvel <ard.biesheuvel@arm.com>
Signed-off-by: Michael D Kinney <michael.d.kinney@intel.com>
---
 OvmfPkg/PlatformCI/.azurepipelines/Windows-VS2019.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/OvmfPkg/PlatformCI/.azurepipelines/Windows-VS2019.yml b/OvmfPkg/PlatformCI/.azurepipelines/Windows-VS2019.yml
index 02ed233fdb60..dd19fff50066 100644
--- a/OvmfPkg/PlatformCI/.azurepipelines/Windows-VS2019.yml
+++ b/OvmfPkg/PlatformCI/.azurepipelines/Windows-VS2019.yml
@@ -132,7 +132,7 @@ jobs:
         build_flags: $(Build.Flags)
         run_flags: $(Run.Flags)
         extra_install_step:
-        - powershell: choco install qemu; Write-Host "##vso[task.prependpath]c:\Program Files\qemu"
+        - powershell: choco install qemu --version=2020.08.14; Write-Host "##vso[task.prependpath]c:\Program Files\qemu"
           displayName: Install QEMU and Set QEMU on path # friendly name displayed in the UI
           condition: and(gt(variables.pkg_count, 0), succeeded())
 
-- 
2.29.2.windows.2

[Patch v2][edk2-stable202011 4/4] CryptoPkg/Test/UnitTest/Library/BaseCryptLib: Fix MD5 Hash tests

[Michael D Kinney]

Only include MD5 unit tests if ENABLE_MD5_DEPRECATED_INTERFACES
is defined.

Cc: Jiewen Yao <jiewen.yao@intel.com>
Cc: Jian J Wang <jian.j.wang@intel.com>
Cc: Xiaoyu Lu <xiaoyux.lu@intel.com>
Cc: Guomin Jiang <guomin.jiang@intel.com>
Signed-off-by: Michael D Kinney <michael.d.kinney@intel.com>
---
 CryptoPkg/Test/UnitTest/Library/BaseCryptLib/HashTests.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/CryptoPkg/Test/UnitTest/Library/BaseCryptLib/HashTests.c b/CryptoPkg/Test/UnitTest/Library/BaseCryptLib/HashTests.c
index bc47c5736246..24919053324a 100644
--- a/CryptoPkg/Test/UnitTest/Library/BaseCryptLib/HashTests.c
+++ b/CryptoPkg/Test/UnitTest/Library/BaseCryptLib/HashTests.c
@@ -21,10 +21,11 @@ GLOBAL_REMOVE_IF_UNREFERENCED CONST CHAR8 *HashData = "abc";
 //
 // Result for MD5("abc"). (From "A.5 Test suite" of IETF RFC1321)
 //
+#ifdef ENABLE_MD5_DEPRECATED_INTERFACES
 GLOBAL_REMOVE_IF_UNREFERENCED CONST UINT8 Md5Digest[MD5_DIGEST_SIZE] = {
   0x90, 0x01, 0x50, 0x98, 0x3c, 0xd2, 0x4f, 0xb0, 0xd6, 0x96, 0x3f, 0x7d, 0x28, 0xe1, 0x7f, 0x72
-
   };
+#endif
 
 //
 // Result for SHA-1("abc"). (From "A.1 SHA-1 Example" of NIST FIPS 180-2)
@@ -107,7 +108,9 @@ typedef struct {
   VOID                       *HashCtx;
 } HASH_TEST_CONTEXT;
 
+#ifdef ENABLE_MD5_DEPRECATED_INTERFACES
 HASH_TEST_CONTEXT       mMd5TestCtx    = {MD5_DIGEST_SIZE,    Md5GetContextSize,    Md5Init,    Md5Update,    Md5Final,    Md5HashAll,    Md5Digest};
+#endif
 HASH_TEST_CONTEXT       mSha1TestCtx   = {SHA1_DIGEST_SIZE,   Sha1GetContextSize,   Sha1Init,   Sha1Update,   Sha1Final,   Sha1HashAll,   Sha1Digest};
 HASH_TEST_CONTEXT       mSha256TestCtx = {SHA256_DIGEST_SIZE, Sha256GetContextSize, Sha256Init, Sha256Update, Sha256Final, Sha256HashAll, Sha256Digest};
 HASH_TEST_CONTEXT       mSha384TestCtx = {SHA384_DIGEST_SIZE, Sha384GetContextSize, Sha384Init, Sha384Update, Sha384Final, Sha384HashAll, Sha384Digest};
@@ -187,7 +190,9 @@ TEST_DESC mHashTest[] = {
     //
     // -----Description----------------Class---------------------Function---------------Pre------------------Post------------Context
     //
+#ifdef ENABLE_MD5_DEPRECATED_INTERFACES
     {"TestVerifyMd5()",    "CryptoPkg.BaseCryptLib.Hash",   TestVerifyHash, TestVerifyHashPreReq, TestVerifyHashCleanUp, &mMd5TestCtx},
+#endif
     {"TestVerifySha1()",   "CryptoPkg.BaseCryptLib.Hash",   TestVerifyHash, TestVerifyHashPreReq, TestVerifyHashCleanUp, &mSha1TestCtx},
     {"TestVerifySha256()", "CryptoPkg.BaseCryptLib.Hash",   TestVerifyHash, TestVerifyHashPreReq, TestVerifyHashCleanUp, &mSha256TestCtx},
     {"TestVerifySha384()", "CryptoPkg.BaseCryptLib.Hash",   TestVerifyHash, TestVerifyHashPreReq, TestVerifyHashCleanUp, &mSha384TestCtx},
-- 
2.29.2.windows.2

Re: [edk2-devel] [Patch v2][edk2-stable202011 0/4] Address EDK II CI Failures

[Michael D Kinney]

Hi Liming,

This V2 series also addresses the CryptoPkg unit test failure.

It passed all EDK II CI checks in this PR:

    https://github.com/tianocore/edk2/pull/1144

There are no firmware code changes in this patch series, so I think
it is low risk for the edk2-stable202011 release and should get us
back to a passing CI status.

Best regards,

Mike

> -----Original Message-----
> From: devel@edk2.groups.io <devel@edk2.groups.io> On Behalf Of Michael D Kinney
> Sent: Tuesday, November 24, 2020 9:08 PM
> To: devel@edk2.groups.io
> Subject: [edk2-devel] [Patch v2][edk2-stable202011 0/4] Address EDK II CI Failures
> 
> * Always fetch the target branch of the PR (usually origin/master)
>   so diffs between PR and the target branch can be performed. There
>   is no guarantee that the target branch is fetched when a PR is
>   evaluated by a CI agent.
> 
> * QEMU release for Windows from Nov 20, 2020 is installed into
>   wrong directory. Use previous QEMU for Windows release from
>   Aug 14, 2020.
> 
> * Update CryptoPkg unit tests to skip MD5 unit tests if
>   ENABLE_MD5_DEPRECATED_INTERFACES is defined.
> 
> Cc: Sean Brogan sean.brogan@microsoft.com
> Cc: Bret Barkelew Bret.Barkelew@microsoft.com
> Cc: Liming Gao gaoliming@byosoft.com.cn
> Cc: Jordan Justen jordan.l.justen@intel.com
> Cc: Laszlo Ersek lersek@redhat.com
> Cc: Ard Biesheuvel ard.biesheuvel@arm.com
> Cc: Andrew Fish afish@apple.com
> Cc: Leif Lindholm leif@nuviainc.com
> Cc: Jiewen Yao jiewen.yao@intel.com
> Cc: Jian J Wang jian.j.wang@intel.com
> Cc: Xiaoyu Lu xiaoyux.lu@intel.com
> Cc: Guomin Jiang guomin.jiang@intel.com
> Signed-off-by: Michael D Kinney michael.d.kinney@intel.com
> 
> Michael D Kinney (2):
>   OvmfPkg/PlatformCI/.azurepiplines: Use stable release of QEMU
>   CryptoPkg/Test/UnitTest/Library/BaseCryptLib: Fix MD5 Hash tests
> 
> Sean Brogan (2):
>   .azurepipelines/templates/pr-gate-steps.yml: Fetch target branch
>   .azurepipelines/templates/platform-build-run-steps.yml: Fetch target
>     branch
> 
>  .azurepipelines/templates/platform-build-run-steps.yml   | 6 ++++++
>  .azurepipelines/templates/pr-gate-steps.yml              | 6 ++++++
>  CryptoPkg/Test/UnitTest/Library/BaseCryptLib/HashTests.c | 7 ++++++-
>  OvmfPkg/PlatformCI/.azurepipelines/Windows-VS2019.yml    | 2 +-
>  4 files changed, 19 insertions(+), 2 deletions(-)
> 
> --
> 2.29.2.windows.2
> 
> 
> 
> 
> 

回复: [edk2-devel] [Patch v2][edk2-stable202011 0/4] Address EDK II CI Failures

[gaoliming]

Mike:
  I agree to merge them for this stable tag, because they fix CI issues that block current merge process. 

Thanks
Liming
> -----邮件原件-----
> 发件人: bounce+27952+67936+4905953+8761045@groups.io
> <bounce+27952+67936+4905953+8761045@groups.io> 代表 Michael D
> Kinney
> 发送时间: 2020年11月25日 13:11
> 收件人: devel@edk2.groups.io; Kinney, Michael D
> <michael.d.kinney@intel.com>
> 主题: Re: [edk2-devel] [Patch v2][edk2-stable202011 0/4] Address EDK II CI
> Failures
> 
> Hi Liming,
> 
> This V2 series also addresses the CryptoPkg unit test failure.
> 
> It passed all EDK II CI checks in this PR:
> 
>     https://github.com/tianocore/edk2/pull/1144
> 
> There are no firmware code changes in this patch series, so I think
> it is low risk for the edk2-stable202011 release and should get us
> back to a passing CI status.
> 
> Best regards,
> 
> Mike
> 
> > -----Original Message-----
> > From: devel@edk2.groups.io <devel@edk2.groups.io> On Behalf Of Michael
> D Kinney
> > Sent: Tuesday, November 24, 2020 9:08 PM
> > To: devel@edk2.groups.io
> > Subject: [edk2-devel] [Patch v2][edk2-stable202011 0/4] Address EDK II CI
> Failures
> >
> > * Always fetch the target branch of the PR (usually origin/master)
> >   so diffs between PR and the target branch can be performed. There
> >   is no guarantee that the target branch is fetched when a PR is
> >   evaluated by a CI agent.
> >
> > * QEMU release for Windows from Nov 20, 2020 is installed into
> >   wrong directory. Use previous QEMU for Windows release from
> >   Aug 14, 2020.
> >
> > * Update CryptoPkg unit tests to skip MD5 unit tests if
> >   ENABLE_MD5_DEPRECATED_INTERFACES is defined.
> >
> > Cc: Sean Brogan sean.brogan@microsoft.com
> > Cc: Bret Barkelew Bret.Barkelew@microsoft.com
> > Cc: Liming Gao gaoliming@byosoft.com.cn
> > Cc: Jordan Justen jordan.l.justen@intel.com
> > Cc: Laszlo Ersek lersek@redhat.com
> > Cc: Ard Biesheuvel ard.biesheuvel@arm.com
> > Cc: Andrew Fish afish@apple.com
> > Cc: Leif Lindholm leif@nuviainc.com
> > Cc: Jiewen Yao jiewen.yao@intel.com
> > Cc: Jian J Wang jian.j.wang@intel.com
> > Cc: Xiaoyu Lu xiaoyux.lu@intel.com
> > Cc: Guomin Jiang guomin.jiang@intel.com
> > Signed-off-by: Michael D Kinney michael.d.kinney@intel.com
> >
> > Michael D Kinney (2):
> >   OvmfPkg/PlatformCI/.azurepiplines: Use stable release of QEMU
> >   CryptoPkg/Test/UnitTest/Library/BaseCryptLib: Fix MD5 Hash tests
> >
> > Sean Brogan (2):
> >   .azurepipelines/templates/pr-gate-steps.yml: Fetch target branch
> >   .azurepipelines/templates/platform-build-run-steps.yml: Fetch target
> >     branch
> >
> >  .azurepipelines/templates/platform-build-run-steps.yml   | 6 ++++++
> >  .azurepipelines/templates/pr-gate-steps.yml              | 6 ++++++
> >  CryptoPkg/Test/UnitTest/Library/BaseCryptLib/HashTests.c | 7 ++++++-
> >  OvmfPkg/PlatformCI/.azurepipelines/Windows-VS2019.yml    | 2 +-
> >  4 files changed, 19 insertions(+), 2 deletions(-)
> >
> > --
> > 2.29.2.windows.2
> >
> >
> >
> >
> >
> 
> 
> 
> 
> 

Re: [edk2-devel] [Patch v2][edk2-stable202011 4/4] CryptoPkg/Test/UnitTest/Library/BaseCryptLib: Fix MD5 Hash tests

[Gao, Zhichao]

The patch would disable the MD5 test. Do we need to enable it in the test dsc?

Anyway, Reviewed-by: Zhichao Gao <zhichao.gao@intel.com>

Thanks,
Zhichao

> -----Original Message-----
> From: devel@edk2.groups.io <devel@edk2.groups.io> On Behalf Of Michael D
> Kinney
> Sent: Wednesday, November 25, 2020 1:08 PM
> To: devel@edk2.groups.io
> Cc: Yao, Jiewen <jiewen.yao@intel.com>; Wang, Jian J <jian.j.wang@intel.com>;
> Lu, XiaoyuX <xiaoyux.lu@intel.com>; Jiang, Guomin <guomin.jiang@intel.com>
> Subject: [edk2-devel] [Patch v2][edk2-stable202011 4/4]
> CryptoPkg/Test/UnitTest/Library/BaseCryptLib: Fix MD5 Hash tests
> 
> Only include MD5 unit tests if ENABLE_MD5_DEPRECATED_INTERFACES is
> defined.
> 
> Cc: Jiewen Yao <jiewen.yao@intel.com>
> Cc: Jian J Wang <jian.j.wang@intel.com>
> Cc: Xiaoyu Lu <xiaoyux.lu@intel.com>
> Cc: Guomin Jiang <guomin.jiang@intel.com>
> Signed-off-by: Michael D Kinney <michael.d.kinney@intel.com>
> ---
>  CryptoPkg/Test/UnitTest/Library/BaseCryptLib/HashTests.c | 7 ++++++-
>  1 file changed, 6 insertions(+), 1 deletion(-)
> 
> diff --git a/CryptoPkg/Test/UnitTest/Library/BaseCryptLib/HashTests.c
> b/CryptoPkg/Test/UnitTest/Library/BaseCryptLib/HashTests.c
> index bc47c5736246..24919053324a 100644
> --- a/CryptoPkg/Test/UnitTest/Library/BaseCryptLib/HashTests.c
> +++ b/CryptoPkg/Test/UnitTest/Library/BaseCryptLib/HashTests.c
> @@ -21,10 +21,11 @@ GLOBAL_REMOVE_IF_UNREFERENCED CONST CHAR8
> *HashData = "abc";  //  // Result for MD5("abc"). (From "A.5 Test suite" of IETF
> RFC1321)  //
> +#ifdef ENABLE_MD5_DEPRECATED_INTERFACES
>  GLOBAL_REMOVE_IF_UNREFERENCED CONST UINT8
> Md5Digest[MD5_DIGEST_SIZE] = {
>    0x90, 0x01, 0x50, 0x98, 0x3c, 0xd2, 0x4f, 0xb0, 0xd6, 0x96, 0x3f, 0x7d, 0x28,
> 0xe1, 0x7f, 0x72
> -
>    };
> +#endif
> 
>  //
>  // Result for SHA-1("abc"). (From "A.1 SHA-1 Example" of NIST FIPS 180-2) @@ -
> 107,7 +108,9 @@ typedef struct {
>    VOID                       *HashCtx;
>  } HASH_TEST_CONTEXT;
> 
> +#ifdef ENABLE_MD5_DEPRECATED_INTERFACES
>  HASH_TEST_CONTEXT       mMd5TestCtx    = {MD5_DIGEST_SIZE,
> Md5GetContextSize,    Md5Init,    Md5Update,    Md5Final,    Md5HashAll,
> Md5Digest};
> +#endif
>  HASH_TEST_CONTEXT       mSha1TestCtx   = {SHA1_DIGEST_SIZE,
> Sha1GetContextSize,   Sha1Init,   Sha1Update,   Sha1Final,   Sha1HashAll,
> Sha1Digest};
>  HASH_TEST_CONTEXT       mSha256TestCtx = {SHA256_DIGEST_SIZE,
> Sha256GetContextSize, Sha256Init, Sha256Update, Sha256Final, Sha256HashAll,
> Sha256Digest};
>  HASH_TEST_CONTEXT       mSha384TestCtx = {SHA384_DIGEST_SIZE,
> Sha384GetContextSize, Sha384Init, Sha384Update, Sha384Final, Sha384HashAll,
> Sha384Digest};
> @@ -187,7 +190,9 @@ TEST_DESC mHashTest[] = {
>      //
>      // -----Description----------------Class---------------------Function---------------
> Pre------------------Post------------Context
>      //
> +#ifdef ENABLE_MD5_DEPRECATED_INTERFACES
>      {"TestVerifyMd5()",    "CryptoPkg.BaseCryptLib.Hash",   TestVerifyHash,
> TestVerifyHashPreReq, TestVerifyHashCleanUp, &mMd5TestCtx},
> +#endif
>      {"TestVerifySha1()",   "CryptoPkg.BaseCryptLib.Hash",   TestVerifyHash,
> TestVerifyHashPreReq, TestVerifyHashCleanUp, &mSha1TestCtx},
>      {"TestVerifySha256()", "CryptoPkg.BaseCryptLib.Hash",   TestVerifyHash,
> TestVerifyHashPreReq, TestVerifyHashCleanUp, &mSha256TestCtx},
>      {"TestVerifySha384()", "CryptoPkg.BaseCryptLib.Hash",   TestVerifyHash,
> TestVerifyHashPreReq, TestVerifyHashCleanUp, &mSha384TestCtx},
> --
> 2.29.2.windows.2
> 
> 
> 
> 
> 

Re: [edk2-devel] [Patch v2][edk2-stable202011 3/4] OvmfPkg/PlatformCI/.azurepiplines: Use stable release of QEMU

[Philippe Mathieu-Daudé]

Hi Michael,

On 11/25/20 6:07 AM, Michael D Kinney wrote:
> Install the 2020.08.14 release of QEMU for Windows.
> 
> The QEMU release from 2020.11.20 is installed into the incorrect
> directory and is causing EDK II CI failures in the run to shell
> step.
> 
> Cc: Sean Brogan <sean.brogan@microsoft.com>
> Cc: Bret Barkelew <Bret.Barkelew@microsoft.com>
> Cc: Liming Gao <gaoliming@byosoft.com.cn>
> Cc: Jordan Justen <jordan.l.justen@intel.com>
> Cc: Laszlo Ersek <lersek@redhat.com>
> Cc: Ard Biesheuvel <ard.biesheuvel@arm.com>
> Signed-off-by: Michael D Kinney <michael.d.kinney@intel.com>
> ---
>  OvmfPkg/PlatformCI/.azurepipelines/Windows-VS2019.yml | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/OvmfPkg/PlatformCI/.azurepipelines/Windows-VS2019.yml b/OvmfPkg/PlatformCI/.azurepipelines/Windows-VS2019.yml
> index 02ed233fdb60..dd19fff50066 100644
> --- a/OvmfPkg/PlatformCI/.azurepipelines/Windows-VS2019.yml
> +++ b/OvmfPkg/PlatformCI/.azurepipelines/Windows-VS2019.yml
> @@ -132,7 +132,7 @@ jobs:
>          build_flags: $(Build.Flags)
>          run_flags: $(Run.Flags)
>          extra_install_step:
> -        - powershell: choco install qemu; Write-Host "##vso[task.prependpath]c:\Program Files\qemu"
> +        - powershell: choco install qemu --version=2020.08.14; Write-Host "##vso[task.prependpath]c:\Program Files\qemu"

Is it fixed with 20201124?

Reviewed-by: Philippe Mathieu-Daude <philmd@redhat.com>

>            displayName: Install QEMU and Set QEMU on path # friendly name displayed in the UI
>            condition: and(gt(variables.pkg_count, 0), succeeded())
>  
> 

Re: [Patch v2][edk2-stable202011 4/4] CryptoPkg/Test/UnitTest/Library/BaseCryptLib: Fix MD5 Hash tests

[Yao, Jiewen]

Reviewed-by: Jiewen Yao <Jiewen.yao@intel.com>

> -----Original Message-----
> From: Michael D Kinney <michael.d.kinney@intel.com>
> Sent: Wednesday, November 25, 2020 1:08 PM
> To: devel@edk2.groups.io
> Cc: Yao, Jiewen <jiewen.yao@intel.com>; Wang, Jian J
> <jian.j.wang@intel.com>; Lu, XiaoyuX <xiaoyux.lu@intel.com>; Jiang,
> Guomin <guomin.jiang@intel.com>
> Subject: [Patch v2][edk2-stable202011 4/4]
> CryptoPkg/Test/UnitTest/Library/BaseCryptLib: Fix MD5 Hash tests
> 
> Only include MD5 unit tests if ENABLE_MD5_DEPRECATED_INTERFACES
> is defined.
> 
> Cc: Jiewen Yao <jiewen.yao@intel.com>
> Cc: Jian J Wang <jian.j.wang@intel.com>
> Cc: Xiaoyu Lu <xiaoyux.lu@intel.com>
> Cc: Guomin Jiang <guomin.jiang@intel.com>
> Signed-off-by: Michael D Kinney <michael.d.kinney@intel.com>
> ---
>  CryptoPkg/Test/UnitTest/Library/BaseCryptLib/HashTests.c | 7 ++++++-
>  1 file changed, 6 insertions(+), 1 deletion(-)
> 
> diff --git a/CryptoPkg/Test/UnitTest/Library/BaseCryptLib/HashTests.c
> b/CryptoPkg/Test/UnitTest/Library/BaseCryptLib/HashTests.c
> index bc47c5736246..24919053324a 100644
> --- a/CryptoPkg/Test/UnitTest/Library/BaseCryptLib/HashTests.c
> +++ b/CryptoPkg/Test/UnitTest/Library/BaseCryptLib/HashTests.c
> @@ -21,10 +21,11 @@ GLOBAL_REMOVE_IF_UNREFERENCED CONST CHAR8
> *HashData = "abc";
>  //
>  // Result for MD5("abc"). (From "A.5 Test suite" of IETF RFC1321)
>  //
> +#ifdef ENABLE_MD5_DEPRECATED_INTERFACES
>  GLOBAL_REMOVE_IF_UNREFERENCED CONST UINT8
> Md5Digest[MD5_DIGEST_SIZE] = {
>    0x90, 0x01, 0x50, 0x98, 0x3c, 0xd2, 0x4f, 0xb0, 0xd6, 0x96, 0x3f, 0x7d, 0x28,
> 0xe1, 0x7f, 0x72
> -
>    };
> +#endif
> 
>  //
>  // Result for SHA-1("abc"). (From "A.1 SHA-1 Example" of NIST FIPS 180-2)
> @@ -107,7 +108,9 @@ typedef struct {
>    VOID                       *HashCtx;
>  } HASH_TEST_CONTEXT;
> 
> +#ifdef ENABLE_MD5_DEPRECATED_INTERFACES
>  HASH_TEST_CONTEXT       mMd5TestCtx    = {MD5_DIGEST_SIZE,
> Md5GetContextSize,    Md5Init,    Md5Update,    Md5Final,    Md5HashAll,
> Md5Digest};
> +#endif
>  HASH_TEST_CONTEXT       mSha1TestCtx   = {SHA1_DIGEST_SIZE,
> Sha1GetContextSize,   Sha1Init,   Sha1Update,   Sha1Final,   Sha1HashAll,
> Sha1Digest};
>  HASH_TEST_CONTEXT       mSha256TestCtx = {SHA256_DIGEST_SIZE,
> Sha256GetContextSize, Sha256Init, Sha256Update, Sha256Final,
> Sha256HashAll, Sha256Digest};
>  HASH_TEST_CONTEXT       mSha384TestCtx = {SHA384_DIGEST_SIZE,
> Sha384GetContextSize, Sha384Init, Sha384Update, Sha384Final,
> Sha384HashAll, Sha384Digest};
> @@ -187,7 +190,9 @@ TEST_DESC mHashTest[] = {
>      //
>      // -----Description----------------Class---------------------Function---------------
> Pre------------------Post------------Context
>      //
> +#ifdef ENABLE_MD5_DEPRECATED_INTERFACES
>      {"TestVerifyMd5()",    "CryptoPkg.BaseCryptLib.Hash",   TestVerifyHash,
> TestVerifyHashPreReq, TestVerifyHashCleanUp, &mMd5TestCtx},
> +#endif
>      {"TestVerifySha1()",   "CryptoPkg.BaseCryptLib.Hash",   TestVerifyHash,
> TestVerifyHashPreReq, TestVerifyHashCleanUp, &mSha1TestCtx},
>      {"TestVerifySha256()", "CryptoPkg.BaseCryptLib.Hash",   TestVerifyHash,
> TestVerifyHashPreReq, TestVerifyHashCleanUp, &mSha256TestCtx},
>      {"TestVerifySha384()", "CryptoPkg.BaseCryptLib.Hash",   TestVerifyHash,
> TestVerifyHashPreReq, TestVerifyHashCleanUp, &mSha384TestCtx},
> --
> 2.29.2.windows.2

Re: [Patch v2][edk2-stable202011 3/4] OvmfPkg/PlatformCI/.azurepiplines: Use stable release of QEMU

[Laszlo Ersek]

On 11/25/20 06:07, Michael D Kinney wrote:
> Install the 2020.08.14 release of QEMU for Windows.
> 
> The QEMU release from 2020.11.20 is installed into the incorrect
> directory and is causing EDK II CI failures in the run to shell
> step.
> 
> Cc: Sean Brogan <sean.brogan@microsoft.com>
> Cc: Bret Barkelew <Bret.Barkelew@microsoft.com>
> Cc: Liming Gao <gaoliming@byosoft.com.cn>
> Cc: Jordan Justen <jordan.l.justen@intel.com>
> Cc: Laszlo Ersek <lersek@redhat.com>
> Cc: Ard Biesheuvel <ard.biesheuvel@arm.com>
> Signed-off-by: Michael D Kinney <michael.d.kinney@intel.com>
> ---
>  OvmfPkg/PlatformCI/.azurepipelines/Windows-VS2019.yml | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/OvmfPkg/PlatformCI/.azurepipelines/Windows-VS2019.yml b/OvmfPkg/PlatformCI/.azurepipelines/Windows-VS2019.yml
> index 02ed233fdb60..dd19fff50066 100644
> --- a/OvmfPkg/PlatformCI/.azurepipelines/Windows-VS2019.yml
> +++ b/OvmfPkg/PlatformCI/.azurepipelines/Windows-VS2019.yml
> @@ -132,7 +132,7 @@ jobs:
>          build_flags: $(Build.Flags)
>          run_flags: $(Run.Flags)
>          extra_install_step:
> -        - powershell: choco install qemu; Write-Host "##vso[task.prependpath]c:\Program Files\qemu"
> +        - powershell: choco install qemu --version=2020.08.14; Write-Host "##vso[task.prependpath]c:\Program Files\qemu"
>            displayName: Install QEMU and Set QEMU on path # friendly name displayed in the UI
>            condition: and(gt(variables.pkg_count, 0), succeeded())
>  
> 

Acked-by: Laszlo Ersek <lersek@redhat.com>

Re: [edk2-devel] [Patch v2][edk2-stable202011 3/4] OvmfPkg/PlatformCI/.azurepiplines: Use stable release of QEMU

[Rebecca Cran]

Related, should we use a known version of Ubuntu in testing?

Currently, there are several lines with 'ubuntu-latest' - e.g.:

.azurepipelines/Ubuntu-GCC5.yml:17:    vm_image: 'ubuntu-latest'
.azurepipelines/Ubuntu-PatchCheck.yml:21:  vmImage: 'ubuntu-latest'

OvmfPkg/PlatformCI/.azurepipelines/Ubuntu-GCC5.yml:20: vm_image: 
'ubuntu-latest'


I'm not familiar with how Azure works, but could this cause problems 
when they update their Ubuntu latest image to 21.04 etc. and things 
change under us?


-- 
Rebecca Cran


On 11/24/20 10:07 PM, Michael D Kinney wrote:
> Install the 2020.08.14 release of QEMU for Windows.
>
> The QEMU release from 2020.11.20 is installed into the incorrect
> directory and is causing EDK II CI failures in the run to shell
> step.
>
> Cc: Sean Brogan <sean.brogan@microsoft.com>
> Cc: Bret Barkelew <Bret.Barkelew@microsoft.com>
> Cc: Liming Gao <gaoliming@byosoft.com.cn>
> Cc: Jordan Justen <jordan.l.justen@intel.com>
> Cc: Laszlo Ersek <lersek@redhat.com>
> Cc: Ard Biesheuvel <ard.biesheuvel@arm.com>
> Signed-off-by: Michael D Kinney <michael.d.kinney@intel.com>
> ---
>   OvmfPkg/PlatformCI/.azurepipelines/Windows-VS2019.yml | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/OvmfPkg/PlatformCI/.azurepipelines/Windows-VS2019.yml b/OvmfPkg/PlatformCI/.azurepipelines/Windows-VS2019.yml
> index 02ed233fdb60..dd19fff50066 100644
> --- a/OvmfPkg/PlatformCI/.azurepipelines/Windows-VS2019.yml
> +++ b/OvmfPkg/PlatformCI/.azurepipelines/Windows-VS2019.yml
> @@ -132,7 +132,7 @@ jobs:
>           build_flags: $(Build.Flags)
>           run_flags: $(Run.Flags)
>           extra_install_step:
> -        - powershell: choco install qemu; Write-Host "##vso[task.prependpath]c:\Program Files\qemu"
> +        - powershell: choco install qemu --version=2020.08.14; Write-Host "##vso[task.prependpath]c:\Program Files\qemu"
>             displayName: Install QEMU and Set QEMU on path # friendly name displayed in the UI
>             condition: and(gt(variables.pkg_count, 0), succeeded())
>   

Re: [edk2-devel] [Patch v2][edk2-stable202011 3/4] OvmfPkg/PlatformCI/.azurepiplines: Use stable release of QEMU

[Michael D Kinney]

Hi Rebecca,

I think the general approach is to verify the latest version of everything
including the CI infrastructure components.

If a failure is detected due to a new component, then we can temporarily 
lock in a previous stable version until the issues with the new component
are resolved.

Mike

> -----Original Message-----
> From: devel@edk2.groups.io <devel@edk2.groups.io> On Behalf Of Rebecca Cran
> Sent: Wednesday, November 25, 2020 6:58 AM
> To: devel@edk2.groups.io; Kinney, Michael D <michael.d.kinney@intel.com>
> Cc: Sean Brogan <sean.brogan@microsoft.com>; Bret Barkelew <Bret.Barkelew@microsoft.com>; Liming Gao
> <gaoliming@byosoft.com.cn>; Justen, Jordan L <jordan.l.justen@intel.com>; Laszlo Ersek <lersek@redhat.com>; Ard Biesheuvel
> <ard.biesheuvel@arm.com>
> Subject: Re: [edk2-devel] [Patch v2][edk2-stable202011 3/4] OvmfPkg/PlatformCI/.azurepiplines: Use stable release of QEMU
> 
> Related, should we use a known version of Ubuntu in testing?
> 
> Currently, there are several lines with 'ubuntu-latest' - e.g.:
> 
> .azurepipelines/Ubuntu-GCC5.yml:17:    vm_image: 'ubuntu-latest'
> .azurepipelines/Ubuntu-PatchCheck.yml:21:  vmImage: 'ubuntu-latest'
> 
> OvmfPkg/PlatformCI/.azurepipelines/Ubuntu-GCC5.yml:20: vm_image:
> 'ubuntu-latest'
> 
> 
> I'm not familiar with how Azure works, but could this cause problems
> when they update their Ubuntu latest image to 21.04 etc. and things
> change under us?
> 
> 
> --
> Rebecca Cran
> 
> 
> On 11/24/20 10:07 PM, Michael D Kinney wrote:
> > Install the 2020.08.14 release of QEMU for Windows.
> >
> > The QEMU release from 2020.11.20 is installed into the incorrect
> > directory and is causing EDK II CI failures in the run to shell
> > step.
> >
> > Cc: Sean Brogan <sean.brogan@microsoft.com>
> > Cc: Bret Barkelew <Bret.Barkelew@microsoft.com>
> > Cc: Liming Gao <gaoliming@byosoft.com.cn>
> > Cc: Jordan Justen <jordan.l.justen@intel.com>
> > Cc: Laszlo Ersek <lersek@redhat.com>
> > Cc: Ard Biesheuvel <ard.biesheuvel@arm.com>
> > Signed-off-by: Michael D Kinney <michael.d.kinney@intel.com>
> > ---
> >   OvmfPkg/PlatformCI/.azurepipelines/Windows-VS2019.yml | 2 +-
> >   1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > diff --git a/OvmfPkg/PlatformCI/.azurepipelines/Windows-VS2019.yml b/OvmfPkg/PlatformCI/.azurepipelines/Windows-
> VS2019.yml
> > index 02ed233fdb60..dd19fff50066 100644
> > --- a/OvmfPkg/PlatformCI/.azurepipelines/Windows-VS2019.yml
> > +++ b/OvmfPkg/PlatformCI/.azurepipelines/Windows-VS2019.yml
> > @@ -132,7 +132,7 @@ jobs:
> >           build_flags: $(Build.Flags)
> >           run_flags: $(Run.Flags)
> >           extra_install_step:
> > -        - powershell: choco install qemu; Write-Host "##vso[task.prependpath]c:\Program Files\qemu"
> > +        - powershell: choco install qemu --version=2020.08.14; Write-Host "##vso[task.prependpath]c:\Program
> Files\qemu"
> >             displayName: Install QEMU and Set QEMU on path # friendly name displayed in the UI
> >             condition: and(gt(variables.pkg_count, 0), succeeded())
> >
> 
> 
> 
> 

Re: [edk2-devel] [Patch v2][edk2-stable202011 3/4] OvmfPkg/PlatformCI/.azurepiplines: Use stable release of QEMU

[Michael D Kinney]

Hi Phillippe,

We use choco command to install qemu for Windows, and as of this morning, the 20201124
release has not been published on choco.

	https://chocolatey.org/packages/Qemu

Once it is published on choco, we can test it and if it passes, we can revert this 
change and resume using the latest qemu release.

Mike

> -----Original Message-----
> From: Philippe Mathieu-Daudé <philmd@redhat.com>
> Sent: Wednesday, November 25, 2020 12:02 AM
> To: devel@edk2.groups.io; Kinney, Michael D <michael.d.kinney@intel.com>
> Cc: Sean Brogan <sean.brogan@microsoft.com>; Bret Barkelew <Bret.Barkelew@microsoft.com>; Liming Gao
> <gaoliming@byosoft.com.cn>; Justen, Jordan L <jordan.l.justen@intel.com>; Laszlo Ersek <lersek@redhat.com>; Ard Biesheuvel
> <ard.biesheuvel@arm.com>
> Subject: Re: [edk2-devel] [Patch v2][edk2-stable202011 3/4] OvmfPkg/PlatformCI/.azurepiplines: Use stable release of QEMU
> 
> Hi Michael,
> 
> On 11/25/20 6:07 AM, Michael D Kinney wrote:
> > Install the 2020.08.14 release of QEMU for Windows.
> >
> > The QEMU release from 2020.11.20 is installed into the incorrect
> > directory and is causing EDK II CI failures in the run to shell
> > step.
> >
> > Cc: Sean Brogan <sean.brogan@microsoft.com>
> > Cc: Bret Barkelew <Bret.Barkelew@microsoft.com>
> > Cc: Liming Gao <gaoliming@byosoft.com.cn>
> > Cc: Jordan Justen <jordan.l.justen@intel.com>
> > Cc: Laszlo Ersek <lersek@redhat.com>
> > Cc: Ard Biesheuvel <ard.biesheuvel@arm.com>
> > Signed-off-by: Michael D Kinney <michael.d.kinney@intel.com>
> > ---
> >  OvmfPkg/PlatformCI/.azurepipelines/Windows-VS2019.yml | 2 +-
> >  1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > diff --git a/OvmfPkg/PlatformCI/.azurepipelines/Windows-VS2019.yml b/OvmfPkg/PlatformCI/.azurepipelines/Windows-
> VS2019.yml
> > index 02ed233fdb60..dd19fff50066 100644
> > --- a/OvmfPkg/PlatformCI/.azurepipelines/Windows-VS2019.yml
> > +++ b/OvmfPkg/PlatformCI/.azurepipelines/Windows-VS2019.yml
> > @@ -132,7 +132,7 @@ jobs:
> >          build_flags: $(Build.Flags)
> >          run_flags: $(Run.Flags)
> >          extra_install_step:
> > -        - powershell: choco install qemu; Write-Host "##vso[task.prependpath]c:\Program Files\qemu"
> > +        - powershell: choco install qemu --version=2020.08.14; Write-Host "##vso[task.prependpath]c:\Program
> Files\qemu"
> 
> Is it fixed with 20201124?
> 
> Reviewed-by: Philippe Mathieu-Daude <philmd@redhat.com>
> 
> >            displayName: Install QEMU and Set QEMU on path # friendly name displayed in the UI
> >            condition: and(gt(variables.pkg_count, 0), succeeded())
> >
> >

Re: [edk2-devel] [Patch v2][edk2-stable202011 4/4] CryptoPkg/Test/UnitTest/Library/BaseCryptLib: Fix MD5 Hash tests

[Michael D Kinney]

Zhichao,

That is a good point.  The CryptoPkg now disables MD5 services by default and a 
platform may choose to enable MD5 services by defining ENABLE_MD5_DEPRECATED_INTERFACES.

It would be good if the host based unit tests continue to perform unit tests on MD5
services in case a platform chooses to enable them.

We can add the following lines from CryptoPkg.dsc to Test/CryptoPkgHostUnitTest.dsc 
so the MD5 unit tests are always executed.

[BuildOptions]
  *_*_*_CC_FLAGS       = -D DISABLE_NEW_DEPRECATED_INTERFACES
  MSFT:*_*_*_CC_FLAGS  = /D ENABLE_MD5_DEPRECATED_INTERFACES
  INTEL:*_*_*_CC_FLAGS = /D ENABLE_MD5_DEPRECATED_INTERFACES
  GCC:*_*_*_CC_FLAGS   = -D ENABLE_MD5_DEPRECATED_INTERFACES
  RVCT:*_*_*_CC_FLAGS  = -DENABLE_MD5_DEPRECATED_INTERFACES

Best regards,

Mike

> -----Original Message-----
> From: Gao, Zhichao <zhichao.gao@intel.com>
> Sent: Tuesday, November 24, 2020 11:31 PM
> To: devel@edk2.groups.io; Kinney, Michael D <michael.d.kinney@intel.com>
> Cc: Yao, Jiewen <jiewen.yao@intel.com>; Wang, Jian J <jian.j.wang@intel.com>; Lu, XiaoyuX <xiaoyux.lu@intel.com>; Jiang,
> Guomin <guomin.jiang@intel.com>
> Subject: RE: [edk2-devel] [Patch v2][edk2-stable202011 4/4] CryptoPkg/Test/UnitTest/Library/BaseCryptLib: Fix MD5 Hash
> tests
> 
> The patch would disable the MD5 test. Do we need to enable it in the test dsc?
> 
> Anyway, Reviewed-by: Zhichao Gao <zhichao.gao@intel.com>
> 
> Thanks,
> Zhichao
> 
> > -----Original Message-----
> > From: devel@edk2.groups.io <devel@edk2.groups.io> On Behalf Of Michael D
> > Kinney
> > Sent: Wednesday, November 25, 2020 1:08 PM
> > To: devel@edk2.groups.io
> > Cc: Yao, Jiewen <jiewen.yao@intel.com>; Wang, Jian J <jian.j.wang@intel.com>;
> > Lu, XiaoyuX <xiaoyux.lu@intel.com>; Jiang, Guomin <guomin.jiang@intel.com>
> > Subject: [edk2-devel] [Patch v2][edk2-stable202011 4/4]
> > CryptoPkg/Test/UnitTest/Library/BaseCryptLib: Fix MD5 Hash tests
> >
> > Only include MD5 unit tests if ENABLE_MD5_DEPRECATED_INTERFACES is
> > defined.
> >
> > Cc: Jiewen Yao <jiewen.yao@intel.com>
> > Cc: Jian J Wang <jian.j.wang@intel.com>
> > Cc: Xiaoyu Lu <xiaoyux.lu@intel.com>
> > Cc: Guomin Jiang <guomin.jiang@intel.com>
> > Signed-off-by: Michael D Kinney <michael.d.kinney@intel.com>
> > ---
> >  CryptoPkg/Test/UnitTest/Library/BaseCryptLib/HashTests.c | 7 ++++++-
> >  1 file changed, 6 insertions(+), 1 deletion(-)
> >
> > diff --git a/CryptoPkg/Test/UnitTest/Library/BaseCryptLib/HashTests.c
> > b/CryptoPkg/Test/UnitTest/Library/BaseCryptLib/HashTests.c
> > index bc47c5736246..24919053324a 100644
> > --- a/CryptoPkg/Test/UnitTest/Library/BaseCryptLib/HashTests.c
> > +++ b/CryptoPkg/Test/UnitTest/Library/BaseCryptLib/HashTests.c
> > @@ -21,10 +21,11 @@ GLOBAL_REMOVE_IF_UNREFERENCED CONST CHAR8
> > *HashData = "abc";  //  // Result for MD5("abc"). (From "A.5 Test suite" of IETF
> > RFC1321)  //
> > +#ifdef ENABLE_MD5_DEPRECATED_INTERFACES
> >  GLOBAL_REMOVE_IF_UNREFERENCED CONST UINT8
> > Md5Digest[MD5_DIGEST_SIZE] = {
> >    0x90, 0x01, 0x50, 0x98, 0x3c, 0xd2, 0x4f, 0xb0, 0xd6, 0x96, 0x3f, 0x7d, 0x28,
> > 0xe1, 0x7f, 0x72
> > -
> >    };
> > +#endif
> >
> >  //
> >  // Result for SHA-1("abc"). (From "A.1 SHA-1 Example" of NIST FIPS 180-2) @@ -
> > 107,7 +108,9 @@ typedef struct {
> >    VOID                       *HashCtx;
> >  } HASH_TEST_CONTEXT;
> >
> > +#ifdef ENABLE_MD5_DEPRECATED_INTERFACES
> >  HASH_TEST_CONTEXT       mMd5TestCtx    = {MD5_DIGEST_SIZE,
> > Md5GetContextSize,    Md5Init,    Md5Update,    Md5Final,    Md5HashAll,
> > Md5Digest};
> > +#endif
> >  HASH_TEST_CONTEXT       mSha1TestCtx   = {SHA1_DIGEST_SIZE,
> > Sha1GetContextSize,   Sha1Init,   Sha1Update,   Sha1Final,   Sha1HashAll,
> > Sha1Digest};
> >  HASH_TEST_CONTEXT       mSha256TestCtx = {SHA256_DIGEST_SIZE,
> > Sha256GetContextSize, Sha256Init, Sha256Update, Sha256Final, Sha256HashAll,
> > Sha256Digest};
> >  HASH_TEST_CONTEXT       mSha384TestCtx = {SHA384_DIGEST_SIZE,
> > Sha384GetContextSize, Sha384Init, Sha384Update, Sha384Final, Sha384HashAll,
> > Sha384Digest};
> > @@ -187,7 +190,9 @@ TEST_DESC mHashTest[] = {
> >      //
> >      // -----Description----------------Class---------------------Function---------------
> > Pre------------------Post------------Context
> >      //
> > +#ifdef ENABLE_MD5_DEPRECATED_INTERFACES
> >      {"TestVerifyMd5()",    "CryptoPkg.BaseCryptLib.Hash",   TestVerifyHash,
> > TestVerifyHashPreReq, TestVerifyHashCleanUp, &mMd5TestCtx},
> > +#endif
> >      {"TestVerifySha1()",   "CryptoPkg.BaseCryptLib.Hash",   TestVerifyHash,
> > TestVerifyHashPreReq, TestVerifyHashCleanUp, &mSha1TestCtx},
> >      {"TestVerifySha256()", "CryptoPkg.BaseCryptLib.Hash",   TestVerifyHash,
> > TestVerifyHashPreReq, TestVerifyHashCleanUp, &mSha256TestCtx},
> >      {"TestVerifySha384()", "CryptoPkg.BaseCryptLib.Hash",   TestVerifyHash,
> > TestVerifyHashPreReq, TestVerifyHashCleanUp, &mSha384TestCtx},
> > --
> > 2.29.2.windows.2
> >
> >
> >
> > 
> >

Re: [edk2-devel] [Patch v2][edk2-stable202011 0/4] Address EDK II CI Failures

[Michael D Kinney]

Merged as commits
    791fb98ef077d29573a24999c03997c174086049
    655084f8f79d73b08d2604b9b279bfc48a01b904
    1064f5c2c8a0128a98c060e7e3eb5334fae88e51
    6d614fd5921f42ce60fe1adfd80cf9a7998dc645

via
    https://github.com/tianocore/edk2/pull/1145


With these commits the EDK II CI Status is all green

    https://github.com/tianocore/edk2/blob/master/ReadMe.rst

Thanks,

Mike


> -----Original Message-----
> From: devel@edk2.groups.io <devel@edk2.groups.io> On Behalf Of gaoliming
> Sent: Tuesday, November 24, 2020 9:32 PM
> To: devel@edk2.groups.io; Kinney, Michael D <michael.d.kinney@intel.com>
> Cc: 'Laszlo Ersek' <lersek@redhat.com>; 'Leif Lindholm' <leif@nuviainc.com>; 'Andrew Fish' <afish@apple.com>
> Subject: 回复: [edk2-devel] [Patch v2][edk2-stable202011 0/4] Address EDK II CI Failures
> 
> Mike:
>   I agree to merge them for this stable tag, because they fix CI issues that block current merge process.
> 
> Thanks
> Liming
> > -----邮件原件-----
> > 发件人: bounce+27952+67936+4905953+8761045@groups.io
> > <bounce+27952+67936+4905953+8761045@groups.io> 代表 Michael D
> > Kinney
> > 发送时间: 2020年11月25日 13:11
> > 收件人: devel@edk2.groups.io; Kinney, Michael D
> > <michael.d.kinney@intel.com>
> > 主题: Re: [edk2-devel] [Patch v2][edk2-stable202011 0/4] Address EDK II CI
> > Failures
> >
> > Hi Liming,
> >
> > This V2 series also addresses the CryptoPkg unit test failure.
> >
> > It passed all EDK II CI checks in this PR:
> >
> >     https://github.com/tianocore/edk2/pull/1144
> >
> > There are no firmware code changes in this patch series, so I think
> > it is low risk for the edk2-stable202011 release and should get us
> > back to a passing CI status.
> >
> > Best regards,
> >
> > Mike
> >
> > > -----Original Message-----
> > > From: devel@edk2.groups.io <devel@edk2.groups.io> On Behalf Of Michael
> > D Kinney
> > > Sent: Tuesday, November 24, 2020 9:08 PM
> > > To: devel@edk2.groups.io
> > > Subject: [edk2-devel] [Patch v2][edk2-stable202011 0/4] Address EDK II CI
> > Failures
> > >
> > > * Always fetch the target branch of the PR (usually origin/master)
> > >   so diffs between PR and the target branch can be performed. There
> > >   is no guarantee that the target branch is fetched when a PR is
> > >   evaluated by a CI agent.
> > >
> > > * QEMU release for Windows from Nov 20, 2020 is installed into
> > >   wrong directory. Use previous QEMU for Windows release from
> > >   Aug 14, 2020.
> > >
> > > * Update CryptoPkg unit tests to skip MD5 unit tests if
> > >   ENABLE_MD5_DEPRECATED_INTERFACES is defined.
> > >
> > > Cc: Sean Brogan sean.brogan@microsoft.com
> > > Cc: Bret Barkelew Bret.Barkelew@microsoft.com
> > > Cc: Liming Gao gaoliming@byosoft.com.cn
> > > Cc: Jordan Justen jordan.l.justen@intel.com
> > > Cc: Laszlo Ersek lersek@redhat.com
> > > Cc: Ard Biesheuvel ard.biesheuvel@arm.com
> > > Cc: Andrew Fish afish@apple.com
> > > Cc: Leif Lindholm leif@nuviainc.com
> > > Cc: Jiewen Yao jiewen.yao@intel.com
> > > Cc: Jian J Wang jian.j.wang@intel.com
> > > Cc: Xiaoyu Lu xiaoyux.lu@intel.com
> > > Cc: Guomin Jiang guomin.jiang@intel.com
> > > Signed-off-by: Michael D Kinney michael.d.kinney@intel.com
> > >
> > > Michael D Kinney (2):
> > >   OvmfPkg/PlatformCI/.azurepiplines: Use stable release of QEMU
> > >   CryptoPkg/Test/UnitTest/Library/BaseCryptLib: Fix MD5 Hash tests
> > >
> > > Sean Brogan (2):
> > >   .azurepipelines/templates/pr-gate-steps.yml: Fetch target branch
> > >   .azurepipelines/templates/platform-build-run-steps.yml: Fetch target
> > >     branch
> > >
> > >  .azurepipelines/templates/platform-build-run-steps.yml   | 6 ++++++
> > >  .azurepipelines/templates/pr-gate-steps.yml              | 6 ++++++
> > >  CryptoPkg/Test/UnitTest/Library/BaseCryptLib/HashTests.c | 7 ++++++-
> > >  OvmfPkg/PlatformCI/.azurepipelines/Windows-VS2019.yml    | 2 +-
> > >  4 files changed, 19 insertions(+), 2 deletions(-)
> > >
> > > --
> > > 2.29.2.windows.2
> > >
> > >
> > >
> > >
> > >
> >
> >
> >
> >
> >
> 
> 
> 
> 
> 
> 
> 

Re: [edk2-devel] [Patch v2][edk2-stable202011 3/4] OvmfPkg/PlatformCI/.azurepiplines: Use stable release of QEMU

[Rebecca Cran]

[-- Attachment #1: Type: text/plain, Size: 3779 bytes --]

Hi Mike,


That does appear to be the current general approach, but I'd suggest 
changing it.

Because in the last week before release we shouldn't be chasing new 
versions of unrelated software, in my opinion.


Fortunately the switch to Ubuntu 20.04 hasn't happened yet, and is due 
to be rolled out beginning November 30th 
(https://github.com/actions/virtual-environments/issues/1816). The CI 
pipeline has a set of warnings: "##[warning]Ubuntu-latest pipelines will 
use Ubuntu-20.04 soon. For more details, see 
https://github.com/actions/virtual-environments/issues/1816"


-- 
Rebecca Cran


On 11/25/20 9:20 AM, Michael D Kinney wrote:

> Hi Rebecca,
>
> I think the general approach is to verify the latest version of everything
> including the CI infrastructure components.
>
> If a failure is detected due to a new component, then we can temporarily
> lock in a previous stable version until the issues with the new component
> are resolved.
>
> Mike
>
>> -----Original Message-----
>> From: devel@edk2.groups.io <devel@edk2.groups.io> On Behalf Of Rebecca Cran
>> Sent: Wednesday, November 25, 2020 6:58 AM
>> To: devel@edk2.groups.io; Kinney, Michael D <michael.d.kinney@intel.com>
>> Cc: Sean Brogan <sean.brogan@microsoft.com>; Bret Barkelew <Bret.Barkelew@microsoft.com>; Liming Gao
>> <gaoliming@byosoft.com.cn>; Justen, Jordan L <jordan.l.justen@intel.com>; Laszlo Ersek <lersek@redhat.com>; Ard Biesheuvel
>> <ard.biesheuvel@arm.com>
>> Subject: Re: [edk2-devel] [Patch v2][edk2-stable202011 3/4] OvmfPkg/PlatformCI/.azurepiplines: Use stable release of QEMU
>>
>> Related, should we use a known version of Ubuntu in testing?
>>
>> Currently, there are several lines with 'ubuntu-latest' - e.g.:
>>
>> .azurepipelines/Ubuntu-GCC5.yml:17:    vm_image: 'ubuntu-latest'
>> .azurepipelines/Ubuntu-PatchCheck.yml:21:  vmImage: 'ubuntu-latest'
>>
>> OvmfPkg/PlatformCI/.azurepipelines/Ubuntu-GCC5.yml:20: vm_image:
>> 'ubuntu-latest'
>>
>>
>> I'm not familiar with how Azure works, but could this cause problems
>> when they update their Ubuntu latest image to 21.04 etc. and things
>> change under us?
>>
>>
>> --
>> Rebecca Cran
>>
>>
>> On 11/24/20 10:07 PM, Michael D Kinney wrote:
>>> Install the 2020.08.14 release of QEMU for Windows.
>>>
>>> The QEMU release from 2020.11.20 is installed into the incorrect
>>> directory and is causing EDK II CI failures in the run to shell
>>> step.
>>>
>>> Cc: Sean Brogan <sean.brogan@microsoft.com>
>>> Cc: Bret Barkelew <Bret.Barkelew@microsoft.com>
>>> Cc: Liming Gao <gaoliming@byosoft.com.cn>
>>> Cc: Jordan Justen <jordan.l.justen@intel.com>
>>> Cc: Laszlo Ersek <lersek@redhat.com>
>>> Cc: Ard Biesheuvel <ard.biesheuvel@arm.com>
>>> Signed-off-by: Michael D Kinney <michael.d.kinney@intel.com>
>>> ---
>>>    OvmfPkg/PlatformCI/.azurepipelines/Windows-VS2019.yml | 2 +-
>>>    1 file changed, 1 insertion(+), 1 deletion(-)
>>>
>>> diff --git a/OvmfPkg/PlatformCI/.azurepipelines/Windows-VS2019.yml b/OvmfPkg/PlatformCI/.azurepipelines/Windows-
>> VS2019.yml
>>> index 02ed233fdb60..dd19fff50066 100644
>>> --- a/OvmfPkg/PlatformCI/.azurepipelines/Windows-VS2019.yml
>>> +++ b/OvmfPkg/PlatformCI/.azurepipelines/Windows-VS2019.yml
>>> @@ -132,7 +132,7 @@ jobs:
>>>            build_flags: $(Build.Flags)
>>>            run_flags: $(Run.Flags)
>>>            extra_install_step:
>>> -        - powershell: choco install qemu; Write-Host "##vso[task.prependpath]c:\Program Files\qemu"
>>> +        - powershell: choco install qemu --version=2020.08.14; Write-Host "##vso[task.prependpath]c:\Program
>> Files\qemu"
>>>              displayName: Install QEMU and Set QEMU on path # friendly name displayed in the UI
>>>              condition: and(gt(variables.pkg_count, 0), succeeded())
>>>
>>
>>
>>
>
>
> 
>
>

[-- Attachment #2: Type: text/html, Size: 6473 bytes --]

Re: [edk2-devel] [Patch v2][edk2-stable202011 3/4] OvmfPkg/PlatformCI/.azurepiplines: Use stable release of QEMU

[Michael D Kinney]

[-- Attachment #1: Type: text/plain, Size: 5296 bytes --]

Rebecca,

I agree there is value in running tests against latest versions of all components and there is value in using stable releases of all dependent components.

There is overhead to do both.  There is also overhead to monitor all dependent components, evaluate new releases, and update versions of dependent components.  I do not know how to automate these types of evaluations.

Thanks,

Mike

From: Rebecca Cran <rebecca@nuviainc.com>
Sent: Wednesday, November 25, 2020 11:36 AM
To: devel@edk2.groups.io; Kinney, Michael D <michael.d.kinney@intel.com>
Cc: Sean Brogan <sean.brogan@microsoft.com>; Bret Barkelew <Bret.Barkelew@microsoft.com>; Liming Gao <gaoliming@byosoft.com.cn>; Justen, Jordan L <jordan.l.justen@intel.com>; Laszlo Ersek <lersek@redhat.com>; Ard Biesheuvel <ard.biesheuvel@arm.com>
Subject: Re: [edk2-devel] [Patch v2][edk2-stable202011 3/4] OvmfPkg/PlatformCI/.azurepiplines: Use stable release of QEMU


Hi Mike,



That does appear to be the current general approach, but I'd suggest changing it.

Because in the last week before release we shouldn't be chasing new versions of unrelated software, in my opinion.



Fortunately the switch to Ubuntu 20.04 hasn't happened yet, and is due to be rolled out beginning November 30th (https://github.com/actions/virtual-environments/issues/1816). The CI pipeline has a set of warnings: "##[warning]Ubuntu-latest pipelines will use Ubuntu-20.04 soon. For more details, see https://github.com/actions/virtual-environments/issues/1816"



--
Rebecca Cran



On 11/25/20 9:20 AM, Michael D Kinney wrote:

Hi Rebecca,



I think the general approach is to verify the latest version of everything

including the CI infrastructure components.



If a failure is detected due to a new component, then we can temporarily

lock in a previous stable version until the issues with the new component

are resolved.



Mike



-----Original Message-----

From: devel@edk2.groups.io<mailto:devel@edk2.groups.io> <devel@edk2.groups.io><mailto:devel@edk2.groups.io> On Behalf Of Rebecca Cran

Sent: Wednesday, November 25, 2020 6:58 AM

To: devel@edk2.groups.io<mailto:devel@edk2.groups.io>; Kinney, Michael D <michael.d.kinney@intel.com><mailto:michael.d.kinney@intel.com>

Cc: Sean Brogan <sean.brogan@microsoft.com><mailto:sean.brogan@microsoft.com>; Bret Barkelew <Bret.Barkelew@microsoft.com><mailto:Bret.Barkelew@microsoft.com>; Liming Gao

<gaoliming@byosoft.com.cn><mailto:gaoliming@byosoft.com.cn>; Justen, Jordan L <jordan.l.justen@intel.com><mailto:jordan.l.justen@intel.com>; Laszlo Ersek <lersek@redhat.com><mailto:lersek@redhat.com>; Ard Biesheuvel

<ard.biesheuvel@arm.com><mailto:ard.biesheuvel@arm.com>

Subject: Re: [edk2-devel] [Patch v2][edk2-stable202011 3/4] OvmfPkg/PlatformCI/.azurepiplines: Use stable release of QEMU



Related, should we use a known version of Ubuntu in testing?



Currently, there are several lines with 'ubuntu-latest' - e.g.:



.azurepipelines/Ubuntu-GCC5.yml:17:    vm_image: 'ubuntu-latest'

.azurepipelines/Ubuntu-PatchCheck.yml:21:  vmImage: 'ubuntu-latest'



OvmfPkg/PlatformCI/.azurepipelines/Ubuntu-GCC5.yml:20: vm_image:

'ubuntu-latest'





I'm not familiar with how Azure works, but could this cause problems

when they update their Ubuntu latest image to 21.04 etc. and things

change under us?





--

Rebecca Cran





On 11/24/20 10:07 PM, Michael D Kinney wrote:

Install the 2020.08.14 release of QEMU for Windows.



The QEMU release from 2020.11.20 is installed into the incorrect

directory and is causing EDK II CI failures in the run to shell

step.



Cc: Sean Brogan <sean.brogan@microsoft.com><mailto:sean.brogan@microsoft.com>

Cc: Bret Barkelew <Bret.Barkelew@microsoft.com><mailto:Bret.Barkelew@microsoft.com>

Cc: Liming Gao <gaoliming@byosoft.com.cn><mailto:gaoliming@byosoft.com.cn>

Cc: Jordan Justen <jordan.l.justen@intel.com><mailto:jordan.l.justen@intel.com>

Cc: Laszlo Ersek <lersek@redhat.com><mailto:lersek@redhat.com>

Cc: Ard Biesheuvel <ard.biesheuvel@arm.com><mailto:ard.biesheuvel@arm.com>

Signed-off-by: Michael D Kinney <michael.d.kinney@intel.com><mailto:michael.d.kinney@intel.com>

---

  OvmfPkg/PlatformCI/.azurepipelines/Windows-VS2019.yml | 2 +-

  1 file changed, 1 insertion(+), 1 deletion(-)



diff --git a/OvmfPkg/PlatformCI/.azurepipelines/Windows-VS2019.yml b/OvmfPkg/PlatformCI/.azurepipelines/Windows-

VS2019.yml

index 02ed233fdb60..dd19fff50066 100644

--- a/OvmfPkg/PlatformCI/.azurepipelines/Windows-VS2019.yml

+++ b/OvmfPkg/PlatformCI/.azurepipelines/Windows-VS2019.yml

@@ -132,7 +132,7 @@ jobs:

          build_flags: $(Build.Flags)

          run_flags: $(Run.Flags)

          extra_install_step:

-        - powershell: choco install qemu; Write-Host "##vso[task.prependpath]c:\Program Files\qemu"

+        - powershell: choco install qemu --version=2020.08.14; Write-Host "##vso[task.prependpath]c:\Program

Files\qemu"

            displayName: Install QEMU and Set QEMU on path # friendly name displayed in the UI

            condition: and(gt(variables.pkg_count, 0), succeeded())























[-- Attachment #2: Type: text/html, Size: 49483 bytes --]

chocolatey.org instability [was: OvmfPkg/PlatformCI/.azurepiplines: Use stable release of QEMU]

[Laszlo Ersek]

On 11/25/20 17:23, Michael D Kinney wrote:
> Hi Phillippe,
> 
> We use choco command to install qemu for Windows, and as of this morning, the 20201124
> release has not been published on choco.
> 
> 	https://chocolatey.org/packages/Qemu
> 
> Once it is published on choco, we can test it and if it passes, we can revert this 
> change and resume using the latest qemu release.

Hijacking the thread a little --
<https://github.com/tianocore/edk2/pull/1319> keeps failing because
chocolatey.org keeps returning "(520) Origin Error" to the

  choco install qemu --version=2020.08.14

command.

Note that this particular version of the QEMU "choco" package still exists:

  https://chocolatey.org/packages/Qemu/2020.08.14

Can we make ourselves independent of "chocolatey.org" somehow? Every
such external dependency can block all merges. Perhaps we should create
another repository under the tianocore organization on github, and keep
Windows binaries for QEMU there.

I'm quite displeased with the stability issues we've recently seen in
the edk2 CI environment recently, and (AFAICT) none of those have been
our fault. What's *really* annoying is that, when a maintainer wants to
work around such an env issue, to proceed with a particular merge, the
maintainer gets to post a separate patch to edk2-devel first, and wait
for review. That means a possibly *multi-day* delay for merging an
already reviewed patch series. This is terrible.

Laszlo