Skip to content

Commit 59014da

Browse files
jpayne3506paulyufan2
jpayne3506
authored and
paulyufan2
committed
add: change ACN PR azureSubscription
1 parent dd642c0 commit 59014da

10 files changed

+21
-21
lines changed

‎.pipelines/cni/cilium/cilium-overlay-load-test-template.yaml

+3-3
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ stages:
3333
- task: AzureCLI@1
3434
displayName: "Install Cilium, CNS, and ip-masq-agent"
3535
inputs:
36-
azureSubscription: $(TEST_SUB_SERVICE_CONNECTION)
36+
azureSubscription: $(BUILD_VALIDATIONS_SERVICE_CONNECTION)
3737
scriptLocation: "inlineScript"
3838
scriptType: "bash"
3939
addSpnToEnvironment: true
@@ -161,7 +161,7 @@ stages:
161161
steps:
162162
- task: AzureCLI@1
163163
inputs:
164-
azureSubscription: $(TEST_SUB_SERVICE_CONNECTION)
164+
azureSubscription: $(BUILD_VALIDATIONS_SERVICE_CONNECTION)
165165
scriptLocation: "inlineScript"
166166
scriptType: "bash"
167167
addSpnToEnvironment: true
@@ -172,7 +172,7 @@ stages:
172172
echo "Deleting Cluster and resource group"
173173
make -C ./hack/aks set-kubeconf AZCLI=az CLUSTER=${{ parameters.clusterName }}-$(make revision)
174174
make -C ./hack/aks azcfg AZCLI=az REGION=$(LOCATION)
175-
make -C ./hack/aks down AZCLI=az REGION=$(LOCATION) SUB=$(SUBSCRIPTION_ID) CLUSTER=${{ parameters.clusterName }}-$(make revision)
175+
make -C ./hack/aks down AZCLI=az REGION=$(LOCATION) SUB=$(SUB_AZURE_NETWORK_AGENT_BUILD_VALIDATIONS) CLUSTER=${{ parameters.clusterName }}-$(make revision)
176176
echo "Cluster and resources down"
177177
else
178178
echo "Deletion of resources is False"

‎.pipelines/cni/load-test-templates/create-cluster-template.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,13 @@ parameters:
88
steps:
99
- task: AzureCLI@1
1010
inputs:
11-
azureSubscription: $(TEST_SUB_SERVICE_CONNECTION)
11+
azureSubscription: $(BUILD_VALIDATIONS_SERVICE_CONNECTION)
1212
scriptLocation: "inlineScript"
1313
scriptType: "bash"
1414
addSpnToEnvironment: true
1515
inlineScript: |
1616
set -ex
1717
make -C ./hack/aks azcfg AZCLI=az REGION=$(LOCATION)
18-
make -C ./hack/aks ${{ parameters.clusterType }} AZCLI=az REGION=$(LOCATION) SUB=$(SUBSCRIPTION_ID) CLUSTER=${{ parameters.clusterName }}-$(make revision) NODE_COUNT=${{ parameters.nodeCount }} VM_SIZE=${{ parameters.vmSize }} WINDOWS_VM_SKU=${{ parameters.windowsVMSize }} WINDOWS_USERNAME=${WINDOWS_USERNAME} WINDOWS_PASSWORD=${WINDOWS_PASSWORD}
18+
make -C ./hack/aks ${{ parameters.clusterType }} AZCLI=az REGION=$(LOCATION) SUB=$(SUB_AZURE_NETWORK_AGENT_BUILD_VALIDATIONS) CLUSTER=${{ parameters.clusterName }}-$(make revision) NODE_COUNT=${{ parameters.nodeCount }} VM_SIZE=${{ parameters.vmSize }} WINDOWS_VM_SKU=${{ parameters.windowsVMSize }} WINDOWS_USERNAME=${WINDOWS_USERNAME} WINDOWS_PASSWORD=${WINDOWS_PASSWORD}
1919
name: "CreateAksCluster"
2020
displayName: "Create AKS Cluster"

‎.pipelines/cni/load-test-templates/pod-deployment-template.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ steps:
99
- task: AzureCLI@1
1010
displayName: "Pod Deployment"
1111
inputs:
12-
azureSubscription: $(TEST_SUB_SERVICE_CONNECTION)
12+
azureSubscription: $(BUILD_VALIDATIONS_SERVICE_CONNECTION)
1313
scriptLocation: "inlineScript"
1414
scriptType: "bash"
1515
addSpnToEnvironment: true

