Skip to content

Commit 700a015

Browse files
hallvictoriahallvictoria
committed
sync with ADO changes
1 parent 8a86816 commit 700a015

11 files changed

+188
-22
lines changed

‎eng/ci/core-tools-tests.yml

+27
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
resources:
2+
repositories:
3+
- repository: 1es
4+
type: git
5+
name: 1ESPipelineTemplates/1ESPipelineTemplates
6+
ref: refs/tags/release
7+
- repository: eng
8+
type: git
9+
name: engineering
10+
ref: refs/tags/release
11+
12+
variables:
13+
- template: ci/variables/build.yml@eng
14+
- template: /ci/variables/cfs.yml@eng
15+
16+
extends:
17+
template: v1/1ES.Unofficial.PipelineTemplate.yml@1es
18+
parameters:
19+
pool:
20+
name: 1es-pool-azfunc
21+
image: 1es-windows-2022
22+
os: windows
23+
24+
stages:
25+
- stage: RunCoreToolsTests
26+
jobs:
27+
- template: /eng/templates/official/jobs/ci-core-tools-tests.yml@self

‎eng/ci/custom-image-tests.yml

+27
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
resources:
2+
repositories:
3+
- repository: 1es
4+
type: git
5+
name: 1ESPipelineTemplates/1ESPipelineTemplates
6+
ref: refs/tags/release
7+
- repository: eng
8+
type: git
9+
name: engineering
10+
ref: refs/tags/release
11+
12+
variables:
13+
- template: ci/variables/build.yml@eng
14+
- template: /ci/variables/cfs.yml@eng
15+
16+
extends:
17+
template: v1/1ES.Unofficial.PipelineTemplate.yml@1es
18+
parameters:
19+
pool:
20+
name: 1es-pool-azfunc
21+
image: 1es-windows-2022
22+
os: windows
23+
24+
stages:
25+
- stage: RunCustomDockerImageTests
26+
jobs:
27+
- template: /eng/templates/official/jobs/ci-custom-image-tests.yml@self

‎eng/ci/docker-tests.yml

