From 521c3eb0493edbdf8dd604e3d1036ae509a5bf69 Mon Sep 17 00:00:00 2001 From: Emmett Butler <723615+emmettbutler@users.noreply.github.com> Date: Wed, 9 Oct 2024 14:20:38 -0400 Subject: [PATCH] implement python injection test matrix [APMON-1544] (#3186) --- .gitlab-ci.yml | 18 +++++++++++++++++- ...n_test-app-python-container-3.10-alpine.yml | 16 ++++++++++++++++ ...rovision_test-app-python-container-3.10.yml | 16 ++++++++++++++++ ...n_test-app-python-container-3.11-alpine.yml | 16 ++++++++++++++++ ...rovision_test-app-python-container-3.11.yml | 16 ++++++++++++++++ ...n_test-app-python-container-3.12-alpine.yml | 16 ++++++++++++++++ ...rovision_test-app-python-container-3.12.yml | 16 ++++++++++++++++ ...on_test-app-python-container-3.7-alpine.yml | 16 ++++++++++++++++ ...provision_test-app-python-container-3.7.yml | 16 ++++++++++++++++ ...provision_test-app-python-container-3.8.yml | 16 ++++++++++++++++ ...on_test-app-python-container-3.9-alpine.yml | 16 ++++++++++++++++ ...provision_test-app-python-container-3.9.yml | 16 ++++++++++++++++ .../Dockerfile.template | 9 +++++++++ .../Dockerfile.template | 9 +++++++++ .../Dockerfile.template | 9 +++++++++ .../Dockerfile.template | 9 +++++++++ .../Dockerfile.template | 9 +++++++++ .../Dockerfile.template | 9 +++++++++ .../Dockerfile.template | 9 +++++++++ .../Dockerfile.template | 9 +++++++++ .../Dockerfile.template | 9 +++++++++ .../Dockerfile.template | 9 +++++++++ .../Dockerfile.template | 9 +++++++++ .../weblogs/ruby/provision_test-app-ruby.yml | 4 ++-- .../virtual_machine_provisioner.py | 8 +++++++- 25 files changed, 301 insertions(+), 4 deletions(-) create mode 100644 utils/build/virtual_machine/weblogs/python/provision_test-app-python-container-3.10-alpine.yml create mode 100644 utils/build/virtual_machine/weblogs/python/provision_test-app-python-container-3.10.yml create mode 100644 utils/build/virtual_machine/weblogs/python/provision_test-app-python-container-3.11-alpine.yml create mode 100644 utils/build/virtual_machine/weblogs/python/provision_test-app-python-container-3.11.yml create mode 100644 utils/build/virtual_machine/weblogs/python/provision_test-app-python-container-3.12-alpine.yml create mode 100644 utils/build/virtual_machine/weblogs/python/provision_test-app-python-container-3.12.yml create mode 100644 utils/build/virtual_machine/weblogs/python/provision_test-app-python-container-3.7-alpine.yml create mode 100644 utils/build/virtual_machine/weblogs/python/provision_test-app-python-container-3.7.yml create mode 100644 utils/build/virtual_machine/weblogs/python/provision_test-app-python-container-3.8.yml create mode 100644 utils/build/virtual_machine/weblogs/python/provision_test-app-python-container-3.9-alpine.yml create mode 100644 utils/build/virtual_machine/weblogs/python/provision_test-app-python-container-3.9.yml create mode 100644 utils/build/virtual_machine/weblogs/python/test-app-python-container-3.10-alpine/Dockerfile.template create mode 100644 utils/build/virtual_machine/weblogs/python/test-app-python-container-3.10/Dockerfile.template create mode 100644 utils/build/virtual_machine/weblogs/python/test-app-python-container-3.11-alpine/Dockerfile.template create mode 100644 utils/build/virtual_machine/weblogs/python/test-app-python-container-3.11/Dockerfile.template create mode 100644 utils/build/virtual_machine/weblogs/python/test-app-python-container-3.12-alpine/Dockerfile.template create mode 100644 utils/build/virtual_machine/weblogs/python/test-app-python-container-3.12/Dockerfile.template create mode 100644 utils/build/virtual_machine/weblogs/python/test-app-python-container-3.7-alpine/Dockerfile.template create mode 100644 utils/build/virtual_machine/weblogs/python/test-app-python-container-3.7/Dockerfile.template create mode 100644 utils/build/virtual_machine/weblogs/python/test-app-python-container-3.8/Dockerfile.template create mode 100644 utils/build/virtual_machine/weblogs/python/test-app-python-container-3.9-alpine/Dockerfile.template create mode 100644 utils/build/virtual_machine/weblogs/python/test-app-python-container-3.9/Dockerfile.template diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b0b3bf54ec..3f9b296863 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -171,7 +171,23 @@ onboarding_python: ONBOARDING_FILTER_WEBLOG: [test-app-python-container,test-app-python-alpine] SCENARIO: [ CONTAINER_AUTO_INJECTION_INSTALL_SCRIPT] - ONBOARDING_FILTER_ENV: [dev, prod] - ONBOARDING_FILTER_WEBLOG: [test-app-python,test-app-python-container,test-app-python-alpine] + ONBOARDING_FILTER_WEBLOG: [ + test-app-python, + test-app-python-container, + test-app-python-alpine, + test-app-python-alpine-libgcc, + test-app-python-container-3.7, + test-app-python-container-3.8, + test-app-python-container-3.9, + test-app-python-container-3.10, + test-app-python-container-3.11, + test-app-python-container-3.12, + test-app-python-container-3.7-alpine, + test-app-python-container-3.9-alpine, + test-app-python-container-3.10-alpine, + test-app-python-container-3.11-alpine, + test-app-python-container-3.12-alpine, + ] SCENARIO: [INSTALLER_AUTO_INJECTION] - ONBOARDING_FILTER_ENV: [dev, prod] ONBOARDING_FILTER_WEBLOG: [test-app-python] diff --git a/utils/build/virtual_machine/weblogs/python/provision_test-app-python-container-3.10-alpine.yml b/utils/build/virtual_machine/weblogs/python/provision_test-app-python-container-3.10-alpine.yml new file mode 100644 index 0000000000..74ca855b13 --- /dev/null +++ b/utils/build/virtual_machine/weblogs/python/provision_test-app-python-container-3.10-alpine.yml @@ -0,0 +1,16 @@ +weblog: + name: test-app-python-container-3.10-alpine + exact_os_branches: [ubuntu24] + install: + - os_type: linux + copy_files: + - name: copy-container-run-script + local_path: utils/build/virtual_machine/weblogs/common/create_and_run_app_container.sh + - name: copy-docker-compose-file + local_path: utils/build/virtual_machine/weblogs/common/docker-compose.yml + - name: copy-python-app + local_path: lib-injection/build/docker/python/dd-lib-python-init-test-django + - name: copy-python-app-dockerfile + local_path: utils/build/virtual_machine/weblogs/python/test-app-python-container-3.10-alpine/Dockerfile.template + + remote-command: sh create_and_run_app_container.sh diff --git a/utils/build/virtual_machine/weblogs/python/provision_test-app-python-container-3.10.yml b/utils/build/virtual_machine/weblogs/python/provision_test-app-python-container-3.10.yml new file mode 100644 index 0000000000..8957ef1f6b --- /dev/null +++ b/utils/build/virtual_machine/weblogs/python/provision_test-app-python-container-3.10.yml @@ -0,0 +1,16 @@ +weblog: + name: test-app-python-container-3.10 + exact_os_branches: [ubuntu24] + install: + - os_type: linux + copy_files: + - name: copy-container-run-script + local_path: utils/build/virtual_machine/weblogs/common/create_and_run_app_container.sh + - name: copy-docker-compose-file + local_path: utils/build/virtual_machine/weblogs/common/docker-compose.yml + - name: copy-python-app + local_path: lib-injection/build/docker/python/dd-lib-python-init-test-django + - name: copy-python-app-dockerfile + local_path: utils/build/virtual_machine/weblogs/python/test-app-python-container-3.10/Dockerfile.template + + remote-command: sh create_and_run_app_container.sh diff --git a/utils/build/virtual_machine/weblogs/python/provision_test-app-python-container-3.11-alpine.yml b/utils/build/virtual_machine/weblogs/python/provision_test-app-python-container-3.11-alpine.yml new file mode 100644 index 0000000000..97e67ded64 --- /dev/null +++ b/utils/build/virtual_machine/weblogs/python/provision_test-app-python-container-3.11-alpine.yml @@ -0,0 +1,16 @@ +weblog: + name: test-app-python-container-3.11-alpine + exact_os_branches: [ubuntu24] + install: + - os_type: linux + copy_files: + - name: copy-container-run-script + local_path: utils/build/virtual_machine/weblogs/common/create_and_run_app_container.sh + - name: copy-docker-compose-file + local_path: utils/build/virtual_machine/weblogs/common/docker-compose.yml + - name: copy-python-app + local_path: lib-injection/build/docker/python/dd-lib-python-init-test-django + - name: copy-python-app-dockerfile + local_path: utils/build/virtual_machine/weblogs/python/test-app-python-container-3.11-alpine/Dockerfile.template + + remote-command: sh create_and_run_app_container.sh diff --git a/utils/build/virtual_machine/weblogs/python/provision_test-app-python-container-3.11.yml b/utils/build/virtual_machine/weblogs/python/provision_test-app-python-container-3.11.yml new file mode 100644 index 0000000000..a3f65d9c19 --- /dev/null +++ b/utils/build/virtual_machine/weblogs/python/provision_test-app-python-container-3.11.yml @@ -0,0 +1,16 @@ +weblog: + name: test-app-python-container-3.11 + exact_os_branches: [ubuntu24] + install: + - os_type: linux + copy_files: + - name: copy-container-run-script + local_path: utils/build/virtual_machine/weblogs/common/create_and_run_app_container.sh + - name: copy-docker-compose-file + local_path: utils/build/virtual_machine/weblogs/common/docker-compose.yml + - name: copy-python-app + local_path: lib-injection/build/docker/python/dd-lib-python-init-test-django + - name: copy-python-app-dockerfile + local_path: utils/build/virtual_machine/weblogs/python/test-app-python-container-3.11/Dockerfile.template + + remote-command: sh create_and_run_app_container.sh diff --git a/utils/build/virtual_machine/weblogs/python/provision_test-app-python-container-3.12-alpine.yml b/utils/build/virtual_machine/weblogs/python/provision_test-app-python-container-3.12-alpine.yml new file mode 100644 index 0000000000..b1a4386308 --- /dev/null +++ b/utils/build/virtual_machine/weblogs/python/provision_test-app-python-container-3.12-alpine.yml @@ -0,0 +1,16 @@ +weblog: + name: test-app-python-container-3.12-alpine + exact_os_branches: [ubuntu24] + install: + - os_type: linux + copy_files: + - name: copy-container-run-script + local_path: utils/build/virtual_machine/weblogs/common/create_and_run_app_container.sh + - name: copy-docker-compose-file + local_path: utils/build/virtual_machine/weblogs/common/docker-compose.yml + - name: copy-python-app + local_path: lib-injection/build/docker/python/dd-lib-python-init-test-django + - name: copy-python-app-dockerfile + local_path: utils/build/virtual_machine/weblogs/python/test-app-python-container-3.12-alpine/Dockerfile.template + + remote-command: sh create_and_run_app_container.sh diff --git a/utils/build/virtual_machine/weblogs/python/provision_test-app-python-container-3.12.yml b/utils/build/virtual_machine/weblogs/python/provision_test-app-python-container-3.12.yml new file mode 100644 index 0000000000..e8e2ceba00 --- /dev/null +++ b/utils/build/virtual_machine/weblogs/python/provision_test-app-python-container-3.12.yml @@ -0,0 +1,16 @@ +weblog: + name: test-app-python-container-3.12 + exact_os_branches: [ubuntu24] + install: + - os_type: linux + copy_files: + - name: copy-container-run-script + local_path: utils/build/virtual_machine/weblogs/common/create_and_run_app_container.sh + - name: copy-docker-compose-file + local_path: utils/build/virtual_machine/weblogs/common/docker-compose.yml + - name: copy-python-app + local_path: lib-injection/build/docker/python/dd-lib-python-init-test-django + - name: copy-python-app-dockerfile + local_path: utils/build/virtual_machine/weblogs/python/test-app-python-container-3.12/Dockerfile.template + + remote-command: sh create_and_run_app_container.sh diff --git a/utils/build/virtual_machine/weblogs/python/provision_test-app-python-container-3.7-alpine.yml b/utils/build/virtual_machine/weblogs/python/provision_test-app-python-container-3.7-alpine.yml new file mode 100644 index 0000000000..3f29009654 --- /dev/null +++ b/utils/build/virtual_machine/weblogs/python/provision_test-app-python-container-3.7-alpine.yml @@ -0,0 +1,16 @@ +weblog: + name: test-app-python-container-3.7-alpine + exact_os_branches: [ubuntu24] + install: + - os_type: linux + copy_files: + - name: copy-container-run-script + local_path: utils/build/virtual_machine/weblogs/common/create_and_run_app_container.sh + - name: copy-docker-compose-file + local_path: utils/build/virtual_machine/weblogs/common/docker-compose.yml + - name: copy-python-app + local_path: lib-injection/build/docker/python/dd-lib-python-init-test-django + - name: copy-python-app-dockerfile + local_path: utils/build/virtual_machine/weblogs/python/test-app-python-container-3.7-alpine/Dockerfile.template + + remote-command: sh create_and_run_app_container.sh diff --git a/utils/build/virtual_machine/weblogs/python/provision_test-app-python-container-3.7.yml b/utils/build/virtual_machine/weblogs/python/provision_test-app-python-container-3.7.yml new file mode 100644 index 0000000000..e6b47b6780 --- /dev/null +++ b/utils/build/virtual_machine/weblogs/python/provision_test-app-python-container-3.7.yml @@ -0,0 +1,16 @@ +weblog: + name: test-app-python-container-3.7 + exact_os_branches: [ubuntu24] + install: + - os_type: linux + copy_files: + - name: copy-container-run-script + local_path: utils/build/virtual_machine/weblogs/common/create_and_run_app_container.sh + - name: copy-docker-compose-file + local_path: utils/build/virtual_machine/weblogs/common/docker-compose.yml + - name: copy-python-app + local_path: lib-injection/build/docker/python/dd-lib-python-init-test-django + - name: copy-python-app-dockerfile + local_path: utils/build/virtual_machine/weblogs/python/test-app-python-container-3.7/Dockerfile.template + + remote-command: sh create_and_run_app_container.sh diff --git a/utils/build/virtual_machine/weblogs/python/provision_test-app-python-container-3.8.yml b/utils/build/virtual_machine/weblogs/python/provision_test-app-python-container-3.8.yml new file mode 100644 index 0000000000..be94e15e9f --- /dev/null +++ b/utils/build/virtual_machine/weblogs/python/provision_test-app-python-container-3.8.yml @@ -0,0 +1,16 @@ +weblog: + name: test-app-python-container-3.8 + exact_os_branches: [ubuntu24] + install: + - os_type: linux + copy_files: + - name: copy-container-run-script + local_path: utils/build/virtual_machine/weblogs/common/create_and_run_app_container.sh + - name: copy-docker-compose-file + local_path: utils/build/virtual_machine/weblogs/common/docker-compose.yml + - name: copy-python-app + local_path: lib-injection/build/docker/python/dd-lib-python-init-test-django + - name: copy-python-app-dockerfile + local_path: utils/build/virtual_machine/weblogs/python/test-app-python-container-3.8/Dockerfile.template + + remote-command: sh create_and_run_app_container.sh diff --git a/utils/build/virtual_machine/weblogs/python/provision_test-app-python-container-3.9-alpine.yml b/utils/build/virtual_machine/weblogs/python/provision_test-app-python-container-3.9-alpine.yml new file mode 100644 index 0000000000..00abc0e231 --- /dev/null +++ b/utils/build/virtual_machine/weblogs/python/provision_test-app-python-container-3.9-alpine.yml @@ -0,0 +1,16 @@ +weblog: + name: test-app-python-container-3.9-alpine + exact_os_branches: [ubuntu24] + install: + - os_type: linux + copy_files: + - name: copy-container-run-script + local_path: utils/build/virtual_machine/weblogs/common/create_and_run_app_container.sh + - name: copy-docker-compose-file + local_path: utils/build/virtual_machine/weblogs/common/docker-compose.yml + - name: copy-python-app + local_path: lib-injection/build/docker/python/dd-lib-python-init-test-django + - name: copy-python-app-dockerfile + local_path: utils/build/virtual_machine/weblogs/python/test-app-python-container-3.9-alpine/Dockerfile.template + + remote-command: sh create_and_run_app_container.sh diff --git a/utils/build/virtual_machine/weblogs/python/provision_test-app-python-container-3.9.yml b/utils/build/virtual_machine/weblogs/python/provision_test-app-python-container-3.9.yml new file mode 100644 index 0000000000..ce356d4899 --- /dev/null +++ b/utils/build/virtual_machine/weblogs/python/provision_test-app-python-container-3.9.yml @@ -0,0 +1,16 @@ +weblog: + name: test-app-python-container-3.9 + exact_os_branches: [ubuntu24] + install: + - os_type: linux + copy_files: + - name: copy-container-run-script + local_path: utils/build/virtual_machine/weblogs/common/create_and_run_app_container.sh + - name: copy-docker-compose-file + local_path: utils/build/virtual_machine/weblogs/common/docker-compose.yml + - name: copy-python-app + local_path: lib-injection/build/docker/python/dd-lib-python-init-test-django + - name: copy-python-app-dockerfile + local_path: utils/build/virtual_machine/weblogs/python/test-app-python-container-3.9/Dockerfile.template + + remote-command: sh create_and_run_app_container.sh diff --git a/utils/build/virtual_machine/weblogs/python/test-app-python-container-3.10-alpine/Dockerfile.template b/utils/build/virtual_machine/weblogs/python/test-app-python-container-3.10-alpine/Dockerfile.template new file mode 100644 index 0000000000..e67ead62a0 --- /dev/null +++ b/utils/build/virtual_machine/weblogs/python/test-app-python-container-3.10-alpine/Dockerfile.template @@ -0,0 +1,9 @@ +FROM public.ecr.aws/docker/library/python:3.10-alpine + +ENV PYTHONUNBUFFERED 1 +ENV DJANGO_SETTINGS_MODULE django_app +WORKDIR /src +ADD . /src +RUN pip install django +EXPOSE 18080 +CMD python -m django runserver 0.0.0.0:18080 diff --git a/utils/build/virtual_machine/weblogs/python/test-app-python-container-3.10/Dockerfile.template b/utils/build/virtual_machine/weblogs/python/test-app-python-container-3.10/Dockerfile.template new file mode 100644 index 0000000000..2b1b9f292f --- /dev/null +++ b/utils/build/virtual_machine/weblogs/python/test-app-python-container-3.10/Dockerfile.template @@ -0,0 +1,9 @@ +FROM public.ecr.aws/docker/library/python:3.10 + +ENV PYTHONUNBUFFERED 1 +ENV DJANGO_SETTINGS_MODULE django_app +WORKDIR /src +ADD . /src +RUN pip install django +EXPOSE 18080 +CMD python -m django runserver 0.0.0.0:18080 diff --git a/utils/build/virtual_machine/weblogs/python/test-app-python-container-3.11-alpine/Dockerfile.template b/utils/build/virtual_machine/weblogs/python/test-app-python-container-3.11-alpine/Dockerfile.template new file mode 100644 index 0000000000..1b20ea1847 --- /dev/null +++ b/utils/build/virtual_machine/weblogs/python/test-app-python-container-3.11-alpine/Dockerfile.template @@ -0,0 +1,9 @@ +FROM public.ecr.aws/docker/library/python:3.11-alpine + +ENV PYTHONUNBUFFERED 1 +ENV DJANGO_SETTINGS_MODULE django_app +WORKDIR /src +ADD . /src +RUN pip install django +EXPOSE 18080 +CMD python -m django runserver 0.0.0.0:18080 diff --git a/utils/build/virtual_machine/weblogs/python/test-app-python-container-3.11/Dockerfile.template b/utils/build/virtual_machine/weblogs/python/test-app-python-container-3.11/Dockerfile.template new file mode 100644 index 0000000000..80c8105f86 --- /dev/null +++ b/utils/build/virtual_machine/weblogs/python/test-app-python-container-3.11/Dockerfile.template @@ -0,0 +1,9 @@ +FROM public.ecr.aws/docker/library/python:3.11 + +ENV PYTHONUNBUFFERED 1 +ENV DJANGO_SETTINGS_MODULE django_app +WORKDIR /src +ADD . /src +RUN pip install django +EXPOSE 18080 +CMD python -m django runserver 0.0.0.0:18080 diff --git a/utils/build/virtual_machine/weblogs/python/test-app-python-container-3.12-alpine/Dockerfile.template b/utils/build/virtual_machine/weblogs/python/test-app-python-container-3.12-alpine/Dockerfile.template new file mode 100644 index 0000000000..d31000beaf --- /dev/null +++ b/utils/build/virtual_machine/weblogs/python/test-app-python-container-3.12-alpine/Dockerfile.template @@ -0,0 +1,9 @@ +FROM public.ecr.aws/docker/library/python:3.12-alpine + +ENV PYTHONUNBUFFERED 1 +ENV DJANGO_SETTINGS_MODULE django_app +WORKDIR /src +ADD . /src +RUN pip install django +EXPOSE 18080 +CMD python -m django runserver 0.0.0.0:18080 diff --git a/utils/build/virtual_machine/weblogs/python/test-app-python-container-3.12/Dockerfile.template b/utils/build/virtual_machine/weblogs/python/test-app-python-container-3.12/Dockerfile.template new file mode 100644 index 0000000000..e53d686eab --- /dev/null +++ b/utils/build/virtual_machine/weblogs/python/test-app-python-container-3.12/Dockerfile.template @@ -0,0 +1,9 @@ +FROM public.ecr.aws/docker/library/python:3.12 + +ENV PYTHONUNBUFFERED 1 +ENV DJANGO_SETTINGS_MODULE django_app +WORKDIR /src +ADD . /src +RUN pip install django +EXPOSE 18080 +CMD python -m django runserver 0.0.0.0:18080 diff --git a/utils/build/virtual_machine/weblogs/python/test-app-python-container-3.7-alpine/Dockerfile.template b/utils/build/virtual_machine/weblogs/python/test-app-python-container-3.7-alpine/Dockerfile.template new file mode 100644 index 0000000000..7760279c63 --- /dev/null +++ b/utils/build/virtual_machine/weblogs/python/test-app-python-container-3.7-alpine/Dockerfile.template @@ -0,0 +1,9 @@ +FROM public.ecr.aws/docker/library/python:3.7-alpine + +ENV PYTHONUNBUFFERED 1 +ENV DJANGO_SETTINGS_MODULE django_app +WORKDIR /src +ADD . /src +RUN pip install django +EXPOSE 18080 +CMD python -m django runserver 0.0.0.0:18080 diff --git a/utils/build/virtual_machine/weblogs/python/test-app-python-container-3.7/Dockerfile.template b/utils/build/virtual_machine/weblogs/python/test-app-python-container-3.7/Dockerfile.template new file mode 100644 index 0000000000..f3bd08a7c0 --- /dev/null +++ b/utils/build/virtual_machine/weblogs/python/test-app-python-container-3.7/Dockerfile.template @@ -0,0 +1,9 @@ +FROM public.ecr.aws/docker/library/python:3.7 + +ENV PYTHONUNBUFFERED 1 +ENV DJANGO_SETTINGS_MODULE django_app +WORKDIR /src +ADD . /src +RUN pip install django +EXPOSE 18080 +CMD python -m django runserver 0.0.0.0:18080 diff --git a/utils/build/virtual_machine/weblogs/python/test-app-python-container-3.8/Dockerfile.template b/utils/build/virtual_machine/weblogs/python/test-app-python-container-3.8/Dockerfile.template new file mode 100644 index 0000000000..c372114a87 --- /dev/null +++ b/utils/build/virtual_machine/weblogs/python/test-app-python-container-3.8/Dockerfile.template @@ -0,0 +1,9 @@ +FROM public.ecr.aws/docker/library/python:3.8 + +ENV PYTHONUNBUFFERED 1 +ENV DJANGO_SETTINGS_MODULE django_app +WORKDIR /src +ADD . /src +RUN pip install django +EXPOSE 18080 +CMD python -m django runserver 0.0.0.0:18080 diff --git a/utils/build/virtual_machine/weblogs/python/test-app-python-container-3.9-alpine/Dockerfile.template b/utils/build/virtual_machine/weblogs/python/test-app-python-container-3.9-alpine/Dockerfile.template new file mode 100644 index 0000000000..f1fbb44d4e --- /dev/null +++ b/utils/build/virtual_machine/weblogs/python/test-app-python-container-3.9-alpine/Dockerfile.template @@ -0,0 +1,9 @@ +FROM public.ecr.aws/docker/library/python:3.9-alpine + +ENV PYTHONUNBUFFERED 1 +ENV DJANGO_SETTINGS_MODULE django_app +WORKDIR /src +ADD . /src +RUN pip install django +EXPOSE 18080 +CMD python -m django runserver 0.0.0.0:18080 diff --git a/utils/build/virtual_machine/weblogs/python/test-app-python-container-3.9/Dockerfile.template b/utils/build/virtual_machine/weblogs/python/test-app-python-container-3.9/Dockerfile.template new file mode 100644 index 0000000000..1bb3bff87f --- /dev/null +++ b/utils/build/virtual_machine/weblogs/python/test-app-python-container-3.9/Dockerfile.template @@ -0,0 +1,9 @@ +FROM public.ecr.aws/docker/library/python:3.9 + +ENV PYTHONUNBUFFERED 1 +ENV DJANGO_SETTINGS_MODULE django_app +WORKDIR /src +ADD . /src +RUN pip install django +EXPOSE 18080 +CMD python -m django runserver 0.0.0.0:18080 diff --git a/utils/build/virtual_machine/weblogs/ruby/provision_test-app-ruby.yml b/utils/build/virtual_machine/weblogs/ruby/provision_test-app-ruby.yml index cdeea7feb4..739129dc7d 100644 --- a/utils/build/virtual_machine/weblogs/ruby/provision_test-app-ruby.yml +++ b/utils/build/virtual_machine/weblogs/ruby/provision_test-app-ruby.yml @@ -2,7 +2,7 @@ lang_variant: name: Ruby_3_0_2 version: 3.0.2 cache: true - install: + install: - os_type: linux os_distro: deb remote-command: | @@ -33,7 +33,7 @@ weblog: copy_files: - name: copy-ruby-app - local_path: lib-injection/build/docker/ruby/lib_injection_rails_app + local_path: lib-injection/build/docker/ruby/lib_injection_rails_app - name: copy-service local_path: utils/build/virtual_machine/weblogs/common/test-app.service diff --git a/utils/virtual_machine/virtual_machine_provisioner.py b/utils/virtual_machine/virtual_machine_provisioner.py index 2fa29b130e..89e7af85af 100644 --- a/utils/virtual_machine/virtual_machine_provisioner.py +++ b/utils/virtual_machine/virtual_machine_provisioner.py @@ -26,6 +26,12 @@ def remove_unsupported_machines( for vm in required_vms: installations = config_data["weblog"]["install"] allowed = False + if "exact_os_branches" in config_data["weblog"]: + if vm.os_branch not in config_data["weblog"]["exact_os_branches"]: + logger.stdout(f"WARNING: Removed VM [{vm.name}] due to weblog directive in exact_os_branches") + vms_to_remove.append(vm) + continue + # Exclude by vm_only_branch if vm_only_branch and vm.os_branch != vm_only_branch: logger.stdout(f"WARNING: Removed VM [{vm.name}] due to vm_only_branch directive") @@ -189,7 +195,7 @@ def _get_vm_logs(self, env, library_name, os_type, os_distro, os_branch, os_cpu, def _get_lang_variant_provision(self, env, library_name, os_type, os_distro, os_branch, os_cpu, weblog_raw_data): if "lang_variant" not in weblog_raw_data: - logger.debug(f"lang_variant not found in weblog provision file") + logger.debug("lang_variant not found in weblog provision file") return None lang_variant = weblog_raw_data["lang_variant"] installations = lang_variant["install"]