Skip to content

refactor: updating pipeline variable references #1534

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 16 commits into from
Jul 16, 2024
Merged

refactor: updating pipeline variable references #1534

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
7e669db
test pipeline with variable group
hallvictoria Jul 15, 2024
6d8eb9d
added variable group as part of pipelines
hallvictoria Jul 15, 2024
21ba443
dev testing based on branch name
hallvictoria Jul 15, 2024
a7dd3ee
typo
hallvictoria Jul 15, 2024
32f3248
factor out strategy
hallvictoria Jul 15, 2024
1ff66a6
test e2e
hallvictoria Jul 15, 2024
93e64ad
extends in ci
hallvictoria Jul 15, 2024
69c4ae4
syntax attempt
hallvictoria Jul 15, 2024
cf3631a
lc testgs
hallvictoria Jul 15, 2024
ae0a272
revert
hallvictoria Jul 15, 2024
930025d
strategy
hallvictoria Jul 15, 2024
b1125bc
revert
hallvictoria Jul 15, 2024
c1b9bc2
missed refs
hallvictoria Jul 15, 2024
df8eb02
test variable
hallvictoria Jul 15, 2024
96cc5f7
revert test dev packages for unit, lc tests
hallvictoria Jul 15, 2024
7a2ce02
missed ref
hallvictoria Jul 15, 2024
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
2 changes: 1 addition & 1 deletion eng/ci/core-tools-tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ resources:
variables:
- template: /ci/variables/build.yml@eng
- template: /ci/variables/cfs.yml@eng

- group: python-integration-resources
extends:
template: v1/1ES.Unofficial.PipelineTemplate.yml@1es
parameters:
Expand Down
1 change: 1 addition & 0 deletions eng/ci/custom-image-tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ resources:
variables:
- template: /ci/variables/build.yml@eng
- template: /ci/variables/cfs.yml@eng
- group: python-integration-resources

extends:
template: v1/1ES.Unofficial.PipelineTemplate.yml@1es
Expand Down
1 change: 1 addition & 0 deletions eng/ci/docker-consumption-tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ resources:
variables:
- template: /ci/variables/build.yml@eng
- template: /ci/variables/cfs.yml@eng
- group: python-integration-resources

extends:
template: v1/1ES.Unofficial.PipelineTemplate.yml@1es
Expand Down
1 change: 1 addition & 0 deletions eng/ci/docker-dedicated-tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ resources:
variables:
- template: /ci/variables/build.yml@eng
- template: /ci/variables/cfs.yml@eng
- group: python-integration-resources

extends:
template: v1/1ES.Unofficial.PipelineTemplate.yml@1es
Expand Down
1 change: 1 addition & 0 deletions eng/ci/integration-tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ resources:
variables:
- template: /ci/variables/build.yml@eng
- template: /ci/variables/cfs.yml@eng
- group: python-integration-resources

extends:
template: v1/1ES.Unofficial.PipelineTemplate.yml@1es
Expand Down
1 change: 1 addition & 0 deletions eng/ci/official-build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ resources:
variables:
- template: /ci/variables/build.yml@eng
- template: /ci/variables/cfs.yml@eng
- group: python-integration-resources

extends:
template: v1/1ES.Official.PipelineTemplate.yml@1es
Expand Down
6 changes: 3 additions & 3 deletions eng/templates/jobs/ci-unit-tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,17 +26,17 @@ jobs:
- bash: |
python -m pip install --upgrade pip
python -m pip install -U azure-functions --pre
python -m pip install -U -e .[dev]

python -m pip install -U -e .[dev]
if [[ $(PYTHON_VERSION) != "3.7" ]]; then
python -m pip install --pre -U -e .[test-http-v2]
python -m pip install --pre -U -e .[test-http-v2]
fi

