Skip to content

Commit a510782

Browse files
matmerrmatmerr
authored
Move E2E's to separate stage (#677)
* remove job from e2e * break to stages
1 parent a71b63a commit a510782

File tree

2 files changed

+80
-62
lines changed

2 files changed

+80
-62
lines changed

‎.pipelines/e2e-job-template.yaml‎

Lines changed: 32 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,40 @@
11
parameters:
22
name: ""
3+
displayName: ""
34
pipelineBuildImage: "$(BUILD_IMAGE)"
45
clusterDefinition: ""
56
clusterDefinitionCniTypeKey: ""
67
clusterDefinitionCniBuildOS: ""
78
clusterDefinitionCniBuildExt: ""
89

9-
jobs:
10-
- job: ${{ parameters.name }}
11-
dependsOn: unit_tests
12-
timeoutInMinutes: 120
13-
pool:
14-
name: Networking-ContainerNetworking
15-
demands: agent.os -equals Linux
16-
container:
17-
image: ${{ parameters.pipelineBuildImage }}
18-
variables:
19-
GOPATH: "$(Agent.TempDirectory)/go" # Go workspace path
20-
GOBIN: "$(GOPATH)/bin" # Go binaries path
21-
modulePath: "$(GOPATH)/src/github.com/Azure/aks-engine"
22-
acnPath: "$(GOPATH)/src/github.com/Azure/azure-container-networking"
23-
Tag: $[ dependencies.unit_tests.outputs['EnvironmentalVariables.Tag'] ]
24-
CommitHash: $[ dependencies.unit_tests.outputs['EnvironmentalVariables.CommitHash'] ]
25-
StorageID: $[ dependencies.unit_tests.outputs['EnvironmentalVariables.StorageID'] ]
26-
CLEANUP_ON_EXIT: true
27-
CLEANUP_IF_FAIL: true
28-
steps:
29-
- template: e2e-step-template.yaml
30-
parameters:
31-
name: ${{ parameters.name }}
32-
clusterDefinition: ${{ parameters.clusterDefinition }}
33-
clusterDefinitionCniTypeKey: ${{ parameters.clusterDefinitionCniTypeKey }}
34-
clusterDefinitionCniBuildOS: ${{ parameters.clusterDefinitionCniBuildOS }}
35-
clusterDefinitionCniBuildExt: ${{ parameters.clusterDefinitionCniBuildExt }}
10+
stages:
11+
- stage: ${{ parameters.name }}
12+
displayName: E2E - ${{ parameters.displayName }}
13+
dependsOn: build_and_test
14+
jobs:
15+
- job: ${{ parameters.name }}
16+
displayName: Singletenancy AKS Engine Suite - (${{ parameters.name }})
17+
timeoutInMinutes: 120
18+
pool:
19+
name: Networking-ContainerNetworking
20+
demands: agent.os -equals Linux
21+
container:
22+
image: ${{ parameters.pipelineBuildImage }}
23+
variables:
24+
GOPATH: "$(Agent.TempDirectory)/go" # Go workspace path
25+
GOBIN: "$(GOPATH)/bin" # Go binaries path
26+
modulePath: "$(GOPATH)/src/github.com/Azure/aks-engine"
27+
acnPath: "$(GOPATH)/src/github.com/Azure/azure-container-networking"
28+
Tag: $[ stagedependencies.build_and_test.unit_tests.outputs['EnvironmentalVariables.Tag'] ]
29+
CommitHash: $[ stagedependencies.build_and_test.unit_tests.outputs['EnvironmentalVariables.CommitHash'] ]
30+
StorageID: $[ stagedependencies.build_and_test.unit_tests.outputs['EnvironmentalVariables.StorageID'] ]
31+
CLEANUP_ON_EXIT: true
32+
CLEANUP_IF_FAIL: true
33+
steps:
34+
- template: e2e-step-template.yaml
35+
parameters:
36+
name: ${{ parameters.name }}
37+
clusterDefinition: ${{ parameters.clusterDefinition }}
38+
clusterDefinitionCniTypeKey: ${{ parameters.clusterDefinitionCniTypeKey }}
39+
clusterDefinitionCniBuildOS: ${{ parameters.clusterDefinitionCniBuildOS }}
40+
clusterDefinitionCniBuildExt: ${{ parameters.clusterDefinitionCniBuildExt }}

‎.pipelines/pipeline.yaml‎

Lines changed: 48 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,10 @@ trigger:
1010

