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.

Sign up for GitHub

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

{AKS} Fix AKS live test pipeline #7742

Merged
merged 1 commit into from
Jun 25, 2024
Merged

{AKS} Fix AKS live test pipeline #7742

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
17 changes: 2 additions & 15 deletions src/aks-preview/azcli_aks_live_test/scripts/setup_venv.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,14 +67,6 @@ installAZAKSTOOLFromLocal(){
pip show az-aks-tool
}

# need to be executed in a venv
installAZAKSTOOL(){
wheel_file="az_aks_tool-latest-py3-none-any.whl"
wheel_url="https://akspreview.blob.core.windows.net/azakstool/${wheel_file}"
curl -sLO "${wheel_url}"
installAZAKSTOOLFromLocal "${wheel_file}"
}

# need to be executed in a venv with kusto related modules installed
removeKustoPTHFile(){
pushd azEnv/lib/python"${PYTHON_VERSION}"/site-packages
Expand Down Expand Up @@ -149,13 +141,8 @@ if [[ -n ${setup_option} ]]; then
installBuildTools
elif [[ ${setup_option} == "setup-tool" ]]; then
echo "Start to setup az-aks-tool!"
local_setup=${3:-"n"}
if [[ ${local_setup} == "y" ]]; then
wheel_file=${4:-"/az_aks_tool-latest-py3-none-any.whl"}
installAZAKSTOOLFromLocal "${wheel_file}"
else
installAZAKSTOOL
fi
wheel_file=${3:-$(find / -type f -name "az_aks_tool*" | head -n 1)}
installAZAKSTOOLFromLocal "${wheel_file}"
removeKustoPTHFile
elif [[ ${setup_option} == "setup-az" ]]; then
echo "Start to setup azure-cli!"
Expand Down
2 changes: 1 addition & 1 deletion src/aks-preview/azcli_aks_live_test/vsts-azcli-aks-live-test.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ jobs:
condition: succeeded()
displayName: "Start Container"
- bash: |
docker exec $(ContainerName) /opt/scripts/setup_venv.sh setup-tool y y /az_aks_tool-latest-py3-none-any.whl
docker exec $(ContainerName) /opt/scripts/setup_venv.sh setup-tool y
docker exec $(ContainerName) /opt/scripts/setup_venv.sh setup-az n azure-cli/ azure-cli-extensions/
condition: succeeded()
displayName: "Set up Virtual Environment"
Expand Down
2 changes: 1 addition & 1 deletion src/aks-preview/azcli_aks_live_test/vsts-azcli-aks-unit-test.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ jobs:
condition: succeeded()
displayName: "Start Container"
- bash: |
docker exec $(ContainerName) /opt/scripts/setup_venv.sh setup-tool y y /az_aks_tool-latest-py3-none-any.whl
docker exec $(ContainerName) /opt/scripts/setup_venv.sh setup-tool y
docker exec $(ContainerName) /opt/scripts/setup_venv.sh setup-az n azure-cli/ azure-cli-extensions/
condition: succeeded()
displayName: "Set up Virtual Environment"
Expand Down
Loading