[Patch 1/1] .azurepipelines: Use alternate cmocka repo

[Patch 1/1] .azurepipelines: Use alternate cmocka repo

[Michael D Kinney]

Use git config insteadOf feature to use an alternate
cmocka repo from github when running CI.

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

diff --git a/.azurepipelines/templates/platform-build-run-steps.yml b/.azurepipelines/templates/platform-build-run-steps.yml
index 97e7faa26682..b712e2fafafb 100644
--- a/.azurepipelines/templates/platform-build-run-steps.yml
+++ b/.azurepipelines/templates/platform-build-run-steps.yml
@@ -51,6 +51,9 @@ steps:
 # Set default
 - bash: echo "##vso[task.setvariable variable=pkg_count]${{ 1 }}"
 
+# Use altername cmocka repo
+- bash: git config --global url.https://github.com/neverware-mirrors/cmocka.git.insteadOf https://git.cryptomilk.org/projects/cmocka.git
+
 # 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)
diff --git a/.azurepipelines/templates/pr-gate-steps.yml b/.azurepipelines/templates/pr-gate-steps.yml
index 70c19a462194..28edb453bddc 100644
--- a/.azurepipelines/templates/pr-gate-steps.yml
+++ b/.azurepipelines/templates/pr-gate-steps.yml
@@ -31,6 +31,9 @@ steps:
     echo "##vso[task.setvariable variable=pkgs_to_build]${{ parameters.build_pkgs }}"
     echo "##vso[task.setvariable variable=pkg_count]${{ 1 }}"
 
+# Use altername cmocka repo
+- bash: git config --global url.https://github.com/neverware-mirrors/cmocka.git.insteadOf https://git.cryptomilk.org/projects/cmocka.git
+
 # 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)
-- 
2.29.2.windows.2

回复: [Patch 1/1] .azurepipelines: Use alternate cmocka repo

[gaoliming]

Mike:
  Thanks for your quick fix. It works. Reviewed-by: Liming Gao
<gaoliming@byosoft.com.cn>

  Besides, I think we can directly update submodule link in edk2 repo. If
so, the developers don't need to apply this setting. 

Thanks
Liming
> -----邮件原件-----
> 发件人: Michael D Kinney <michael.d.kinney@intel.com>
> 发送时间: 2020年12月15日 12:47
> 收件人: devel@edk2.groups.io
> 抄送: Sean Brogan <sean.brogan@microsoft.com>; Bret Barkelew
> <Bret.Barkelew@microsoft.com>; Liming Gao <gaoliming@byosoft.com.cn>
> 主题: [Patch 1/1] .azurepipelines: Use alternate cmocka repo
> 
> Use git config insteadOf feature to use an alternate
> cmocka repo from github when running CI.
> 
> Cc: Sean Brogan <sean.brogan@microsoft.com>
> Cc: Bret Barkelew <Bret.Barkelew@microsoft.com>
> Cc: Liming Gao <gaoliming@byosoft.com.cn>
> Signed-off-by: Michael D Kinney <michael.d.kinney@intel.com>
> ---
>  .azurepipelines/templates/platform-build-run-steps.yml | 3 +++
>  .azurepipelines/templates/pr-gate-steps.yml            | 3 +++
>  2 files changed, 6 insertions(+)
> 
> diff --git a/.azurepipelines/templates/platform-build-run-steps.yml
> b/.azurepipelines/templates/platform-build-run-steps.yml
> index 97e7faa26682..b712e2fafafb 100644
> --- a/.azurepipelines/templates/platform-build-run-steps.yml
> +++ b/.azurepipelines/templates/platform-build-run-steps.yml
> @@ -51,6 +51,9 @@ steps:
>  # Set default
>  - bash: echo "##vso[task.setvariable variable=pkg_count]${{ 1 }}"
> 
> +# Use altername cmocka repo
> +- bash: git config --global
> url.https://github.com/neverware-mirrors/cmocka.git.insteadOf
> https://git.cryptomilk.org/projects/cmocka.git
> +
>  # 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)
> diff --git a/.azurepipelines/templates/pr-gate-steps.yml
> b/.azurepipelines/templates/pr-gate-steps.yml
> index 70c19a462194..28edb453bddc 100644
> --- a/.azurepipelines/templates/pr-gate-steps.yml
> +++ b/.azurepipelines/templates/pr-gate-steps.yml
> @@ -31,6 +31,9 @@ steps:
>      echo "##vso[task.setvariable
> variable=pkgs_to_build]${{ parameters.build_pkgs }}"
>      echo "##vso[task.setvariable variable=pkg_count]${{ 1 }}"
> 
> +# Use altername cmocka repo
> +- bash: git config --global
> url.https://github.com/neverware-mirrors/cmocka.git.insteadOf
> https://git.cryptomilk.org/projects/cmocka.git
> +
>  # 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)
> --
> 2.29.2.windows.2

