Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Implement az-cli warmup on ubuntu #11173

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions images/ubuntu/scripts/build/cleanup.sh
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,13 @@ 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
Expand Down
32 changes: 30 additions & 2 deletions images/ubuntu/scripts/build/install-azure-cli.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,40 @@
## 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

rm -f /etc/apt/sources.list.d/azure-cli.list
rm -f /etc/apt/sources.list.d/azure-cli.list.save
# 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

invoke_tests "CLI.Tools" "Azure CLI"
8 changes: 0 additions & 8 deletions images/ubuntu/scripts/build/install-azure-devops-cli.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,6 @@
## 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

Expand Down
Loading