From 0d799b026bd6fdc613a83c36b9f47bd82efcd4c8 Mon Sep 17 00:00:00 2001 From: scbedd <45376673+scbedd@users.noreply.github.com> Date: Wed, 23 Feb 2022 11:36:38 -0800 Subject: [PATCH 1/3] patching conda version to current. removing pin of azure-mgmt-resources --- eng/conda_env.yml | 2 +- eng/conda_test_requirements.txt | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/eng/conda_env.yml b/eng/conda_env.yml index 4c674de246a3..b432e880cdbb 100644 --- a/eng/conda_env.yml +++ b/eng/conda_env.yml @@ -1,2 +1,2 @@ variables: - AZURESDK_CONDA_VERSION: '2021.05.01b1' + AZURESDK_CONDA_VERSION: '2021.12.01' diff --git a/eng/conda_test_requirements.txt b/eng/conda_test_requirements.txt index 78d7ca62136e..b359bbbf5b7c 100644 --- a/eng/conda_test_requirements.txt +++ b/eng/conda_test_requirements.txt @@ -1,5 +1,4 @@ # install from root of repo -azure-mgmt-resource==20.0.0 aiohttp>=3.0; python_version >= '3.5' tools/azure-devtools tools/azure-sdk-tools From 8c17934e88706091954879e0d27d29288f5c4126 Mon Sep 17 00:00:00 2001 From: scbedd <45376673+scbedd@users.noreply.github.com> Date: Wed, 4 May 2022 16:17:01 -0700 Subject: [PATCH 2/3] disable docker warning until 24299 is complete --- eng/pipelines/templates/variables/globals.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/eng/pipelines/templates/variables/globals.yml b/eng/pipelines/templates/variables/globals.yml index 29a5a8e49432..b193e387307e 100644 --- a/eng/pipelines/templates/variables/globals.yml +++ b/eng/pipelines/templates/variables/globals.yml @@ -3,3 +3,5 @@ variables: skipComponentGovernanceDetection: true AzureSDKCondaChannel: https://azuresdkconda.blob.core.windows.net/channel1/ Package.EnableSBOMSigning: true + # this will be disabled after issue#24299 is merged. + DisableDockerDetector: true From 6325b94ca2d16d9a9aa434526209897574e0dac2 Mon Sep 17 00:00:00 2001 From: Scott Beddall <45376673+scbedd@users.noreply.github.com> Date: Thu, 5 May 2022 10:59:43 -0700 Subject: [PATCH 3/3] Update eng/pipelines/templates/variables/globals.yml Co-authored-by: Wes Haggard --- eng/pipelines/templates/variables/globals.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/pipelines/templates/variables/globals.yml b/eng/pipelines/templates/variables/globals.yml index b193e387307e..1bfb7d7d6077 100644 --- a/eng/pipelines/templates/variables/globals.yml +++ b/eng/pipelines/templates/variables/globals.yml @@ -3,5 +3,5 @@ variables: skipComponentGovernanceDetection: true AzureSDKCondaChannel: https://azuresdkconda.blob.core.windows.net/channel1/ Package.EnableSBOMSigning: true - # this will be disabled after issue#24299 is merged. + # this will be disabled until issue#24299 is addressed. DisableDockerDetector: true