Re: [edk2-devel] 回复: [Patch 1/1] .azurepipelines: Use alternate cmocka repo

[Michael D Kinney]

Liming,

Thank you for the quick review.

I agree that updating the submodule will be a better overall fix, but we need
to discuss which mirror is the best for all developers and we have to 
give notice to all downstream consumers of the new submodule link so they
can update their settings.

I will start that discussion.

Mike

> -----Original Message-----
> From: devel@edk2.groups.io <devel@edk2.groups.io> On Behalf Of gaoliming
> Sent: Monday, December 14, 2020 8:58 PM
> To: Kinney, Michael D <michael.d.kinney@intel.com>; devel@edk2.groups.io
> Cc: 'Sean Brogan' <sean.brogan@microsoft.com>; 'Bret Barkelew' <Bret.Barkelew@microsoft.com>
> Subject: [edk2-devel] 回复: [Patch 1/1] .azurepipelines: Use alternate cmocka repo
> 
> Mike:
>   Thanks for your quick fix. It works. Reviewed-by: Liming Gao
> <gaoliming@byosoft.com.cn>
> 
>   Besides, I think we can directly update submodule link in edk2 repo. If
> so, the developers don't need to apply this setting.
> 
> Thanks
> Liming
> > -----邮件原件-----
> > 发件人: Michael D Kinney <michael.d.kinney@intel.com>
> > 发送时间: 2020年12月15日 12:47
> > 收件人: devel@edk2.groups.io
> > 抄送: Sean Brogan <sean.brogan@microsoft.com>; Bret Barkelew
> > <Bret.Barkelew@microsoft.com>; Liming Gao <gaoliming@byosoft.com.cn>
> > 主题: [Patch 1/1] .azurepipelines: Use alternate cmocka repo
> >
> > Use git config insteadOf feature to use an alternate
> > cmocka repo from github when running CI.
> >
> > Cc: Sean Brogan <sean.brogan@microsoft.com>
> > Cc: Bret Barkelew <Bret.Barkelew@microsoft.com>
> > Cc: Liming Gao <gaoliming@byosoft.com.cn>
> > Signed-off-by: Michael D Kinney <michael.d.kinney@intel.com>
> > ---
> >  .azurepipelines/templates/platform-build-run-steps.yml | 3 +++
> >  .azurepipelines/templates/pr-gate-steps.yml            | 3 +++
> >  2 files changed, 6 insertions(+)
> >
> > diff --git a/.azurepipelines/templates/platform-build-run-steps.yml
> > b/.azurepipelines/templates/platform-build-run-steps.yml
> > index 97e7faa26682..b712e2fafafb 100644
> > --- a/.azurepipelines/templates/platform-build-run-steps.yml
> > +++ b/.azurepipelines/templates/platform-build-run-steps.yml
> > @@ -51,6 +51,9 @@ steps:
> >  # Set default
> >  - bash: echo "##vso[task.setvariable variable=pkg_count]${{ 1 }}"
> >
> > +# Use altername cmocka repo
> > +- bash: git config --global
> > url.https://github.com/neverware-mirrors/cmocka.git.insteadOf
> > https://git.cryptomilk.org/projects/cmocka.git
> > +
> >  # 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)
> > diff --git a/.azurepipelines/templates/pr-gate-steps.yml
> > b/.azurepipelines/templates/pr-gate-steps.yml
> > index 70c19a462194..28edb453bddc 100644
> > --- a/.azurepipelines/templates/pr-gate-steps.yml
> > +++ b/.azurepipelines/templates/pr-gate-steps.yml
> > @@ -31,6 +31,9 @@ steps:
> >      echo "##vso[task.setvariable
> > variable=pkgs_to_build]${{ parameters.build_pkgs }}"
> >      echo "##vso[task.setvariable variable=pkg_count]${{ 1 }}"
> >
> > +# Use altername cmocka repo
> > +- bash: git config --global
> > url.https://github.com/neverware-mirrors/cmocka.git.insteadOf
> > https://git.cryptomilk.org/projects/cmocka.git
> > +
> >  # 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)
> > --
> > 2.29.2.windows.2
> 
> 
> 
> 
> 
> 
>