+48
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
1+
trigger:
2+
batch: true
3+
branches:
4+
include:
5+
- dev
6+
- release/*
7+
8+
# CI only, does not trigger on PRs.
9+
pr: none
10+
11+
schedules:
12+
- cron: "0 10 * * *"
13+
displayName: Run everyday at 5 AM CST
14+
branches:
15+
include:
16+
- dev
17+
always: true
18+
19+
resources:
20+
repositories:
21+
- repository: 1es
22+
type: git
23+
name: 1ESPipelineTemplates/1ESPipelineTemplates
24+
ref: refs/tags/release
25+
- repository: eng
26+
type: git
27+
name: engineering
28+
ref: refs/tags/release
29+
30+
variables:
31+
- template: ci/variables/build.yml@eng
32+
- template: /ci/variables/cfs.yml@eng
33+
34+
extends:
35+
template: v1/1ES.Unofficial.PipelineTemplate.yml@1es
36+
parameters:
37+
pool:
38+
name: 1es-pool-azfunc
39+
image: 1es-windows-2022
40+
os: windows
41+
42+
stages:
43+
- stage: RunDockerConsumptionTests
44+
jobs:
45+
- template: /eng/templates/official/jobs/ci-consumption-tests.yml@self
46+
- stage: RunDockerDedicatedTests
47+
jobs:
48+
- template: /eng/templates/official/jobs/ci-dedicated-tests.yml@self

‎eng/ci/integration-tests.yml

+41
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
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: RunE2ETests
34+
jobs:
35+
- template: /eng/templates/official/jobs/ci-e2e-tests.yml@self
36+
- stage: RunLCTests
37+
jobs:
38+
- template: /eng/templates/official/jobs/ci-lc-tests.yml@self
39+
- stage: RunUnitTests
40+
jobs:
41+
- template: /eng/templates/jobs/ci-unit-tests.yml@self

‎eng/ci/official-build.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -48,10 +48,10 @@ extends:
4848
dependsOn: Build
4949
jobs:
5050
- template: /eng/templates/official/jobs/ci-e2e-tests.yml@self
51-
- stage: RunCoreToolsTests
51+
- stage: RunUnitTests
5252
dependsOn: Build
5353
jobs:
54-
- template: /eng/templates/official/jobs/ci-core-tools-tests.yml@self
54+
- template: /eng/templates/jobs/ci-unit-tests.yml@self
5555
- stage: RunDockerConsumptionTests
5656
dependsOn: Build
5757
jobs:
@@ -63,4 +63,4 @@ extends:
6363
- stage: RunLinuxConsumptionTests
6464
dependsOn: Build
6565
jobs:
66-
- template: /eng/templates/official/jobs/ci-lc-tests.yml@self
66+
- template: /eng/templates/official/jobs/ci-lc-tests.yml@self

‎eng/templates/official/jobs/ci-consumption-tests.yml

+1-9
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,6 @@ jobs:
99

1010
strategy:
1111
matrix:
12-
Python37:
13-
PYTHON_VERSION: '3.7'
14-
STORAGE_CONNECTION: $(LinuxStorageConnectionString37)
15-
COSMOSDB_CONNECTION: $(LinuxCosmosDBConnectionString37)
16-
EVENTHUB_CONNECTION: $(LinuxEventHubConnectionString37)
17-
SERVICEBUS_CONNECTION: $(LinuxServiceBusConnectionString37)
18-
SQL_CONNECTION: $(LinuxSqlConnectionString37)
19-
EVENTGRID_URI: $(LinuxEventGridTopicUriString37)
20-
EVENTGRID_CONNECTION: $(LinuxEventGridConnectionKeyString37)
2112
Python38:
2213
PYTHON_VERSION: '3.8'
2314
STORAGE_CONNECTION: $(LinuxStorageConnectionString38)
@@ -60,6 +51,7 @@ jobs:
6051
inputs:
6152
versionSpec: $(PYTHON_VERSION)
6253
- bash: |
54+
python -m pip install -U -e .[dev]
6355
python setup.py build
6456
displayName: 'Install dependencies'
6557
- bash: |

‎eng/templates/official/jobs/ci-custom-image-tests.yml

+31
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
jobs:
2+
- job: "TestPython"
3+
displayName: "Run Python Docker Custom Tests"
4+
5+
pool:
6+
name: 1es-pool-azfunc
7+
image: 1es-ubuntu-22.04
8+
os: linux
9+
10+
steps:
11+
- task: UsePythonVersion@0
12+
inputs:
13+
versionSpec: $(CUSTOM_PYTHON_VERSION)
14+
- bash: |
15+
python -m pip install -U -e .[dev]
16+
python setup.py build
17+
displayName: 'Install dependencies'
18+
- bash: |
19+
python -m pytest --reruns 4 -vv --instafail tests/endtoend
20+
env:
21+
DEDICATED_DOCKER_TEST: $(CUSTOM_DED_IMAGE)
22+
CONSUMPTION_DOCKER_TEST: $(CUSTOM_CON_IMAGE)
23+
IMAGE_NAME: $(CUSTOM_IMAGE_NAME)
24+
AzureWebJobsStorage: $(LinuxStorageConnectionString311)
25+
AzureWebJobsCosmosDBConnectionString: $(LinuxCosmosDBConnectionString311)
26+
AzureWebJobsEventHubConnectionString: $(LinuxEventHubConnectionString311)
27+
AzureWebJobsServiceBusConnectionString: $(LinuxServiceBusConnectionString311)
28+
AzureWebJobsSqlConnectionString: $(LinuxSqlConnectionString311)
29+
AzureWebJobsEventGridTopicUri: $(LinuxEventGridTopicUriString311)
30+
AzureWebJobsEventGridConnectionKey: $(LinuxEventGridConnectionKeyString311)
31+
displayName: "Running Python DockerCustom tests"

‎eng/templates/official/jobs/ci-dedicated-tests.yml

+1-9
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,6 @@ jobs:
99

1010
strategy:
1111
matrix:
12-
Python37:
13-
PYTHON_VERSION: '3.7'
14-
STORAGE_CONNECTION: $(LinuxStorageConnectionString37)
15-
COSMOSDB_CONNECTION: $(LinuxCosmosDBConnectionString37)
16-
EVENTHUB_CONNECTION: $(LinuxEventHubConnectionString37)
17-
SERVICEBUS_CONNECTION: $(LinuxServiceBusConnectionString37)
18-
SQL_CONNECTION: $(LinuxSqlConnectionString37)
19-
EVENTGRID_URI: $(LinuxEventGridTopicUriString37)
20-
EVENTGRID_CONNECTION: $(LinuxEventGridConnectionKeyString37)
2112
Python38:
2213
PYTHON_VERSION: '3.8'
2314
STORAGE_CONNECTION: $(LinuxStorageConnectionString38)
@@ -60,6 +51,7 @@ jobs:
6051
inputs:
6152
versionSpec: $(PYTHON_VERSION)
6253
- bash: |
54+
python -m pip install -U -e .[dev]
6355
python setup.py build
6456
displayName: 'Install dependencies'
6557
- bash: |

‎eng/templates/official/jobs/ci-e2e-tests.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -89,4 +89,4 @@ jobs:
8989
AzureWebJobsSqlConnectionString: $(SQL_CONNECTION)
9090
AzureWebJobsEventGridTopicUri: $(EVENTGRID_URI)
9191
AzureWebJobsEventGridConnectionKey: $(EVENTGRID_CONNECTION)
92-
displayName: "Running $(PYTHON_VERSION)"
92+
displayName: "Running $(PYTHON_VERSION) Python E2E Tests"

‎pack/templates/nix_env_gen.yml

+4
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,10 @@ parameters:
44
workerPath: ''
55

66
steps:
7+
- task: UsePythonVersion@0
8+
inputs:
9+
versionSpec: ${{ parameters.pythonVersion }}
10+
addToPath: true
711
- task: ShellScript@2
812
inputs:
913
disableAutoCwd: true

‎pack/templates/win_env_gen.yml

+4
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,10 @@ parameters:
44
workerPath: ''
55

66
steps:
7+
- task: UsePythonVersion@0
8+
inputs:
9+
versionSpec: ${{ parameters.pythonVersion }}
10+
addToPath: true
711
- task: PowerShell@2
812
inputs:
913
filePath: 'pack\scripts\win_deps.ps1'

0 commit comments

Comments
 (0)