cd tests
python -m invoke -c test_setup build-protos
python -m invoke -c test_setup webhost --branch-name=dev
python -m invoke -c test_setup extensions
displayName: "Install dependencies"
displayName: 'Install dependencies'
- bash: |
python -m pytest -q -n auto --dist loadfile --reruns 4 --instafail --cov=./azure_functions_worker --cov-report xml --cov-branch tests/unittests
displayName: "Running $(PYTHON_VERSION) Unit Tests"
Expand Down
12 changes: 6 additions & 6 deletions eng/templates/official/jobs/ci-e2e-tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ jobs:
python -m invoke -c test_setup webhost --branch-name=dev
python -m invoke -c test_setup extensions
displayName: 'Install dependencies and the worker'
condition: and(eq(variables['USETESTPYTHONSDK'], false), eq(variables['USETESTPYTHONEXTENSIONS'], false))
condition: and(ne(variables['Build.SourceBranch'], 'refs/heads/sdk/*'), ne(variables['Build.SourceBranch'], 'refs/heads/extensions/*'))
- task: DownloadPipelineArtifact@2
displayName: 'Download Python SDK Artifact'
inputs:
Expand All @@ -89,7 +89,7 @@ jobs:
definition: 679
buildVersionToDownload: latest
targetPath: '$(Pipeline.Workspace)/PythonSdkArtifact'
condition: eq(variables['USETESTPYTHONSDK'], true)
condition: eq(variables['Build.SourceBranch'], 'refs/heads/sdk/*')
- bash: |
python -m pip install --upgrade pip
python -m pip install -e $(Pipeline.Workspace)/PythonSdkArtifact
Expand All @@ -107,7 +107,7 @@ jobs:
python -m invoke -c test_setup webhost --branch-name=dev
python -m invoke -c test_setup extensions
displayName: 'Install test python sdk, dependencies and the worker'
condition: eq(variables['USETESTPYTHONSDK'], true)
condition: eq(variables['Build.SourceBranch'], 'refs/heads/sdk/*')
- task: DownloadPipelineArtifact@2
displayName: 'Download Python Extension Artifact'
inputs:
Expand All @@ -117,7 +117,7 @@ jobs:
definition: 798
buildVersionToDownload: latest
targetPath: '$(Pipeline.Workspace)/PythonExtensionArtifact'
condition: eq(variables['USETESTPYTHONEXTENSIONS'], true)
condition: eq(variables['Build.SourceBranch'], 'refs/heads/extensions/*')
- bash: |
python -m pip install --upgrade pip

Expand All @@ -137,7 +137,7 @@ jobs:
python -m invoke -c test_setup webhost --branch-name=dev
python -m invoke -c test_setup extensions
displayName: 'Install test python extension, dependencies and the worker'
condition: eq(variables['USETESTPYTHONEXTENSIONS'], true)
condition: eq(variables['Build.SourceBranch'], 'refs/heads/extensions/*')
- bash: |
python -m pytest -q -n auto --dist loadfile --reruns 4 --cov=./azure_functions_worker --cov-report xml --cov-branch --cov-append tests/endtoend tests/extension_tests/deferred_bindings_tests tests/extension_tests/http_v2_tests
env:
Expand All @@ -148,5 +148,5 @@ jobs:
AzureWebJobsSqlConnectionString: $(SQL_CONNECTION)
AzureWebJobsEventGridTopicUri: $(EVENTGRID_URI)
AzureWebJobsEventGridConnectionKey: $(EVENTGRID_CONNECTION)
USETESTPYTHONSDK: $(USETESTPYTHONSDK)
USETESTPYTHONSDK: eq(variables['Build.SourceBranch'], 'refs/heads/sdk/*')
displayName: "Running $(PYTHON_VERSION) Python E2E Tests"
5 changes: 0 additions & 5 deletions eng/templates/official/jobs/ci-lc-tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,13 +31,8 @@ jobs:
versionSpec: $(PYTHON_VERSION)
- bash: |
python -m pip install --upgrade pip
python -m pip install -U azure-functions --pre
python -m pip install -U -e .[dev]

if [[ $(PYTHON_VERSION) != "3.7" ]]; then
python -m pip install --pre -U -e .[test-http-v2]
fi

cd tests
python -m invoke -c test_setup build-protos
displayName: 'Install dependencies and the worker'
Expand Down