1111
stages:
1212
- stage: build_and_test
13+
displayName: Build and Unit Test
1314
jobs:
1415
- job: unit_tests
16+
displayName: CNI, NPM, CNS, CNM
1517
pool:
1618
name: Networking-ContainerNetworking
1719
demands: agent.os -equals Linux
@@ -194,45 +196,56 @@ stages:
194196
displayName: Create artifact storage container
195197
condition: succeeded()
196198

197-
- template: e2e-job-template.yaml
198-
parameters:
199-
name: "ubuntu_16_04_linux_e2e"
200-
pipelineBuildImage: "$(BUILD_IMAGE)"
201-
clusterDefinition: "cniLinux1604.json"
202-
clusterDefinitionCniTypeKey: "azureCNIURLLinux"
203-
clusterDefinitionCniBuildOS: "linux"
204-
clusterDefinitionCniBuildExt: ".tgz"
205-
206-
- template: e2e-job-template.yaml
207-
parameters:
208-
name: "ubuntu_18_04_linux_e2e"
209-
pipelineBuildImage: "$(BUILD_IMAGE)"
210-
clusterDefinition: "cniLinux1804.json"
211-
clusterDefinitionCniTypeKey: "azureCNIURLLinux"
212-
clusterDefinitionCniBuildOS: "linux"
213-
clusterDefinitionCniBuildExt: ".tgz"
214-
215-
- template: e2e-job-template.yaml
216-
parameters:
217-
name: "windows_18_09_e2e"
218-
pipelineBuildImage: "$(BUILD_IMAGE)"
219-
clusterDefinition: "cniWindows1809.json"
220-
clusterDefinitionCniTypeKey: "azureCNIURLWindows"
221-
clusterDefinitionCniBuildOS: "windows"
222-
clusterDefinitionCniBuildExt: ".zip"
223-
224-
- template: e2e-job-template.yaml
225-
parameters:
226-
name: "windows_19_03_e2e"
227-
pipelineBuildImage: "$(BUILD_IMAGE)"
228-
clusterDefinition: "cniWindows1903.json"
229-
clusterDefinitionCniTypeKey: "azureCNIURLWindows"
230-
clusterDefinitionCniBuildOS: "windows"
231-
clusterDefinitionCniBuildExt: ".zip"
199+
- template: e2e-job-template.yaml
200+
parameters:
201+
name: "ubuntu_16_04_linux_e2e"
202+
displayName: Ubuntu 16.04
203+
pipelineBuildImage: "$(BUILD_IMAGE)"
204+
clusterDefinition: "cniLinux1604.json"
205+
clusterDefinitionCniTypeKey: "azureCNIURLLinux"
206+
clusterDefinitionCniBuildOS: "linux"
207+
clusterDefinitionCniBuildExt: ".tgz"
208+
209+
- template: e2e-job-template.yaml
210+
parameters:
211+
name: "ubuntu_18_04_linux_e2e"
212+
displayName: Ubuntu 18.04
213+
pipelineBuildImage: "$(BUILD_IMAGE)"
214+
clusterDefinition: "cniLinux1804.json"
215+
clusterDefinitionCniTypeKey: "azureCNIURLLinux"
216+
clusterDefinitionCniBuildOS: "linux"
217+
clusterDefinitionCniBuildExt: ".tgz"
218+
219+
- template: e2e-job-template.yaml
220+
parameters:
221+
name: "windows_18_09_e2e"
222+
displayName: "Windows 1809"
223+
pipelineBuildImage: "$(BUILD_IMAGE)"
224+
clusterDefinition: "cniWindows1809.json"
225+
clusterDefinitionCniTypeKey: "azureCNIURLWindows"
226+
clusterDefinitionCniBuildOS: "windows"
227+
clusterDefinitionCniBuildExt: ".zip"
228+
229+
- template: e2e-job-template.yaml
230+
parameters:
231+
name: "windows_19_03_e2e"
232+
displayName: "Windows 1903"
233+
pipelineBuildImage: "$(BUILD_IMAGE)"
234+
clusterDefinition: "cniWindows1903.json"
235+
clusterDefinitionCniTypeKey: "azureCNIURLWindows"
236+
clusterDefinitionCniBuildOS: "windows"
237+
clusterDefinitionCniBuildExt: ".zip"
232238

233239
- stage: cleanup
240+
displayName: Cleanup
241+
dependsOn:
242+
- "ubuntu_16_04_linux_e2e"
243+
- "ubuntu_18_04_linux_e2e"
244+
- "windows_18_09_e2e"
245+
- "windows_19_03_e2e"
234246
jobs:
235247
- job: delete_remote_artifacts
248+
displayName: Delete remote artifacts
236249
pool:
237250
name: Networking-ContainerNetworking
238251
demands: agent.os -equals Linux

0 commit comments

Comments
 (0)