‎.pipelines/cni/load-test-templates/restart-node-template.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ parameters:
66
steps:
77
- task: AzureCLI@1
88
inputs:
9-
azureSubscription: $(TEST_SUB_SERVICE_CONNECTION)
9+
azureSubscription: $(BUILD_VALIDATIONS_SERVICE_CONNECTION)
1010
scriptLocation: "inlineScript"
1111
scriptType: "bash"
1212
addSpnToEnvironment: true

‎.pipelines/cni/load-test-templates/validate-state-template.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ parameters:
77
steps:
88
- task: AzureCLI@1
99
inputs:
10-
azureSubscription: $(TEST_SUB_SERVICE_CONNECTION)
10+
azureSubscription: $(BUILD_VALIDATIONS_SERVICE_CONNECTION)
1111
scriptLocation: "inlineScript"
1212
scriptType: "bash"
1313
addSpnToEnvironment: true

‎.pipelines/cni/singletenancy/windows-cni-load-test-template.yaml

+5-5
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ stages:
9393
steps:
9494
- task: AzureCLI@1
9595
inputs:
96-
azureSubscription: $(TEST_SUB_SERVICE_CONNECTION)
96+
azureSubscription: $(BUILD_VALIDATIONS_SERVICE_CONNECTION)
9797
scriptLocation: "inlineScript"
9898
scriptType: "bash"
9999
addSpnToEnvironment: true
@@ -121,7 +121,7 @@ stages:
121121
jobs:
122122
- template: ../k8s-e2e/k8s-e2e-job-template.yaml
123123
parameters:
124-
sub: $(TEST_SUB_SERVICE_CONNECTION)
124+
sub: $(BUILD_VALIDATIONS_SERVICE_CONNECTION)
125125
clusterName: ${{ parameters.clusterName }}-$(make revision)
126126
os: ${{ parameters.os }}
127127
datapath: true
@@ -176,7 +176,7 @@ stages:
176176
parameters:
177177
clusterName: ${{ parameters.clusterName }}
178178
os: ${{ parameters.os }}
179-
sub: $(TEST_SUB_SERVICE_CONNECTION)
179+
sub: $(BUILD_VALIDATIONS_SERVICE_CONNECTION)
180180
os_version: 'ltsc2022'
181181
tag: $(npmVersion)
182182

@@ -193,7 +193,7 @@ stages:
193193
steps:
194194
- task: AzureCLI@1
195195
inputs:
196-
azureSubscription: $(TEST_SUB_SERVICE_CONNECTION)
196+
azureSubscription: $(BUILD_VALIDATIONS_SERVICE_CONNECTION)
197197
scriptLocation: "inlineScript"
198198
scriptType: "bash"
199199
addSpnToEnvironment: true
@@ -204,7 +204,7 @@ stages:
204204
echo "Deleting Cluster and resource group"
205205
make -C ./hack/aks set-kubeconf AZCLI=az CLUSTER=${{ parameters.clusterName }}-$(make revision)
206206
make -C ./hack/aks azcfg AZCLI=az REGION=$(LOCATION)
207-
make -C ./hack/aks down AZCLI=az REGION=$(LOCATION) SUB=$(SUBSCRIPTION_ID) CLUSTER=${{ parameters.clusterName }}-$(make revision)
207+
make -C ./hack/aks down AZCLI=az REGION=$(LOCATION) SUB=$(SUB_AZURE_NETWORK_AGENT_BUILD_VALIDATIONS) CLUSTER=${{ parameters.clusterName }}-$(make revision)
208208
echo "Cluster and resources down"
209209
else
210210
echo "Deletion of resources is False"

‎.pipelines/singletenancy/azure-cni-overlay/azure-cni-overlay-e2e-step-template.yaml

+3-3
Original file line numberDiff line numberDiff line change
@@ -86,11 +86,11 @@ steps:
8686
8787
- task: AzureCLI@1
8888
inputs:
89-
azureSubscription: $(AZURE_TEST_AGENT_SERVICE_CONNECTION)
89+
azureSubscription: $(BUILD_VALIDATIONS_SERVICE_CONNECTION)
9090
scriptLocation: "inlineScript"
9191
scriptType: "bash"
9292
addSpnToEnvironment: true
93-
inlineScript: |
93+
inlineScript: |
9494
set -e
9595
clusterName=${{ parameters.clusterName }}
9696
echo "Restarting nodes"
@@ -101,7 +101,7 @@ steps:
101101

