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

feat(tests): Add Fedora 36 & 37 to Onboarding tests #3178

Merged
merged 4 commits into from
Oct 8, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
20 changes: 20 additions & 0 deletions utils/_context/_scenarios/auto_injection.py
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,10 @@
AlmaLinux9arm64,
RedHat86amd64,
RedHat86arm64,
Fedora36amd64,
Fedora36arm64,
Fedora37amd64,
Fedora37arm64,
)

from .core import Scenario
Expand Down Expand Up @@ -81,6 +85,10 @@ def __init__(
include_almalinux_9_arm64=False,
include_redhat_8_amd64=False,
include_redhat_8_arm64=False,
include_fedora_36_amd64=False,
include_fedora_36_arm64=False,
include_fedora_37_amd64=False,
include_fedora_37_arm64=False,
agent_env=None,
app_env=None,
scenario_groups=None,
Expand Down Expand Up @@ -160,6 +168,14 @@ def __init__(
self.required_vms.append(RedHat86amd64())
if include_redhat_8_arm64:
self.required_vms.append(RedHat86arm64())
if include_fedora_36_amd64:
self.required_vms.append(Fedora36amd64())
if include_fedora_36_arm64:
self.required_vms.append(Fedora36arm64())
if include_fedora_37_amd64:
self.required_vms.append(Fedora37amd64())
if include_fedora_37_arm64:
self.required_vms.append(Fedora37arm64())

def print_installed_components(self):
logger.terminal.write_sep("=", "Installed components", bold=True)
Expand Down Expand Up @@ -336,5 +352,9 @@ def __init__(
include_almalinux_9_arm64=True,
include_redhat_8_amd64=True,
include_redhat_8_arm64=True,
include_fedora_36_amd64=True,
include_fedora_36_arm64=True,
include_fedora_37_amd64=True,
include_fedora_37_arm64=True,
scenario_groups=scenario_groups,
)
64 changes: 64 additions & 0 deletions utils/_context/virtual_machines.py
Original file line number Diff line number Diff line change
Expand Up @@ -721,3 +721,67 @@ def __init__(self, **kwargs) -> None:
default_vm=False,
**kwargs,
)


class Fedora36amd64(_VirtualMachine):
def __init__(self, **kwargs) -> None:
super().__init__(
"Fedora_36_amd64",
aws_config=_AWSConfig(ami_id="ami-05e7ccec1e0408397", ami_instance_type="t2.medium", user="fedora"),
vagrant_config=None,
krunvm_config=None,
os_type="linux",
os_distro="rpm",
os_branch="fedora",
os_cpu="amd64",
default_vm=False,
**kwargs,
)


class Fedora36arm64(_VirtualMachine):
def __init__(self, **kwargs) -> None:
super().__init__(
"Fedora_36_arm64",
aws_config=_AWSConfig(ami_id="ami-0487fbde1f898f0f1", ami_instance_type="t4g.medium", user="fedora"),
vagrant_config=None,
krunvm_config=None,
os_type="linux",
os_distro="rpm",
os_branch="fedora",
os_cpu="arm64",
default_vm=False,
**kwargs,
)


class Fedora37amd64(_VirtualMachine):
def __init__(self, **kwargs) -> None:
super().__init__(
"Fedora_37_amd64",
aws_config=_AWSConfig(ami_id="ami-032e9a5778bde5a1a", ami_instance_type="t2.medium", user="fedora"),
vagrant_config=None,
krunvm_config=None,
os_type="linux",
os_distro="rpm",
os_branch="fedora",
os_cpu="amd64",
default_vm=False,
**kwargs,
)


class Fedora37arm64(_VirtualMachine):
def __init__(self, **kwargs) -> None:
super().__init__(
"Fedora_37_arm64",
aws_config=_AWSConfig(ami_id="ami-08ec1e90576b74511", ami_instance_type="t4g.medium", user="fedora"),
vagrant_config=None,
krunvm_config=None,
os_type="linux",
os_distro="rpm",
os_branch="fedora",
os_cpu="arm64",
default_vm=False,
**kwargs,
)
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,22 @@
echo "Firewall disabled"
exit 0
fi
- os_type: linux
os_branch: fedora
os_distro: rpm
remote-command: |
# Disable SELinux as it isn't supported by the injector today
sudo setenforce 0
sudo sed -i 's/enforcing/disabled/g' /etc/selinux/config
# Allow DD env variables from ssh
echo 'AcceptEnv DD_*' | sudo tee -a /etc/ssh/sshd_config
sudo id -u datadog &>/dev/null || sudo useradd -m datadog
sudo yum clean expire-cache
#sudo yum -y update
sudo systemctl restart sshd.service
#Install git and clone system tests repository
sudo yum -y install git wget which
git clone https://github.com/DataDog/system-tests.git
- os_type: linux
os_distro: rpm
remote-command: |
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM public.ecr.aws/docker/library/python:3-alpine
FROM public.ecr.aws/docker/library/python:3.12-alpine
# Install python/pip
ENV PYTHONUNBUFFERED=1
RUN pip3 install --no-cache --upgrade pip setuptools
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM public.ecr.aws/docker/library/python:3
FROM public.ecr.aws/docker/library/python:3.12

ENV PYTHONUNBUFFERED 1
ENV DJANGO_SETTINGS_MODULE django_app
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
weblog:
name: test-app-ruby-container
excluded_os_branches: [amazon_linux2_dotnet6, amazon_linux2, ubuntu21]
excluded_os_branches: [amazon_linux2_dotnet6, amazon_linux2, ubuntu21, fedora]
install:
- os_type: linux

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,9 @@ lang_variant:

weblog:
name: test-app-ruby
# centos_7_amd64 & redhat_8_6 are excluded because they do not provide the right Ruby versions
# centos_7_amd64, redhat_8_6, & fedora are excluded because they do not provide the right Ruby versions
# TODO oracle_linux and alma_linux. Failed when we run the app. Related with how we install Ruby
excluded_os_branches: [amazon_linux2_dotnet6, ubuntu18_amd64, amazon_linux2, centos_7_amd64, oracle_linux, alma_linux, ubuntu24, ubuntu20, ubuntu21, ubuntu23, redhat_8_6]
excluded_os_branches: [amazon_linux2_dotnet6, ubuntu18_amd64, amazon_linux2, centos_7_amd64, oracle_linux, alma_linux, ubuntu24, ubuntu20, ubuntu21, ubuntu23, redhat_8_6, fedora]
install:
- os_type: linux

Expand Down
Loading