From 8b7d5f6fee560f5bd3fe5a16cecca027fa7d33df Mon Sep 17 00:00:00 2001
From: Subir Ghosh <subir0071@users.noreply.github.com>
Date: Wed, 15 Jan 2025 11:30:27 -0700
Subject: [PATCH] Revert "Implemented az-cli warmup (#11173)" (#11400)

This reverts commit ffe7e6a51497101e31b8bdde69a80d92b1e1125c.
---
 images/ubuntu/scripts/build/cleanup.sh        |  7 ----
 .../ubuntu/scripts/build/install-azure-cli.sh | 32 ++-----------------
 .../scripts/build/install-azure-devops-cli.sh |  8 +++++
 3 files changed, 10 insertions(+), 37 deletions(-)

diff --git a/images/ubuntu/scripts/build/cleanup.sh b/images/ubuntu/scripts/build/cleanup.sh
index 100fdcbbf47e..17c7ccc3f6fa 100644
--- a/images/ubuntu/scripts/build/cleanup.sh
+++ b/images/ubuntu/scripts/build/cleanup.sh
@@ -19,13 +19,6 @@ if command -v journalctl; then
     journalctl --vacuum-time=1s
 fi
 
-# remove redundant folders from azcli
-if [[ -z "${AZURE_CONFIG_DIR}" ]]; then
-    rm -rf $AZURE_CONFIG_DIR/logs
-    rm -rf $AZURE_CONFIG_DIR/commands
-    rm -rf $AZURE_CONFIG_DIR/telemetry
-fi
-
 # delete all .gz and rotated file
 find /var/log -type f -regex ".*\.gz$" -delete
 find /var/log -type f -regex ".*\.[0-9]$" -delete
diff --git a/images/ubuntu/scripts/build/install-azure-cli.sh b/images/ubuntu/scripts/build/install-azure-cli.sh
index ff279492d58a..0004f7bdef63 100644
--- a/images/ubuntu/scripts/build/install-azure-cli.sh
+++ b/images/ubuntu/scripts/build/install-azure-cli.sh
@@ -4,40 +4,12 @@
 ##  Desc:  Install Azure CLI (az)
 ################################################################################
 
-# Source the helpers for use with the script
-source $HELPER_SCRIPTS/etc-environment.sh
-
-# AZURE_CONFIG_DIR shell variable defines where the CLI configuration file for managing behavior are stored
-# https://learn.microsoft.com/en-us/cli/azure/azure-cli-configuration#cli-configuration-file
-# This path SHOULD be different from the installation directory /opt/az/
-export AZURE_CONFIG_DIR="/opt/az-config"
-mkdir -p $AZURE_CONFIG_DIR
-set_etc_environment_variable "AZURE_CONFIG_DIR" "${AZURE_CONFIG_DIR}"
-
-# AZURE_EXTENSION_DIR shell variable defines where modules are installed
-# https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview
-# This path SHOULD be different from the installation directory /opt/az/
-export AZURE_EXTENSION_DIR="/opt/az-extension"
-mkdir -p $AZURE_EXTENSION_DIR
-set_etc_environment_variable "AZURE_EXTENSION_DIR" "${AZURE_EXTENSION_DIR}"
-
 # Install Azure CLI (instructions taken from https://docs.microsoft.com/en-us/cli/azure/install-azure-cli)
 curl -fsSL https://aka.ms/InstallAzureCLIDeb | sudo bash
 
 echo "azure-cli https://docs.microsoft.com/en-us/cli/azure/install-azure-cli-linux?pivots=apt" >> $HELPER_SCRIPTS/apt-sources.txt
 
-# Remove Azure CLI repository (instructions taken from https://learn.microsoft.com/en-us/cli/azure/install-azure-cli-linux?pivots=apt#uninstall-azure-cli)
-rm -f /etc/apt/sources.list.d/azure-cli.sources
-
-echo "Warmup 'az'"
-az --help > /dev/null
-if [ $? -ne 0 ]; then
-    echo "Command 'az --help' failed"
-    exit 1
-fi
-
-# Hand over the ownership of the directories and files to the non-root user
-chown -R "$SUDO_USER:$SUDO_USER" $AZURE_CONFIG_DIR
-chown -R "$SUDO_USER:$SUDO_USER" $AZURE_EXTENSION_DIR
+rm -f /etc/apt/sources.list.d/azure-cli.list
+rm -f /etc/apt/sources.list.d/azure-cli.list.save
 
 invoke_tests "CLI.Tools" "Azure CLI"
diff --git a/images/ubuntu/scripts/build/install-azure-devops-cli.sh b/images/ubuntu/scripts/build/install-azure-devops-cli.sh
index 98e1318a9148..81948ac95440 100644
--- a/images/ubuntu/scripts/build/install-azure-devops-cli.sh
+++ b/images/ubuntu/scripts/build/install-azure-devops-cli.sh
@@ -4,6 +4,14 @@
 ##  Desc:  Install Azure DevOps CLI (az devops)
 ################################################################################
 
+# Source the helpers for use with the script
+source $HELPER_SCRIPTS/etc-environment.sh
+
+# AZURE_EXTENSION_DIR shell variable defines where modules are installed
+# https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview
+export AZURE_EXTENSION_DIR=/opt/az/azcliextensions
+set_etc_environment_variable "AZURE_EXTENSION_DIR" "${AZURE_EXTENSION_DIR}"
+
 # install azure devops Cli extension
 az extension add -n azure-devops