102102
- task: AzureCLI@1
103103
inputs:
104-
azureSubscription: $(AZURE_TEST_AGENT_SERVICE_CONNECTION)
104+
azureSubscription: $(BUILD_VALIDATIONS_SERVICE_CONNECTION)
105105
scriptLocation: "inlineScript"
106106
scriptType: "bash"
107107
addSpnToEnvironment: true

‎.pipelines/singletenancy/dualstack-overlay/dualstackoverlay-e2e-step-template.yaml

+3-3
Original file line numberDiff line numberDiff line change
@@ -71,11 +71,11 @@ steps:
7171
7272
- task: AzureCLI@1
7373
inputs:
74-
azureSubscription: $(AZURE_TEST_AGENT_SERVICE_CONNECTION)
74+
azureSubscription: $(BUILD_VALIDATIONS_SERVICE_CONNECTION)
7575
scriptLocation: "inlineScript"
7676
scriptType: "bash"
7777
addSpnToEnvironment: true
78-
inlineScript: |
78+
inlineScript: |
7979
set -e
8080
clusterName=${{ parameters.clusterName }}
8181
echo "Restarting nodes"
@@ -86,7 +86,7 @@ steps:
8686

8787
- task: AzureCLI@1
8888
inputs:
89-
azureSubscription: $(AZURE_TEST_AGENT_SERVICE_CONNECTION)
89+
azureSubscription: $(BUILD_VALIDATIONS_SERVICE_CONNECTION)
9090
scriptLocation: "inlineScript"
9191
scriptType: "bash"
9292
addSpnToEnvironment: true

‎.pipelines/templates/create-cluster.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ jobs:
3131
fi
3232
mkdir -p ~/.kube/
3333
make -C ./hack/aks azcfg AZCLI=az REGION=${{ parameters.region }}
34-
make -C ./hack/aks ${{ parameters.clusterType }} AZCLI=az REGION=${{ parameters.region }} SUB=$(SUB_AZURE_NETWORK_AGENT_TEST) CLUSTER=${{ parameters.clusterName }} K8S_VER=${{ parameters.k8sVersion }} VM_SIZE=${{ parameters.vmSize }} WINDOWS_OS_SKU=${{ parameters.windowsOsSku }} WINDOWS_VM_SKU=${{ parameters.vmSize }} WINDOWS_USERNAME=${WINDOWS_USERNAME} WINDOWS_PASSWORD=${WINDOWS_PASSWORD}
34+
make -C ./hack/aks ${{ parameters.clusterType }} AZCLI=az REGION=${{ parameters.region }} SUB=$(SUB_AZURE_NETWORK_AGENT_BUILD_VALIDATIONS) CLUSTER=${{ parameters.clusterName }} K8S_VER=${{ parameters.k8sVersion }} VM_SIZE=${{ parameters.vmSize }} WINDOWS_OS_SKU=${{ parameters.windowsOsSku }} WINDOWS_VM_SKU=${{ parameters.vmSize }} WINDOWS_USERNAME=${WINDOWS_USERNAME} WINDOWS_PASSWORD=${WINDOWS_PASSWORD}
3535
echo "Cluster successfully created"
3636
displayName: Cluster - ${{ parameters.clusterType }}
3737
continueOnError: ${{ contains(parameters.clusterType, 'dualstack') }}

‎.pipelines/templates/delete-cluster.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ steps:
1414
echo "Deleting cluster"
1515
make -C ./hack/aks azcfg AZCLI=az REGION=${{ parameters.region }}
1616
make -C ./hack/aks set-kubeconf AZCLI=az CLUSTER=${{ parameters.clusterName }}
17-
make -C ./hack/aks down AZCLI=az REGION=${{ parameters.region }} SUB=$(SUB_AZURE_NETWORK_AGENT_TEST) CLUSTER=${{ parameters.clusterName }}
17+
make -C ./hack/aks down AZCLI=az REGION=${{ parameters.region }} SUB=$(SUB_AZURE_NETWORK_AGENT_BUILD_VALIDATIONS) CLUSTER=${{ parameters.clusterName }}
1818
echo "Cluster and resources down"
1919
name: delete
2020
displayName: Delete - ${{ parameters.name }}

0 commit comments

Comments
 (0)