Skip to content

Commit 804cf6d

Browse files
committed
2 parents 5ba3131 + 95a4793 commit 804cf6d

File tree

8 files changed

+29
-14
lines changed

8 files changed

+29
-14
lines changed

eng/ci/emulator-tests.yml

+6-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,9 @@
1-
trigger: none # ensure this is not ran as a CI build
1+
trigger: # run for sdk and extension release branches
2+
batch: true
3+
branches:
4+
include:
5+
- sdk/*
6+
- extensions/*
27

38
pr:
49
branches:

eng/ci/public-build.yml

+10-8
Original file line numberDiff line numberDiff line change
@@ -28,14 +28,6 @@ resources:
2828

2929
variables:
3030
- template: /eng/templates/utils/variables.yml@self
31-
- name: codeql.excludePathPatterns
32-
value: deps/,build/
33-
- name: codeql.compiled.enabled
34-
value: true
35-
- name: codeql.runSourceLanguagesInSourceAnalysis
36-
value: true
37-
- name: codeql.sourceLanguages
38-
value: python, powershell
3931

4032
extends:
4133
template: v1/1ES.Unofficial.PipelineTemplate.yml@1es
@@ -44,8 +36,18 @@ extends:
4436
name: 1es-pool-azfunc-public
4537
image: 1es-windows-2022
4638
os: windows
39+
40+
sdl:
41+
codeql:
42+
compiled:
43+
enabled: true # still only runs for default branch
44+
sourceLanguages: python, powershell
45+
excludePathPatterns: deps/,build/
46+
runSourceLanguagesInSourceAnalysis: true
47+
4748
settings:
4849
skipBuildTagsForGitHubPullRequests: ${{ variables['System.PullRequest.IsFork'] }}
50+
4951
stages:
5052
- stage: Build
5153
jobs:

eng/scripts/test-extensions.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22

33
python -m pip install --upgrade pip
44
if [[ $2 != "3.7" ]]; then
5-
python -m pip install -e $1/PythonExtensionArtifact
5+
python -m pip install -e $1/PythonExtensionArtifact/$3
66
python -m pip install --pre -e .[test-http-v2]
77
fi
88
if [[ $2 != "3.7" && $2 != "3.8" ]]; then
9-
python -m pip install -e $1/PythonExtensionArtifact
9+
python -m pip install -e $1/PythonExtensionArtifact/$3
1010
python -m pip install --pre -U -e .[test-deferred-bindings]
1111
fi
1212

eng/templates/jobs/ci-emulator-tests.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ jobs:
6969
chmod +x eng/scripts/test-setup.sh
7070
chmod +x eng/scripts/test-extensions.sh
7171
72-
eng/scripts/test-extensions.sh $(Pipeline.Workspace) $(PYTHON_VERSION)
72+
eng/scripts/test-extensions.sh $(Pipeline.Workspace) $(PYTHON_VERSION) $(PYTHONEXTENSIONNAME)
7373
eng/scripts/test-setup.sh
7474
displayName: 'Install test python extension, dependencies and the worker'
7575
condition: or(eq(variables.isExtensionsRelease, true), eq(variables['USETESTPYTHONEXTENSIONS'], true))

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ jobs:
111111
chmod +x eng/scripts/test-setup.sh
112112
chmod +x eng/scripts/test-extensions.sh
113113
114-
eng/scripts/test-extensions.sh $(Pipeline.Workspace) $(PYTHON_VERSION)
114+
eng/scripts/test-extensions.sh $(Pipeline.Workspace) $(PYTHON_VERSION) $(PYTHONEXTENSIONNAME)
115115
eng/scripts/test-setup.sh
116116
displayName: 'Install test python extension, dependencies and the worker'
117117
condition: or(eq(variables.isExtensionsRelease, true), eq(variables['USETESTPYTHONEXTENSIONS'], true))

pyproject.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ test-http-v2 = [
7878
"orjson"
7979
]
8080
test-deferred-bindings = [
81-
"azurefunctions-extensions-bindings-blob==1.0.0b2"
81+
"azurefunctions-extensions-bindings-blob==1.0.0b3"
8282
]
8383

8484
[build-system]

python/prodV4/worker.config.json

+4
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,9 @@
99
"defaultExecutablePath":"python",
1010
"defaultWorkerPath":"%FUNCTIONS_WORKER_RUNTIME_VERSION%/{os}/{architecture}/worker.py",
1111
"workerIndexing": "true"
12+
},
13+
"processOptions": {
14+
"initializationTimeout": "00:02:00",
15+
"environmentReloadTimeout": "00:02:00"
1216
}
1317
}

python/test/worker.config.json

+4
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,9 @@
55
"defaultExecutablePath":"python",
66
"defaultWorkerPath":"worker.py",
77
"workerIndexing": "true"
8+
},
9+
"processOptions": {
10+
"initializationTimeout": "00:02:00",
11+
"environmentReloadTimeout": "00:02:00"
812
}
913
}

0 commit comments

Comments
 (0)