Skip to content
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.

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

implement python injection test matrix [APMON-1544] #3186

Merged
merged 13 commits into from
Oct 9, 2024
Merged
19 changes: 18 additions & 1 deletion .gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,24 @@ 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.8-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]
Expand Down
4 changes: 2 additions & 2 deletions utils/_context/virtual_machines.py
Original file line number Diff line number Diff line change
Expand Up @@ -553,7 +553,7 @@ def __init__(self, **kwargs) -> None:
krunvm_config=None,
os_type="linux",
os_distro="deb",
os_branch="ubuntu24",
os_branch="ubuntu24_amd64",
emmettbutler marked this conversation as resolved.
Show resolved Hide resolved
os_cpu="amd64",
default_vm=False,
**kwargs,
Expand All @@ -569,7 +569,7 @@ def __init__(self, **kwargs) -> None:
krunvm_config=None,
os_type="linux",
os_distro="deb",
os_branch="ubuntu24",
os_branch="ubuntu24_arm64",
os_cpu="arm64",
default_vm=False,
**kwargs,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ weblog:
name: test-app-dotnet
#ubuntu 22 arm excluded due to "dotnet-runtime-6.0 : Depends: liblttng-ust1 (>= 2.13.0) but it is not installable".
#amazon_linux2_dotnet6 excluded due to https://datadoghq.atlassian.net/browse/AIT-10335
excluded_os_branches: [ubuntu22_arm64, ubuntu18_amd64,amazon_linux2, amazon_linux2_dotnet6, centos_7_amd64, ubuntu20, ubuntu21, ubuntu23, debian]
excluded_os_branches: [ubuntu22_arm64, ubuntu18_amd64, amazon_linux2, amazon_linux2_dotnet6, centos_7_amd64, ubuntu20, ubuntu21, ubuntu23, debian]
excluded_os_names: [OracleLinux_7_9_amd64]
install:
- os_type: linux
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
weblog:
name: test-app-python-container-3.10-alpine
exact_os_branches: [ubuntu24_amd64, ubuntu24_arm64]
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
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
weblog:
name: test-app-python-container-3.10
exact_os_branches: [ubuntu24_amd64, ubuntu24_arm64]
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
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
weblog:
name: test-app-python-container-3.11-alpine
exact_os_branches: [ubuntu24_amd64, ubuntu24_arm64]
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
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
weblog:
name: test-app-python-container-3.11
exact_os_branches: [ubuntu24_amd64, ubuntu24_arm64]
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
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
weblog:
name: test-app-python-container-3.12-alpine
exact_os_branches: [ubuntu24_amd64, ubuntu24_arm64]
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
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
weblog:
name: test-app-python-container-3.12
exact_os_branches: [ubuntu24_amd64, ubuntu24_arm64]
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
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
weblog:
name: test-app-python-container-3.7-alpine
exact_os_branches: [ubuntu24_amd64, ubuntu24_arm64]
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
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
weblog:
name: test-app-python-container-3.7
exact_os_branches: [ubuntu24_amd64, ubuntu24_arm64]
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
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
weblog:
name: test-app-python-container-3.8-alpine
exact_os_branches: [ubuntu24_amd64, ubuntu24_arm64]
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-alpine/Dockerfile.template

remote-command: sh create_and_run_app_container.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
weblog:
name: test-app-python-container-3.8
exact_os_branches: [ubuntu24_amd64, ubuntu24_arm64]
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
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
weblog:
name: test-app-python-container-3.9-alpine
exact_os_branches: [ubuntu24_amd64, ubuntu24_arm64]
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
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
weblog:
name: test-app-python-container-3.9
exact_os_branches: [ubuntu24_amd64, ubuntu24_arm64]
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
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
FROM public.ecr.aws/docker/library/python:3.10
emmettbutler marked this conversation as resolved.
Show resolved Hide resolved

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
Original file line number Diff line number Diff line change
@@ -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
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
FROM public.ecr.aws/docker/library/python:3.11
emmettbutler marked this conversation as resolved.
Show resolved Hide resolved

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
Original file line number Diff line number Diff line change
@@ -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
Original file line number Diff line number Diff line change
@@ -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
Original file line number Diff line number Diff line change
@@ -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
Original file line number Diff line number Diff line change
@@ -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
Original file line number Diff line number Diff line change
@@ -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
Original file line number Diff line number Diff line change
@@ -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
Original file line number Diff line number Diff line change
@@ -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
Original file line number Diff line number Diff line change
@@ -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
Original file line number Diff line number Diff line change
@@ -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
Original file line number Diff line number Diff line change
Expand Up @@ -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: |
Expand Down Expand Up @@ -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
Expand Down
Loading
Loading