Skip to content

Commit 5e4a936

Browse files
author
Victoria Hall
committed
installing base extension to container
1 parent 69c7463 commit 5e4a936

File tree

3 files changed

+18
-42
lines changed

3 files changed

+18
-42
lines changed

.github/workflows/ci_docker_con_workflow.yml

+2-14
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
strategy:
1616
fail-fast: false
1717
matrix:
18-
python-version: [ 3.7, 3.8, 3.9, "3.10", "3.11" ]
18+
python-version: [ 3.8, 3.9, "3.10", "3.11" ]
1919
permissions: read-all
2020
env:
2121
CONSUMPTION_DOCKER_TEST: "true"
@@ -29,20 +29,8 @@ jobs:
2929
python-version: ${{ matrix.python-version }}
3030
- name: Install dependencies
3131
run: |
32-
python -m pip install -U -e .[dev]
32+
python -m pip install -U -e .
3333
python setup.py build
34-
- name: Running 3.7 Tests
35-
if: matrix.python-version == 3.7
36-
env:
37-
AzureWebJobsStorage: ${{ secrets.LinuxStorageConnectionString37 }}
38-
AzureWebJobsCosmosDBConnectionString: ${{ secrets.LinuxCosmosDBConnectionString37 }}
39-
AzureWebJobsEventHubConnectionString: ${{ secrets.LinuxEventHubConnectionString37 }}
40-
AzureWebJobsServiceBusConnectionString: ${{ secrets.LinuxServiceBusConnectionString37 }}
41-
AzureWebJobsSqlConnectionString: ${{ secrets.LinuxSqlConnectionString37 }}
42-
AzureWebJobsEventGridTopicUri: ${{ secrets.LinuxEventGridTopicUriString37 }}
43-
AzureWebJobsEventGridConnectionKey: ${{ secrets.LinuxEventGridConnectionKeyString37 }}
44-
run: |
45-
python -m pytest --reruns 4 -vv --instafail tests/endtoend
4634
- name: Running 3.8 Tests
4735
if: matrix.python-version == 3.8
4836
env:

.github/workflows/ci_docker_ded_workflow.yml

+2-14
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
strategy:
1616
fail-fast: false
1717
matrix:
18-
python-version: [ 3.7, 3.8, 3.9, "3.10", "3.11" ]
18+
python-version: [ 3.8, 3.9, "3.10", "3.11" ]
1919
permissions: read-all
2020
env:
2121
DEDICATED_DOCKER_TEST: "true"
@@ -29,20 +29,8 @@ jobs:
2929
python-version: ${{ matrix.python-version }}
3030
- name: Install dependencies
3131
run: |
32-
python -m pip install -U -e .[dev]
32+
python -m pip install -U -e .
3333
python setup.py build
34-
- name: Running 3.7 Tests
35-
if: matrix.python-version == 3.7
36-
env:
37-
AzureWebJobsStorage: ${{ secrets.LinuxStorageConnectionString37 }}
38-
AzureWebJobsCosmosDBConnectionString: ${{ secrets.LinuxCosmosDBConnectionString37 }}
39-
AzureWebJobsEventHubConnectionString: ${{ secrets.LinuxEventHubConnectionString37 }}
40-
AzureWebJobsServiceBusConnectionString: ${{ secrets.LinuxServiceBusConnectionString37 }}
41-
AzureWebJobsSqlConnectionString: ${{ secrets.LinuxSqlConnectionString37 }}
42-
AzureWebJobsEventGridTopicUri: ${{ secrets.LinuxEventGridTopicUriString37 }}
43-
AzureWebJobsEventGridConnectionKey: ${{ secrets.LinuxEventGridConnectionKeyString37 }}
44-
run: |
45-
python -m pytest --reruns 4 -vv --instafail tests/endtoend
4634
- name: Running 3.8 Tests
4735
if: matrix.python-version == 3.8
4836
env:

tests/utils/testutils_docker.py

+14-14
Original file line numberDiff line numberDiff line change
@@ -133,20 +133,20 @@ def create_container(self, image_repo: str, image_url: str,
133133

134134
function_path = "/home/site/wwwroot"
135135

136-
if configs.libraries:
137-
install_libraries_cmd = []
138-
install_libraries_cmd.extend(['pip', 'install'])
139-
install_libraries_cmd.extend(configs.libraries)
140-
install_libraries_cmd.extend(['-t',
141-
f'{script_path}/{_libraries_path}'])
142-
143-
install_libraries_process = \
144-
subprocess.run(args=install_libraries_cmd,
145-
stdout=subprocess.PIPE,
146-
stderr=subprocess.PIPE)
147-
148-
if install_libraries_process.returncode != 0:
149-
raise RuntimeError('Failed to install libraries')
136+
configs.libraries.append('azurefunctions-extensions-base')
137+
install_libraries_cmd = []
138+
install_libraries_cmd.extend(['pip', 'install'])
139+
install_libraries_cmd.extend(configs.libraries)
140+
install_libraries_cmd.extend(['-t',
141+
f'{script_path}/{_libraries_path}'])
142+
143+
install_libraries_process = \
144+
subprocess.run(args=install_libraries_cmd,
145+
stdout=subprocess.PIPE,
146+
stderr=subprocess.PIPE)
147+
148+
if install_libraries_process.returncode != 0:
149+
raise RuntimeError('Failed to install libraries')
150150

151151
run_cmd = []
152152
run_cmd.extend([_docker_cmd, "run", "-p", "0:80", "-d"])

0 commit comments

Comments
 (0)