Skip to content

Move E2E's to separate stage #677

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Sep 22, 2020
Merged

Move E2E's to separate stage #677

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
612c4b3
unit tests
matmerr Sep 21, 2020
d94cb17
remove job from e2e
matmerr Sep 21, 2020
dba19d2
break to stages
matmerr Sep 21, 2020
47fa1ac
Third try to get vars synced up
pjohnst5 Sep 22, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
59 changes: 32 additions & 27 deletions .pipelines/e2e-job-template.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,35 +1,40 @@
parameters:
name: ""
displayName: ""
pipelineBuildImage: "$(BUILD_IMAGE)"
clusterDefinition: ""
clusterDefinitionCniTypeKey: ""
clusterDefinitionCniBuildOS: ""
clusterDefinitionCniBuildExt: ""

jobs:
- job: ${{ parameters.name }}
dependsOn: unit_tests
timeoutInMinutes: 120
pool:
name: Networking-ContainerNetworking
demands: agent.os -equals Linux
container:
image: ${{ parameters.pipelineBuildImage }}
variables:
GOPATH: "$(Agent.TempDirectory)/go" # Go workspace path
GOBIN: "$(GOPATH)/bin" # Go binaries path
modulePath: "$(GOPATH)/src/github.com/Azure/aks-engine"
acnPath: "$(GOPATH)/src/github.com/Azure/azure-container-networking"
Tag: $[ dependencies.unit_tests.outputs['EnvironmentalVariables.Tag'] ]
CommitHash: $[ dependencies.unit_tests.outputs['EnvironmentalVariables.CommitHash'] ]
StorageID: $[ dependencies.unit_tests.outputs['EnvironmentalVariables.StorageID'] ]
CLEANUP_ON_EXIT: true
CLEANUP_IF_FAIL: true
steps:
- template: e2e-step-template.yaml
parameters:
name: ${{ parameters.name }}
clusterDefinition: ${{ parameters.clusterDefinition }}
clusterDefinitionCniTypeKey: ${{ parameters.clusterDefinitionCniTypeKey }}
clusterDefinitionCniBuildOS: ${{ parameters.clusterDefinitionCniBuildOS }}
clusterDefinitionCniBuildExt: ${{ parameters.clusterDefinitionCniBuildExt }}
stages:
- stage: ${{ parameters.name }}
displayName: E2E - ${{ parameters.displayName }}
dependsOn: build_and_test
jobs:
- job: ${{ parameters.name }}
displayName: Singletenancy AKS Engine Suite - (${{ parameters.name }})
timeoutInMinutes: 120
pool:
name: Networking-ContainerNetworking
demands: agent.os -equals Linux
container:
image: ${{ parameters.pipelineBuildImage }}
variables:
GOPATH: "$(Agent.TempDirectory)/go" # Go workspace path
GOBIN: "$(GOPATH)/bin" # Go binaries path
modulePath: "$(GOPATH)/src/github.com/Azure/aks-engine"
acnPath: "$(GOPATH)/src/github.com/Azure/azure-container-networking"
Tag: $[ stagedependencies.build_and_test.unit_tests.outputs['EnvironmentalVariables.Tag'] ]
CommitHash: $[ stagedependencies.build_and_test.unit_tests.outputs['EnvironmentalVariables.CommitHash'] ]
StorageID: $[ stagedependencies.build_and_test.unit_tests.outputs['EnvironmentalVariables.StorageID'] ]
CLEANUP_ON_EXIT: true
CLEANUP_IF_FAIL: true
steps:
- template: e2e-step-template.yaml
parameters:
name: ${{ parameters.name }}
clusterDefinition: ${{ parameters.clusterDefinition }}
clusterDefinitionCniTypeKey: ${{ parameters.clusterDefinitionCniTypeKey }}
clusterDefinitionCniBuildOS: ${{ parameters.clusterDefinitionCniBuildOS }}
clusterDefinitionCniBuildExt: ${{ parameters.clusterDefinitionCniBuildExt }}
83 changes: 48 additions & 35 deletions .pipelines/pipeline.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,10 @@ trigger:

