Skip to content

Commit 387e2eb

Browse files
authored
[1ES] Add end to end integration tests pipeline (#767)
* Add 1ES pipeline for end to end tests * Stagger nightly build runs
1 parent 96f8e01 commit 387e2eb

File tree

4 files changed

+72
-8
lines changed

4 files changed

+72
-8
lines changed

eng/ci/integration-tests.yml

+42
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
trigger: none # ensure this is not ran as a CI build
2+
3+
pr:
4+
branches:
5+
include:
6+
- dev
7+
- release/*
8+
9+
resources:
10+
repositories:
11+
- repository: 1es
12+
type: git
13+
name: 1ESPipelineTemplates/1ESPipelineTemplates
14+
ref: refs/tags/release
15+
- repository: eng
16+
type: git
17+
name: engineering
18+
ref: refs/tags/release
19+
20+
variables:
21+
- template: ci/variables/build.yml@eng
22+
- template: /ci/variables/cfs.yml@eng
23+
24+
extends:
25+
template: v1/1ES.Unofficial.PipelineTemplate.yml@1es
26+
parameters:
27+
pool:
28+
name: 1es-pool-azfunc
29+
image: 1es-windows-2022
30+
os: windows
31+
32+
stages:
33+
- stage: TestWindows
34+
jobs:
35+
- template: /eng/ci/templates/official/jobs/run-e2e-tests-windows.yml@self
36+
37+
- stage: TestLinux
38+
dependsOn:
39+
- TestWindows
40+
41+
jobs:
42+
- template: /eng/ci/templates/official/jobs/run-e2e-tests-linux.yml@self

eng/ci/official-build.yml

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
schedules:
2-
- cron: "0 0 * * *"
2+
- cron: "0 20 * * *"
33
displayName: Nightly Build
44
branches:
55
include:
@@ -53,7 +53,6 @@ extends:
5353

5454
- stage: TestLinux
5555
dependsOn:
56-
- Build
5756
- TestWindows
5857

5958
jobs:

eng/ci/templates/official/jobs/run-e2e-tests-linux.yml

+14-3
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,10 @@ jobs:
88
os: linux
99

1010
variables:
11-
buildNumber: $[ stageDependencies.Build.Build.outputs['output.buildNumber'] ]
12-
ApplicationInsightAgentVersion: 3.5.1
11+
${{ if contains(variables['Build.SourceBranch'], '/tags/' ) }}:
12+
isTagTemp: true
13+
isTag: $[variables.isTagTemp]
14+
ApplicationInsightAgentVersion: 3.5.2
1315

1416
strategy:
1517
maxParallel: 1
@@ -53,7 +55,16 @@ jobs:
5355
java -version
5456
displayName: 'Check default java version'
5557
- pwsh: |
56-
.\package-pipeline.ps1 -buildNumber $(buildNumber)
58+
if ("$(isTag)"){
59+
$buildNumber="$(Build.SourceBranchName)"
60+
Write-Host "Found git tag."
61+
}
62+
else {
63+
$buildNumber="$(Build.BuildNumber)-v4"
64+
Write-Host "git tag not found. Setting package suffix to '$buildNumber'"
65+
}
66+
Write-Host "##vso[task.setvariable variable=buildNumber;isOutput=true;]$buildNumber"
67+
.\package-pipeline.ps1 -buildNumber $buildNumber
5768
displayName: 'Executing build script'
5869
- task: UseDotNet@2
5970
displayName: 'Install .NET 6'

eng/ci/templates/official/jobs/run-e2e-tests-windows.yml

+15-3
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,10 @@ jobs:
88
os: windows
99

1010
variables:
11-
buildNumber: $[ stageDependencies.Build.Build.outputs['output.buildNumber'] ]
12-
ApplicationInsightAgentVersion: 3.5.1
11+
${{ if contains(variables['Build.SourceBranch'], '/tags/' ) }}:
12+
isTagTemp: true
13+
isTag: $[variables.isTagTemp]
14+
ApplicationInsightAgentVersion: 3.5.2
1315

1416
strategy:
1517
maxParallel: 1
@@ -43,7 +45,16 @@ jobs:
4345
java -version
4446
displayName: 'Check default java version'
4547
- pwsh: |
46-
.\package-pipeline.ps1 -buildNumber $(buildNumber)
48+
if ("$(isTag)"){
49+
$buildNumber="$(Build.SourceBranchName)"
50+
Write-Host "Found git tag."
51+
}
52+
else {
53+
$buildNumber="$(Build.BuildNumber)-v4"
54+
Write-Host "git tag not found. Setting package suffix to '$buildNumber'"
55+
}
56+
Write-Host "##vso[task.setvariable variable=buildNumber;isOutput=true;]$buildNumber"
57+
.\package-pipeline.ps1 -buildNumber $buildNumber
4758
displayName: 'Executing build script'
4859
- task: UseDotNet@2
4960
displayName: 'Install .NET 6'
@@ -61,6 +72,7 @@ jobs:
6172
- pwsh: |
6273
.\setup-tests-pipeline.ps1
6374
displayName: 'Setup test environment -- Install the Core Tools'
75+
6476
- pwsh: |
6577
$currDir = Get-Location
6678
$Env:Path = $Env:Path+";$currDir/Azure.Functions.Cli"

0 commit comments

Comments
 (0)