diff --git a/test/definitions-eu/apm/dotNet/linux/debian10-nginx-aspnetcore.json b/test/definitions-eu/apm/dotNet/linux/debian13-nginx-aspnetcore.json similarity index 97% rename from test/definitions-eu/apm/dotNet/linux/debian10-nginx-aspnetcore.json rename to test/definitions-eu/apm/dotNet/linux/debian13-nginx-aspnetcore.json index e41140fdb..224650644 100644 --- a/test/definitions-eu/apm/dotNet/linux/debian10-nginx-aspnetcore.json +++ b/test/definitions-eu/apm/dotNet/linux/debian13-nginx-aspnetcore.json @@ -12,7 +12,7 @@ "type": "ec2", "size": "t3.small", "comment": "This AMI requires to accept terms and conditions https://aws.amazon.com/marketplace/server/procurement?productId=0f258a51-0979-4be2-a6a9-ec8fe108514a", - "ami_name": "debian-10-amd64-202?????-*", + "ami_name": "debian-13-amd64-202?????-*", "user_name": "admin" }], @@ -20,7 +20,7 @@ "id": "aspnetcore", "destinations": ["debiannginxnetcore1"], "source_repository": "https://github.com/newrelic/open-install-library.git", - "deploy_script_path": "test/deploy/linux/dotNet/install/ubuntu20/roles", + "deploy_script_path": "test/deploy/linux/dotNet/install/debian13/roles", "port": 9999 }, { diff --git a/test/definitions-eu/apm/dotNet/linux/ubuntu20-apache-aspnetcore.json b/test/definitions-eu/apm/dotNet/linux/ubuntu24-apache-aspnetcore.json similarity index 95% rename from test/definitions-eu/apm/dotNet/linux/ubuntu20-apache-aspnetcore.json rename to test/definitions-eu/apm/dotNet/linux/ubuntu24-apache-aspnetcore.json index ceae51809..c14602ee5 100644 --- a/test/definitions-eu/apm/dotNet/linux/ubuntu20-apache-aspnetcore.json +++ b/test/definitions-eu/apm/dotNet/linux/ubuntu24-apache-aspnetcore.json @@ -11,7 +11,7 @@ "provider": "aws", "type": "ec2", "size": "t3.micro", - "ami_name": "ubuntu-pro-server/images/hvm-ssd/ubuntu-focal-20.04-amd64-pro-server-????????", + "ami_name": "ubuntu/images/hvm-ssd-gp3/ubuntu-noble-24.04-amd64-server-202?????", "user_name": "ubuntu" }], @@ -19,7 +19,7 @@ "id": "aspnetcore", "destinations": ["ubuntuapachenetcore1"], "source_repository": "https://github.com/newrelic/open-install-library.git", - "deploy_script_path": "test/deploy/linux/dotNet/install/ubuntu20/roles", + "deploy_script_path": "test/deploy/linux/dotNet/install/ubuntu24/roles", "port": 9999 }, { diff --git a/test/definitions-eu/apm/dotNet/windows/windows2019-core-only-iis.json b/test/definitions-eu/apm/dotNet/windows/windows2022-core-only-iis.json similarity index 86% rename from test/definitions-eu/apm/dotNet/windows/windows2019-core-only-iis.json rename to test/definitions-eu/apm/dotNet/windows/windows2022-core-only-iis.json index b18ecaab6..3e70cdcf0 100644 --- a/test/definitions-eu/apm/dotNet/windows/windows2019-core-only-iis.json +++ b/test/definitions-eu/apm/dotNet/windows/windows2022-core-only-iis.json @@ -7,25 +7,25 @@ }, "resources": [{ - "id": "iiswindows2019", + "id": "iiswindows2022", "provider": "aws", "type": "ec2", "size": "t3.small", "is_windows": true, - "ami_name": "Windows_Server-2019-English-Full-HyperV-*", + "ami_name": "Windows_Server-2022-English-Full-Base-*", "user_name": "Administrator" }], "services": [{ "id": "iis", - "destinations": ["iiswindows2019"], + "destinations": ["iiswindows2022"], "source_repository": "https://github.com/newrelic/open-install-library.git", "deploy_script_path": "test/deploy/windows/iis/install/roles", "port": 9999 }, { "id": "coreapp", - "destinations": ["iiswindows2019"], + "destinations": ["iiswindows2022"], "source_repository": "https://github.com/newrelic/open-install-library.git", "deploy_script_path": "test/deploy/windows/iis/deploy-webapplication/roles", "port": 8083, @@ -38,7 +38,7 @@ "resources": [ { "id": "nr_infra", - "resource_ids": ["iiswindows2019"], + "resource_ids": ["iiswindows2022"], "provider": "newrelic", "source_repository": "https://github.com/newrelic/open-install-library.git", "deploy_script_path": "test/deploy/windows/newrelic-cli/install/roles", diff --git a/test/definitions-eu/apm/dotNet/windows/windows2019-iis.json b/test/definitions-eu/apm/dotNet/windows/windows2025-iis.json similarity index 86% rename from test/definitions-eu/apm/dotNet/windows/windows2019-iis.json rename to test/definitions-eu/apm/dotNet/windows/windows2025-iis.json index b10bc2eeb..382495326 100644 --- a/test/definitions-eu/apm/dotNet/windows/windows2019-iis.json +++ b/test/definitions-eu/apm/dotNet/windows/windows2025-iis.json @@ -7,36 +7,36 @@ }, "resources": [{ - "id": "iiswindows2019", + "id": "iiswindows2025", "provider": "aws", "type": "ec2", "size": "t3.small", "is_windows": true, - "ami_name": "Windows_Server-2019-English-Full-HyperV-*", + "ami_name": "Windows_Server-2025-English-Full-Base-*", "user_name": "Administrator" }], "services": [{ "id": "iis", - "destinations": ["iiswindows2019"], + "destinations": ["iiswindows2025"], "source_repository": "https://github.com/newrelic/open-install-library.git", "deploy_script_path": "test/deploy/windows/iis/install/roles", "port": 9999 },{ "id": "webapp1", - "destinations": ["iiswindows2019"], + "destinations": ["iiswindows2025"], "source_repository": "https://github.com/newrelic/open-install-library.git", "deploy_script_path": "test/deploy/windows/iis/deploy-webapplication/roles", "port": 8081 },{ "id": "webapp2", - "destinations": ["iiswindows2019"], + "destinations": ["iiswindows2025"], "source_repository": "https://github.com/newrelic/open-install-library.git", "deploy_script_path": "test/deploy/windows/iis/deploy-webapplication/roles", "port": 8082 },{ "id": "webapp3", - "destinations": ["iiswindows2019"], + "destinations": ["iiswindows2025"], "source_repository": "https://github.com/newrelic/open-install-library.git", "deploy_script_path": "test/deploy/windows/iis/deploy-webapplication/roles", "port": 8083, @@ -49,7 +49,7 @@ "resources": [ { "id": "nr_infra", - "resource_ids": ["iiswindows2019"], + "resource_ids": ["iiswindows2025"], "provider": "newrelic", "source_repository": "https://github.com/newrelic/open-install-library.git", "deploy_script_path": "test/deploy/windows/newrelic-cli/install-recipe/roles", diff --git a/test/deploy/linux/dotNet/install/debian13/roles/prepare/tasks/main.yml b/test/deploy/linux/dotNet/install/debian13/roles/prepare/tasks/main.yml new file mode 100644 index 000000000..ca6ebbdec --- /dev/null +++ b/test/deploy/linux/dotNet/install/debian13/roles/prepare/tasks/main.yml @@ -0,0 +1,37 @@ +--- +- debug: + msg: Install ASP.NET Core 10 Runtime + +# - name: Get package name +# shell: cat /etc/os-release | grep "PRETTY_NAME=\"" | awk -F = '{print $2}' | awk -F " " '{print $1}' | sed 's/["]//g' +# register: package_name + +# - name: Get package version +# shell: cat /etc/os-release | grep "VERSION_ID=\"" | awk -F = '{print $2}' | awk -F " " '{print $1}' | sed 's/["]//g' +# register: package_version + +# - name: +# set_fact: +# package_url: "https://packages.microsoft.com/config/{{package_name.stdout | lower }}/{{package_version.stdout | lower }}/packages-microsoft-prod.deb" + +# - debug: +# msg: "Using download URL of {{package_url}}" + +# - name: Download Microsoft package signing key and add Microsoft package repository +# shell: | +# wget "{{package_url}}" -O packages-microsoft-prod.deb +# dpkg -i packages-microsoft-prod.deb +# become: true + +- name: Install dependencies + shell: | + apt update + apt install -y wget libicu76 + become: true + +- name: Install ASP.NET Core 10 Runtime + shell: | + wget https://dot.net/v1/dotnet-install.sh -O dotnet-install.sh + chmod +x dotnet-install.sh + ./dotnet-install.sh --runtime aspnetcore --version 10.0.0 + become: true diff --git a/test/deploy/linux/dotNet/install/rhel/roles/prepare/tasks/main.yml b/test/deploy/linux/dotNet/install/rhel/roles/prepare/tasks/main.yml index 9e618cfc6..f887f5b15 100644 --- a/test/deploy/linux/dotNet/install/rhel/roles/prepare/tasks/main.yml +++ b/test/deploy/linux/dotNet/install/rhel/roles/prepare/tasks/main.yml @@ -2,20 +2,21 @@ - debug: msg: Install .NET -# https://learn.microsoft.com/en-us/dotnet/core/install/linux-centos#centos-linux-7 +# https://learn.microsoft.com/en-us/dotnet/core/install/linux-rhel#centos-stream-10 +# Per the article above, ".NET is included in the AppStream repositories for CentOS Stream 10." -- name: Install Centos 7 RPM - ansible.builtin.yum: - name: https://packages.microsoft.com/config/centos/7/packages-microsoft-prod.rpm - state: present - lock_timeout: 180 - become: true +# - name: Install Centos Stream 10 RPM +# ansible.builtin.yum: +# name: https://packages.microsoft.com/config/centos/7/packages-microsoft-prod.rpm +# state: present +# lock_timeout: 180 +# become: true -- name: Install .NET SDK 7.0 and ASP.NET Core 7.0 runtime +- name: Install .NET 10 SDK and ASP.NET Core Runtime ansible.builtin.yum: name: - - dotnet-sdk-7.0 - - aspnetcore-runtime-7.0 + - dotnet-sdk-10.0 + - aspnetcore-runtime-10.0 #I think this is redundant since sdk includes runtime state: latest lock_timeout: 180 become: true diff --git a/test/deploy/linux/dotNet/install/ubuntu20/roles/prepare/tasks/main.yml b/test/deploy/linux/dotNet/install/ubuntu24/roles/prepare/tasks/main.yml similarity index 88% rename from test/deploy/linux/dotNet/install/ubuntu20/roles/prepare/tasks/main.yml rename to test/deploy/linux/dotNet/install/ubuntu24/roles/prepare/tasks/main.yml index ebcd60dff..6daf0dcf7 100644 --- a/test/deploy/linux/dotNet/install/ubuntu20/roles/prepare/tasks/main.yml +++ b/test/deploy/linux/dotNet/install/ubuntu24/roles/prepare/tasks/main.yml @@ -1,6 +1,6 @@ --- - debug: - msg: Install ASP.NET Core 5.0 Runtime + msg: Install ASP.NET Core 10 Runtime - name: Get package name shell: cat /etc/os-release | grep "PRETTY_NAME=\"" | awk -F = '{print $2}' | awk -F " " '{print $1}' | sed 's/["]//g' @@ -27,9 +27,9 @@ shell: apt update become: true -- name: Install ASP.NET Core 5.0 Runtime +- name: Install ASP.NET Core 10 Runtime shell: | apt install apt-transport-https -y apt update - apt install aspnetcore-runtime-5.0 -y + apt install aspnetcore-runtime-10.0 -y become: true