Skip to content

Commit 36c96ad

Browse files
authored
ci: Move E2E runtime variables from job level to stage (#2305)
ci: Move E2E runtime variables to stage
1 parent d06a633 commit 36c96ad

File tree

4 files changed

+14
-17
lines changed

4 files changed

+14
-17
lines changed

.pipelines/singletenancy/aks-swift/e2e-job-template.yaml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,9 @@ stages:
4040
TAG: $[ stagedependencies.setup.env.outputs['EnvironmentalVariables.Tag'] ]
4141
CURRENT_VERSION: $[ stagedependencies.containerize.check_tag.outputs['CurrentTagManifests.currentTagManifests'] ]
4242
commitID: $[ stagedependencies.setup.env.outputs['EnvironmentalVariables.commitID'] ]
43+
GOPATH: "$(Agent.TempDirectory)/go" # Go workspace path
44+
GOBIN: "$(GOPATH)/bin" # Go binaries path
45+
modulePath: "$(GOPATH)/src/github.com/Azure/azure-container-networking"
4346
condition: and(succeeded(), eq(variables.TAG, variables.CURRENT_VERSION))
4447
pool:
4548
name: $(BUILD_POOL_NAME_DEFAULT)
@@ -52,10 +55,6 @@ stages:
5255
demands:
5356
- agent.os -equals Linux
5457
- Role -equals $(CUSTOM_E2E_ROLE)
55-
variables:
56-
GOPATH: "$(Agent.TempDirectory)/go" # Go workspace path
57-
GOBIN: "$(GOPATH)/bin" # Go binaries path
58-
modulePath: "$(GOPATH)/src/github.com/Azure/azure-container-networking"
5958
steps:
6059
- template: e2e-step-template.yaml
6160
parameters:

.pipelines/singletenancy/azure-cni-overlay/azure-cni-overlay-e2e-job-template.yaml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,9 @@ stages:
3838
- ${{ parameters.clusterName }}
3939
variables:
4040
commitID: $[ stagedependencies.setup.env.outputs['EnvironmentalVariables.commitID'] ]
41+
GOPATH: "$(Agent.TempDirectory)/go" # Go workspace path
42+
GOBIN: "$(GOPATH)/bin" # Go binaries path
43+
modulePath: "$(GOPATH)/src/github.com/Azure/azure-container-networking"
4144
pool:
4245
name: $(BUILD_POOL_NAME_DEFAULT)
4346
jobs:
@@ -49,10 +52,6 @@ stages:
4952
demands:
5053
- agent.os -equals Linux
5154
- Role -equals $(CUSTOM_E2E_ROLE)
52-
variables:
53-
GOPATH: "$(Agent.TempDirectory)/go" # Go workspace path
54-
GOBIN: "$(GOPATH)/bin" # Go binaries path
55-
modulePath: "$(GOPATH)/src/github.com/Azure/azure-container-networking"
5655
steps:
5756
- template: azure-cni-overlay-e2e-step-template.yaml
5857
parameters:

.pipelines/singletenancy/cilium-overlay/cilium-overlay-e2e-job-template.yaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,11 @@ stages:
3636
- setup
3737
- publish
3838
- ${{ parameters.clusterName }}
39+
variables:
40+
commitID: $[ stagedependencies.setup.env.outputs['EnvironmentalVariables.commitID'] ]
41+
GOPATH: "$(Agent.TempDirectory)/go" # Go workspace path
42+
GOBIN: "$(GOPATH)/bin" # Go binaries path
43+
modulePath: "$(GOPATH)/src/github.com/Azure/azure-container-networking"
3944
pool:
4045
name: $(BUILD_POOL_NAME_DEFAULT)
4146
jobs:
@@ -47,11 +52,6 @@ stages:
4752
demands:
4853
- agent.os -equals Linux
4954
- Role -equals $(CUSTOM_E2E_ROLE)
50-
variables:
51-
GOPATH: "$(Agent.TempDirectory)/go" # Go workspace path
52-
GOBIN: "$(GOPATH)/bin" # Go binaries path
53-
modulePath: "$(GOPATH)/src/github.com/Azure/azure-container-networking"
54-
commitID: $[ stagedependencies.setup.env.outputs['EnvironmentalVariables.commitID'] ]
5555
steps:
5656
- template: cilium-overlay-e2e-step-template.yaml
5757
parameters:

.pipelines/singletenancy/cilium/cilium-e2e-job-template.yaml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,9 @@ stages:
4040
TAG: $[ stagedependencies.setup.env.outputs['EnvironmentalVariables.Tag'] ]
4141
CURRENT_VERSION: $[ stagedependencies.containerize.check_tag.outputs['CurrentTagManifests.currentTagManifests'] ]
4242
commitID: $[ stagedependencies.setup.env.outputs['EnvironmentalVariables.commitID'] ]
43+
GOPATH: "$(Agent.TempDirectory)/go" # Go workspace path
44+
GOBIN: "$(GOPATH)/bin" # Go binaries path
45+
modulePath: "$(GOPATH)/src/github.com/Azure/azure-container-networking"
4346
condition: and(succeeded(), eq(variables.TAG, variables.CURRENT_VERSION))
4447
pool:
4548
name: $(BUILD_POOL_NAME_DEFAULT)
@@ -52,10 +55,6 @@ stages:
5255
demands:
5356
- agent.os -equals Linux
5457
- Role -equals $(CUSTOM_E2E_ROLE)
55-
variables:
56-
GOPATH: "$(Agent.TempDirectory)/go" # Go workspace path
57-
GOBIN: "$(GOPATH)/bin" # Go binaries path
58-
modulePath: "$(GOPATH)/src/github.com/Azure/azure-container-networking"
5958
steps:
6059
- template: cilium-e2e-step-template.yaml
6160
parameters:

0 commit comments

Comments
 (0)