stages:
- stage: build_and_test
displayName: Build and Unit Test
jobs:
- job: unit_tests
displayName: CNI, NPM, CNS, CNM
pool:
name: Networking-ContainerNetworking
demands: agent.os -equals Linux
Expand Down Expand Up @@ -194,45 +196,56 @@ stages:
displayName: Create artifact storage container
condition: succeeded()

- template: e2e-job-template.yaml
parameters:
name: "ubuntu_16_04_linux_e2e"
pipelineBuildImage: "$(BUILD_IMAGE)"
clusterDefinition: "cniLinux1604.json"
clusterDefinitionCniTypeKey: "azureCNIURLLinux"
clusterDefinitionCniBuildOS: "linux"
clusterDefinitionCniBuildExt: ".tgz"

- template: e2e-job-template.yaml
parameters:
name: "ubuntu_18_04_linux_e2e"
pipelineBuildImage: "$(BUILD_IMAGE)"
clusterDefinition: "cniLinux1804.json"
clusterDefinitionCniTypeKey: "azureCNIURLLinux"
clusterDefinitionCniBuildOS: "linux"
clusterDefinitionCniBuildExt: ".tgz"

- template: e2e-job-template.yaml
parameters:
name: "windows_18_09_e2e"
pipelineBuildImage: "$(BUILD_IMAGE)"
clusterDefinition: "cniWindows1809.json"
clusterDefinitionCniTypeKey: "azureCNIURLWindows"
clusterDefinitionCniBuildOS: "windows"
clusterDefinitionCniBuildExt: ".zip"

- template: e2e-job-template.yaml
parameters:
name: "windows_19_03_e2e"
pipelineBuildImage: "$(BUILD_IMAGE)"
clusterDefinition: "cniWindows1903.json"
clusterDefinitionCniTypeKey: "azureCNIURLWindows"
clusterDefinitionCniBuildOS: "windows"
clusterDefinitionCniBuildExt: ".zip"
- template: e2e-job-template.yaml
parameters:
name: "ubuntu_16_04_linux_e2e"
displayName: Ubuntu 16.04
pipelineBuildImage: "$(BUILD_IMAGE)"
clusterDefinition: "cniLinux1604.json"
clusterDefinitionCniTypeKey: "azureCNIURLLinux"
clusterDefinitionCniBuildOS: "linux"
clusterDefinitionCniBuildExt: ".tgz"

- template: e2e-job-template.yaml
parameters:
name: "ubuntu_18_04_linux_e2e"
displayName: Ubuntu 18.04
pipelineBuildImage: "$(BUILD_IMAGE)"
clusterDefinition: "cniLinux1804.json"
clusterDefinitionCniTypeKey: "azureCNIURLLinux"
clusterDefinitionCniBuildOS: "linux"
clusterDefinitionCniBuildExt: ".tgz"

- template: e2e-job-template.yaml
parameters:
name: "windows_18_09_e2e"
displayName: "Windows 1809"
pipelineBuildImage: "$(BUILD_IMAGE)"
clusterDefinition: "cniWindows1809.json"
clusterDefinitionCniTypeKey: "azureCNIURLWindows"
clusterDefinitionCniBuildOS: "windows"
clusterDefinitionCniBuildExt: ".zip"

- template: e2e-job-template.yaml
parameters:
name: "windows_19_03_e2e"
displayName: "Windows 1903"
pipelineBuildImage: "$(BUILD_IMAGE)"
clusterDefinition: "cniWindows1903.json"
clusterDefinitionCniTypeKey: "azureCNIURLWindows"
clusterDefinitionCniBuildOS: "windows"
clusterDefinitionCniBuildExt: ".zip"

- stage: cleanup
displayName: Cleanup
dependsOn:
- "ubuntu_16_04_linux_e2e"
- "ubuntu_18_04_linux_e2e"
- "windows_18_09_e2e"
- "windows_19_03_e2e"
jobs:
- job: delete_remote_artifacts
displayName: Delete remote artifacts
pool:
name: Networking-ContainerNetworking
demands: agent.os -equals Linux
Expand Down