Skip to content

Commit 39cfffd

Browse files
author
reneeli@microsoft.com
committed
Fix live pipeline - temp
1 parent 4494447 commit 39cfffd

3 files changed

Lines changed: 8 additions & 5 deletions

File tree

src/aks-preview/azcli_aks_live_test/scripts/setup_venv.sh

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,9 @@ setupAZ(){
3434
# install azdev, used later to install azcli and extension
3535
pip install azdev==0.1.60
3636

37+
# fix setuptools to 77.0.3 as a workaround for "No module named azure.cli.__main__; 'azure.cli' is a package and cannot be directly executed"
38+
pip install setuptools==77.0.3
39+
3740
# pre-install-az: check existing az
3841
which az || az version || az extension list || true
3942

@@ -162,4 +165,4 @@ if [[ -n ${setup_option} ]]; then
162165
echo "Unsupported setup option '${setup_option}'!"
163166
fi
164167
echo "All Done!"
165-
fi
168+
fi

src/aks-preview/azcli_aks_live_test/scripts/test_cli_live.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ removeAKSPreview
3737

3838
# login before the recording test to avoid the newly added test case does not include a corresponding
3939
# recording file and fall back to live mode, otherwise it will prompt `az login`.
40-
az login --identity -u "${IDENTITY_RESOURCE_ID}"
40+
az login --identity --resource-id "${IDENTITY_RESOURCE_ID}"
4141
az account set -s "${AZCLI_ALT_SUBSCRIPTION_ID}"
4242
az account show
4343

@@ -168,4 +168,4 @@ if [[ ${TEST_MODE} == "live" || ${TEST_MODE} == "all" ]]; then
168168
else
169169
echo -e "Live-replay test passed!\n\n"
170170
fi
171-
fi
171+
fi

src/aks-preview/azcli_aks_live_test/scripts/test_ext_live.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ source azEnv/bin/activate
4040

4141
# login before the recording test to avoid the newly added test case does not include a corresponding
4242
# recording file and fall back to live mode, otherwise it will prompt `az login`.
43-
az login --identity -u "${IDENTITY_RESOURCE_ID}"
43+
az login --identity --resource-id "${IDENTITY_RESOURCE_ID}"
4444
az account set -s "${AZCLI_ALT_SUBSCRIPTION_ID}"
4545
az account show
4646

@@ -283,4 +283,4 @@ if [[ -n ${BACKWARD_COMPATIBILITY_TEST} ]]; then
283283
echo -e "Backward Compatibility Live-replay test passed!\n\n"
284284
fi
285285
fi
286-
fi
286+
fi

0 commit comments

Comments
 (0)