From 366c48ebc6479b8c5e4ea92e1e4a2ebff634f2de Mon Sep 17 00:00:00 2001 From: Hang Date: Mon, 30 Oct 2023 13:57:30 +0800 Subject: [PATCH 1/4] Init --- src/azure-cli/setup.py | 1 + 1 file changed, 1 insertion(+) diff --git a/src/azure-cli/setup.py b/src/azure-cli/setup.py index 39a301c5a16..2222abe9940 100644 --- a/src/azure-cli/setup.py +++ b/src/azure-cli/setup.py @@ -138,6 +138,7 @@ 'fabric~=2.4', 'javaproperties~=0.5.1', 'jsondiff~=2.0.0', + 'Jinja2~=3.0.3', 'packaging>=20.9', 'pycomposefile>=0.0.29', 'PyGithub~=1.38', From b0f08492db6cad160189118761e7cad8eb91ba97 Mon Sep 17 00:00:00 2001 From: Hang Date: Tue, 31 Oct 2023 16:17:55 +0800 Subject: [PATCH 2/4] Disable alias extension --- scripts/ci/test_extensions.sh | 3 ++- src/azure-cli/setup.py | 1 - 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/ci/test_extensions.sh b/scripts/ci/test_extensions.sh index 74d3570c6d3..8b2004f8ec1 100755 --- a/scripts/ci/test_extensions.sh +++ b/scripts/ci/test_extensions.sh @@ -20,7 +20,8 @@ exit_code=0 # azure-cli-ml: https://github.com/Azure/azure-cli-extensions/issues/826 # Disable k8s-extension temporarily: https://github.com/Azure/azure-cli-extensions/pull/6702 -ignore_list='azure-cli-ml fzf arcappliance arcdata connectedk8s k8s-extension' +# Disable alias temporarily: https://github.com/Azure/azure-cli/pull/27717 +ignore_list='azure-cli-ml fzf arcappliance arcdata connectedk8s k8s-extension alias' for ext in $output; do echo diff --git a/src/azure-cli/setup.py b/src/azure-cli/setup.py index 2222abe9940..39a301c5a16 100644 --- a/src/azure-cli/setup.py +++ b/src/azure-cli/setup.py @@ -138,7 +138,6 @@ 'fabric~=2.4', 'javaproperties~=0.5.1', 'jsondiff~=2.0.0', - 'Jinja2~=3.0.3', 'packaging>=20.9', 'pycomposefile>=0.0.29', 'PyGithub~=1.38', From 196982ffc1d9a918a68b220cf21020003b1c523f Mon Sep 17 00:00:00 2001 From: Hang Date: Tue, 31 Oct 2023 16:28:12 +0800 Subject: [PATCH 3/4] Add comment --- scripts/ci/test_extensions.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/ci/test_extensions.sh b/scripts/ci/test_extensions.sh index 8b2004f8ec1..05b7b4a21aa 100755 --- a/scripts/ci/test_extensions.sh +++ b/scripts/ci/test_extensions.sh @@ -19,6 +19,7 @@ output=$(az extension list-available --query [].name -otsv) exit_code=0 # azure-cli-ml: https://github.com/Azure/azure-cli-extensions/issues/826 +# Disable arcappliance arcdata connectedk8s https://github.com/Azure/azure-cli/pull/20436 # Disable k8s-extension temporarily: https://github.com/Azure/azure-cli-extensions/pull/6702 # Disable alias temporarily: https://github.com/Azure/azure-cli/pull/27717 ignore_list='azure-cli-ml fzf arcappliance arcdata connectedk8s k8s-extension alias' From 62cd5b5b24f54eb340e9a4cb22aa1cb6bb621534 Mon Sep 17 00:00:00 2001 From: Hang Date: Tue, 31 Oct 2023 16:48:55 +0800 Subject: [PATCH 4/4] Add more comments --- scripts/ci/test_extensions.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/scripts/ci/test_extensions.sh b/scripts/ci/test_extensions.sh index 05b7b4a21aa..01ed9ac977b 100755 --- a/scripts/ci/test_extensions.sh +++ b/scripts/ci/test_extensions.sh @@ -18,8 +18,9 @@ export AZURE_CLI_DIAGNOSTICS_TELEMETRY= output=$(az extension list-available --query [].name -otsv) exit_code=0 -# azure-cli-ml: https://github.com/Azure/azure-cli-extensions/issues/826 -# Disable arcappliance arcdata connectedk8s https://github.com/Azure/azure-cli/pull/20436 +# Disable azure-cli-ml: https://github.com/Azure/azure-cli-extensions/issues/826 +# Disable fzf: https://github.com/Azure/azure-cli/pull/17979 +# Disable arcappliance arcdata connectedk8s: https://github.com/Azure/azure-cli/pull/20436 # Disable k8s-extension temporarily: https://github.com/Azure/azure-cli-extensions/pull/6702 # Disable alias temporarily: https://github.com/Azure/azure-cli/pull/27717 ignore_list='azure-cli-ml fzf arcappliance arcdata connectedk8s k8s-extension alias'