From 618cca9d7e6f923306eefb1bdb60e114392c3f56 Mon Sep 17 00:00:00 2001 From: Ryan Thorn Date: Wed, 27 Dec 2023 13:25:10 -0800 Subject: [PATCH] chore: Use debian11 daily build --- .../infra-agent/debians/debian11-infra.json | 44 ++++++++-------- .../otel/debians/debian11-otel.json | 50 ++++++++++--------- .../debians/debian11-super-agent-eu.json | 50 ++++++++++--------- .../otel/debians/debian11-otel.json | 50 ++++++++++--------- .../debians/debian11-super-agent.json | 50 ++++++++++--------- 5 files changed, 127 insertions(+), 117 deletions(-) diff --git a/test/definitions-eu/infra-agent/debians/debian11-infra.json b/test/definitions-eu/infra-agent/debians/debian11-infra.json index 8a14813b3..5893e9c9f 100644 --- a/test/definitions-eu/infra-agent/debians/debian11-infra.json +++ b/test/definitions-eu/infra-agent/debians/debian11-infra.json @@ -5,29 +5,31 @@ "Department": "product", "Product": "virtuoso" }, - - "resources": [{ - "id": "host1", - "provider": "aws", - "type": "ec2", - "size": "t3.nano", - "ami_name": "debian-11-amd64-2021????-*", - "user_name": "admin" - }], - - "instrumentations": { - "resources": [ + "resources": [ { - "id": "nr_infra", - "resource_ids": ["host1"], - "provider": "newrelic", - "source_repository": "https://github.com/newrelic/open-install-library", - "deploy_script_path": "test/deploy/linux/newrelic-cli/install-recipe/roles", - "params": { - "recipe_content_url": "https://raw.githubusercontent.com/newrelic/open-install-library/main/recipes/newrelic/infrastructure/debian.yml", - "validate_output": "Infrastructure Agent\\s+\\(installed\\)" - } + "id": "host1", + "provider": "aws", + "type": "ec2", + "size": "t3.nano", + "ami_name": "debian-11-amd64-daily-*", + "user_name": "admin" } + ], + "instrumentations": { + "resources": [ + { + "id": "nr_infra", + "resource_ids": [ + "host1" + ], + "provider": "newrelic", + "source_repository": "https://github.com/newrelic/open-install-library", + "deploy_script_path": "test/deploy/linux/newrelic-cli/install-recipe/roles", + "params": { + "recipe_content_url": "https://raw.githubusercontent.com/newrelic/open-install-library/main/recipes/newrelic/infrastructure/debian.yml", + "validate_output": "Infrastructure Agent\\s+\\(installed\\)" + } + } ] } } diff --git a/test/definitions-eu/otel/debians/debian11-otel.json b/test/definitions-eu/otel/debians/debian11-otel.json index b2253fc50..7d0adbd5e 100644 --- a/test/definitions-eu/otel/debians/debian11-otel.json +++ b/test/definitions-eu/otel/debians/debian11-otel.json @@ -5,30 +5,32 @@ "Department": "product", "Product": "virtuoso" }, - - "resources": [{ - "id": "host1", - "provider": "aws", - "type": "ec2", - "size": "t3.nano", - "ami_name": "debian-11-amd64-2021????-*", - "user_name": "admin" - }], - + "resources": [ + { + "id": "host1", + "provider": "aws", + "type": "ec2", + "size": "t3.nano", + "ami_name": "debian-11-amd64-daily-*", + "user_name": "admin" + } + ], "instrumentations": { "resources": [ - { - "id": "nr_infra_otel", - "resource_ids": ["host1"], - "provider": "newrelic", - "source_repository": "https://github.com/newrelic/open-install-library.git", - "deploy_script_path": "test/deploy/linux/newrelic-cli/install-recipe/roles", - "params": { - "recipe_content_url": "https://raw.githubusercontent.com/newrelic/open-install-library/main/recipes/newrelic/infrastructure/otel/debian.yml", - "validate_output": "New Relic OpenTelemetry Collector\\s+\\(installed\\)", - "recipe_targeted": "newrelic-opentelemetry-collector" - } - } - ] - } + { + "id": "nr_infra_otel", + "resource_ids": [ + "host1" + ], + "provider": "newrelic", + "source_repository": "https://github.com/newrelic/open-install-library.git", + "deploy_script_path": "test/deploy/linux/newrelic-cli/install-recipe/roles", + "params": { + "recipe_content_url": "https://raw.githubusercontent.com/newrelic/open-install-library/main/recipes/newrelic/infrastructure/otel/debian.yml", + "validate_output": "New Relic OpenTelemetry Collector\\s+\\(installed\\)", + "recipe_targeted": "newrelic-opentelemetry-collector" + } + } + ] + } } diff --git a/test/definitions-eu/super-agent/debians/debian11-super-agent-eu.json b/test/definitions-eu/super-agent/debians/debian11-super-agent-eu.json index 0f0c5b3ad..4751ba91c 100644 --- a/test/definitions-eu/super-agent/debians/debian11-super-agent-eu.json +++ b/test/definitions-eu/super-agent/debians/debian11-super-agent-eu.json @@ -5,30 +5,32 @@ "Department": "product", "Product": "virtuoso" }, - - "resources": [{ - "id": "host1", - "provider": "aws", - "type": "ec2", - "size": "t3.nano", - "ami_name": "debian-11-amd64-2021????-*", - "user_name": "admin" - }], - + "resources": [ + { + "id": "host1", + "provider": "aws", + "type": "ec2", + "size": "t3.nano", + "ami_name": "debian-11-amd64-daily-*", + "user_name": "admin" + } + ], "instrumentations": { "resources": [ - { - "id": "nr_super_agent", - "resource_ids": ["host1"], - "provider": "newrelic", - "source_repository": "https://github.com/newrelic/open-install-library.git", - "deploy_script_path": "test/deploy/linux/newrelic-cli/install-recipe/roles", - "params": { - "recipe_content_url": "https://raw.githubusercontent.com/newrelic/open-install-library/main/recipes/newrelic/infrastructure/super-agent/debian.yml", - "validate_output": "New Relic Super Agent\\s+\\(installed\\)", - "recipe_targeted": "super-agent" - } - } - ] - } + { + "id": "nr_super_agent", + "resource_ids": [ + "host1" + ], + "provider": "newrelic", + "source_repository": "https://github.com/newrelic/open-install-library.git", + "deploy_script_path": "test/deploy/linux/newrelic-cli/install-recipe/roles", + "params": { + "recipe_content_url": "https://raw.githubusercontent.com/newrelic/open-install-library/main/recipes/newrelic/infrastructure/super-agent/debian.yml", + "validate_output": "New Relic Super Agent\\s+\\(installed\\)", + "recipe_targeted": "super-agent" + } + } + ] + } } diff --git a/test/definitions/otel/debians/debian11-otel.json b/test/definitions/otel/debians/debian11-otel.json index b2253fc50..7d0adbd5e 100644 --- a/test/definitions/otel/debians/debian11-otel.json +++ b/test/definitions/otel/debians/debian11-otel.json @@ -5,30 +5,32 @@ "Department": "product", "Product": "virtuoso" }, - - "resources": [{ - "id": "host1", - "provider": "aws", - "type": "ec2", - "size": "t3.nano", - "ami_name": "debian-11-amd64-2021????-*", - "user_name": "admin" - }], - + "resources": [ + { + "id": "host1", + "provider": "aws", + "type": "ec2", + "size": "t3.nano", + "ami_name": "debian-11-amd64-daily-*", + "user_name": "admin" + } + ], "instrumentations": { "resources": [ - { - "id": "nr_infra_otel", - "resource_ids": ["host1"], - "provider": "newrelic", - "source_repository": "https://github.com/newrelic/open-install-library.git", - "deploy_script_path": "test/deploy/linux/newrelic-cli/install-recipe/roles", - "params": { - "recipe_content_url": "https://raw.githubusercontent.com/newrelic/open-install-library/main/recipes/newrelic/infrastructure/otel/debian.yml", - "validate_output": "New Relic OpenTelemetry Collector\\s+\\(installed\\)", - "recipe_targeted": "newrelic-opentelemetry-collector" - } - } - ] - } + { + "id": "nr_infra_otel", + "resource_ids": [ + "host1" + ], + "provider": "newrelic", + "source_repository": "https://github.com/newrelic/open-install-library.git", + "deploy_script_path": "test/deploy/linux/newrelic-cli/install-recipe/roles", + "params": { + "recipe_content_url": "https://raw.githubusercontent.com/newrelic/open-install-library/main/recipes/newrelic/infrastructure/otel/debian.yml", + "validate_output": "New Relic OpenTelemetry Collector\\s+\\(installed\\)", + "recipe_targeted": "newrelic-opentelemetry-collector" + } + } + ] + } } diff --git a/test/definitions/super-agent/debians/debian11-super-agent.json b/test/definitions/super-agent/debians/debian11-super-agent.json index 0f0c5b3ad..4751ba91c 100644 --- a/test/definitions/super-agent/debians/debian11-super-agent.json +++ b/test/definitions/super-agent/debians/debian11-super-agent.json @@ -5,30 +5,32 @@ "Department": "product", "Product": "virtuoso" }, - - "resources": [{ - "id": "host1", - "provider": "aws", - "type": "ec2", - "size": "t3.nano", - "ami_name": "debian-11-amd64-2021????-*", - "user_name": "admin" - }], - + "resources": [ + { + "id": "host1", + "provider": "aws", + "type": "ec2", + "size": "t3.nano", + "ami_name": "debian-11-amd64-daily-*", + "user_name": "admin" + } + ], "instrumentations": { "resources": [ - { - "id": "nr_super_agent", - "resource_ids": ["host1"], - "provider": "newrelic", - "source_repository": "https://github.com/newrelic/open-install-library.git", - "deploy_script_path": "test/deploy/linux/newrelic-cli/install-recipe/roles", - "params": { - "recipe_content_url": "https://raw.githubusercontent.com/newrelic/open-install-library/main/recipes/newrelic/infrastructure/super-agent/debian.yml", - "validate_output": "New Relic Super Agent\\s+\\(installed\\)", - "recipe_targeted": "super-agent" - } - } - ] - } + { + "id": "nr_super_agent", + "resource_ids": [ + "host1" + ], + "provider": "newrelic", + "source_repository": "https://github.com/newrelic/open-install-library.git", + "deploy_script_path": "test/deploy/linux/newrelic-cli/install-recipe/roles", + "params": { + "recipe_content_url": "https://raw.githubusercontent.com/newrelic/open-install-library/main/recipes/newrelic/infrastructure/super-agent/debian.yml", + "validate_output": "New Relic Super Agent\\s+\\(installed\\)", + "recipe_targeted": "super-agent" + } + } + ] + } }