Skip to content

Commit e773a71

Browse files
authored
{CI} Fix regression test pipeline (#28313)
* fix regression test pipeline * use variables for service connection name
1 parent 03ad904 commit e773a71

File tree

2 files changed

+38
-32
lines changed

2 files changed

+38
-32
lines changed

scripts/regression_test/extension_regression_test.yml

+17-14
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
- task: AzureCLI@1
2525
displayName: 'checkout branch'
2626
inputs:
27-
azureSubscription: 'Azure CLI release'
27+
azureSubscription: $(AZURE_SDK_INFRA_SUB_CONNECTED_SERVICE)
2828
scriptLocation: inlineScript
2929
inlineScript: |
3030
set -ev
@@ -81,7 +81,7 @@ jobs:
8181
- task: AzureCLI@1
8282
displayName: 'checkout cli and extension repo'
8383
inputs:
84-
azureSubscription: 'Azure CLI release'
84+
azureSubscription: $(AZURE_SDK_INFRA_SUB_CONNECTED_SERVICE)
8585
scriptLocation: inlineScript
8686
inlineScript: |
8787
set -ev
@@ -106,17 +106,20 @@ jobs:
106106
- template: ../../.azure-pipelines/templates/azdev_setup.yml
107107
parameters:
108108
CLIExtensionRepoPath: ./azure-cli-extensions
109-
- bash: |
110-
set -ev
111-
112-
source env/bin/activate
113-
cd azure-cli-extensions
114-
115-
az login -u $(CLI_LIVE_TEST_ACCOUNT) -p "$(CLI_LIVE_TEST_PASSWORD)"
116-
az account set -s 0b1f6471-1bf0-4dda-aec3-cb9272f09590
117-
118-
python ../scripts/ci/automation_full_test.py "12" "$(Instance_idx)" "latest" "" "True" "extension"
119-
displayName: "Rerun tests"
109+
- task: AzureCLI@1
110+
displayName: 'Rerun tests'
111+
inputs:
112+
azureSubscription: $(AZURE_SDK_TEST_SUB_CONNECTED_SERVICE)
113+
scriptLocation: inlineScript
114+
inlineScript: |
115+
set -ev
116+
117+
source env/bin/activate
118+
cd azure-cli-extensions
119+
120+
az account set -s 0b1f6471-1bf0-4dda-aec3-cb9272f09590
121+
122+
python ../scripts/ci/automation_full_test.py "12" "$(Instance_idx)" "latest" "" "True" "extension"
120123
- bash: |
121124
publishErrorModules='false'
122125
if [[ -f '/$(HOME)/.azdev/env_config/mnt/vss/_work/1/s/env/test_results_error_modules_$(Instance_idx).txt' ]]; then
@@ -159,7 +162,7 @@ jobs:
159162
- task: AzureCLI@1
160163
displayName: 'Result Summary'
161164
inputs:
162-
azureSubscription: 'Azure CLI release'
165+
azureSubscription: $(AZURE_SDK_INFRA_SUB_CONNECTED_SERVICE)
163166
scriptLocation: inlineScript
164167
inlineScript: |
165168
set -ev

scripts/regression_test/regression_test.yml

+21-18
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
- task: AzureCLI@1
2626
displayName: 'update version'
2727
inputs:
28-
azureSubscription: 'Azure CLI release'
28+
azureSubscription: $(AZURE_SDK_INFRA_SUB_CONNECTED_SERVICE)
2929
scriptLocation: inlineScript
3030
inlineScript: |
3131
set -ev
@@ -93,7 +93,7 @@ jobs:
9393
- task: AzureCLI@1
9494
displayName: 'Checkout Target Branch'
9595
inputs:
96-
azureSubscription: 'Azure CLI release'
96+
azureSubscription: $(AZURE_SDK_INFRA_SUB_CONNECTED_SERVICE)
9797
scriptLocation: inlineScript
9898
inlineScript: |
9999
set -ev
@@ -114,21 +114,24 @@ jobs:
114114
115115
git checkout -b ${GITHUB_BRANCH} ${GITHUB_REPO}/${GITHUB_BRANCH}
116116
- template: ../../.azure-pipelines/templates/azdev_setup.yml
117-
- bash: |
118-
set -ev
119-
120-
source env/bin/activate
121-
122-
if [[ -n "$(CUSTOM_WHL_URL)" ]]; then
123-
pip install $(CUSTOM_WHL_URL) --force-reinstall
124-
fi
125-
126-
az login -u $(CLI_LIVE_TEST_ACCOUNT) -p "$(CLI_LIVE_TEST_PASSWORD)"
127-
az account set -s 0b1f6471-1bf0-4dda-aec3-cb9272f09590
128-
129-
serial_modules="appservice botservice cloud network azure-cli-core azure-cli-telemetry"
130-
python scripts/ci/automation_full_test.py "8" "$(Instance_idx)" "latest" "$serial_modules" "True"
131-
displayName: "Rerun tests"
117+
- task: AzureCLI@1
118+
displayName: 'Rerun tests'
119+
inputs:
120+
azureSubscription: $(AZURE_SDK_TEST_SUB_CONNECTED_SERVICE)
121+
scriptLocation: inlineScript
122+
inlineScript: |
123+
set -ev
124+
125+
source env/bin/activate
126+
127+
if [[ -n "$(CUSTOM_WHL_URL)" ]]; then
128+
pip install $(CUSTOM_WHL_URL) --force-reinstall
129+
fi
130+
131+
az account set -s 0b1f6471-1bf0-4dda-aec3-cb9272f09590
132+
133+
serial_modules="appservice botservice cloud network azure-cli-core azure-cli-telemetry"
134+
python scripts/ci/automation_full_test.py "8" "$(Instance_idx)" "latest" "$serial_modules" "True"
132135
- task: PublishTestResults@2
133136
inputs:
134137
testResultsFiles: '/$(HOME)/.azdev/env_config/mnt/vss/_work/1/s/env/test_results_*.xml'
@@ -144,7 +147,7 @@ jobs:
144147
- task: AzureCLI@1
145148
displayName: 'Create PR'
146149
inputs:
147-
azureSubscription: 'Azure CLI release'
150+
azureSubscription: $(AZURE_SDK_INFRA_SUB_CONNECTED_SERVICE)
148151
scriptLocation: inlineScript
149152
inlineScript: |
150153
set -ev

0 commit comments

Comments
 (0)