diff --git a/test/definitions-eu/apm/dotNet/linux/debian10-nginx-aspnetcore.json b/test/definitions-eu/apm/dotNet/linux/debian10-nginx-aspnetcore.json index a1ab4ac38..ec9fcfb84 100644 --- a/test/definitions-eu/apm/dotNet/linux/debian10-nginx-aspnetcore.json +++ b/test/definitions-eu/apm/dotNet/linux/debian10-nginx-aspnetcore.json @@ -10,7 +10,7 @@ "id": "debiannginxnetcore1", "provider": "aws", "type": "ec2", - "size": "t3.micro", + "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?????-*", "user_name": "admin" diff --git a/test/definitions-eu/apm/java/deb10-apt-sysd-tomcat.json b/test/definitions-eu/apm/java/deb11-apt-sysd-tomcat.json similarity index 97% rename from test/definitions-eu/apm/java/deb10-apt-sysd-tomcat.json rename to test/definitions-eu/apm/java/deb11-apt-sysd-tomcat.json index 644861cda..61bf5371e 100644 --- a/test/definitions-eu/apm/java/deb10-apt-sysd-tomcat.json +++ b/test/definitions-eu/apm/java/deb11-apt-sysd-tomcat.json @@ -11,7 +11,7 @@ "provider": "aws", "type": "ec2", "size": "t3.micro", - "ami_name": "debian-10-amd64-202?????-*", + "ami_name": "debian-11-amd64-daily-202?????-*", "user_name": "admin" } ], diff --git a/test/definitions-eu/apm/java/deb10-jetty.json b/test/definitions-eu/apm/java/deb11-jetty.json similarity index 83% rename from test/definitions-eu/apm/java/deb10-jetty.json rename to test/definitions-eu/apm/java/deb11-jetty.json index 0abe2b57a..a3f81f2a6 100644 --- a/test/definitions-eu/apm/java/deb10-jetty.json +++ b/test/definitions-eu/apm/java/deb11-jetty.json @@ -11,7 +11,7 @@ "provider": "aws", "type": "ec2", "size": "t3.micro", - "ami_name": "debian-10-amd64-202?????-*", + "ami_name": "debian-11-amd64-daily-202?????-*", "user_name": "admin" } ], @@ -21,7 +21,9 @@ "source_repository": "https://github.com/newrelic/open-install-library.git", "deploy_script_path": "test/deploy/linux/jetty/systemd/install/roles", "port": 6001, - "destinations": ["jettyhost"] + "destinations": [ + "jettyhost" + ] } ] } diff --git a/test/definitions-eu/apm/java/deb10-sysd-jboss.json b/test/definitions-eu/apm/java/deb11-sysd-jboss.json similarity index 91% rename from test/definitions-eu/apm/java/deb10-sysd-jboss.json rename to test/definitions-eu/apm/java/deb11-sysd-jboss.json index 7349c6298..40d5af1f8 100644 --- a/test/definitions-eu/apm/java/deb10-sysd-jboss.json +++ b/test/definitions-eu/apm/java/deb11-sysd-jboss.json @@ -7,11 +7,11 @@ }, "resources": [ { - "id": "deb10-jboss", + "id": "deb11-jboss", "provider": "aws", "type": "ec2", "size": "t3.micro", - "ami_name": "debian-10-amd64-202?????-*", + "ami_name": "debian-11-amd64-daily-202?????-*", "user_name": "admin" } ], @@ -22,7 +22,7 @@ "deploy_script_path": "test/deploy/linux/jboss/systemd/install/linux/roles", "port": 6001, "destinations": [ - "deb10-jboss" + "deb11-jboss" ] } ], @@ -31,7 +31,7 @@ { "id": "jbossRecipe", "resource_ids": [ - "deb10-jboss" + "deb11-jboss" ], "provider": "newrelic", "source_repository": "https://github.com/newrelic/open-install-library.git", @@ -44,7 +44,7 @@ { "id": "recipeValidation", "resource_ids": [ - "deb10-jboss" + "deb11-jboss" ], "provider": "newrelic", "source_repository": "https://github.com/newrelic/open-install-library.git", diff --git a/test/definitions-eu/apm/java/rhl2-jetty.json b/test/definitions-eu/apm/java/rhl2-jetty.json index 17cb47d89..23ac1e981 100644 --- a/test/definitions-eu/apm/java/rhl2-jetty.json +++ b/test/definitions-eu/apm/java/rhl2-jetty.json @@ -11,7 +11,7 @@ "provider": "aws", "type": "ec2", "size": "t3.micro", - "ami_name": "amzn2-ami-hvm-2.0.????????.?-x86_64-gp2", + "ami_name": "amzn2-ami-kernel-*-hvm-*-x86_64-gp2", "user_name": "ec2-user" } ], @@ -26,4 +26,4 @@ ] } ] -} \ No newline at end of file +} 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/infra-agent/rhel/redhat8arm64-infra.json b/test/definitions-eu/infra-agent/rhel/redhat8arm64-infra.json index 1c9bfe505..5301dfbcc 100644 --- a/test/definitions-eu/infra-agent/rhel/redhat8arm64-infra.json +++ b/test/definitions-eu/infra-agent/rhel/redhat8arm64-infra.json @@ -5,20 +5,22 @@ "Department": "product", "Product": "virtuoso" }, - - "resources": [{ - "id": "host1", - "provider": "aws", - "type": "ec2", - "size": "t4g.micro", - "ami_name": "RHEL-8.4.?_HVM-????????-arm64-??-Hourly2-GP2" - }], - + "resources": [ + { + "id": "host1", + "provider": "aws", + "type": "ec2", + "size": "t4g.micro", + "ami_name": "RHEL-8.*_HVM-????????-arm64-*-Hourly2-GP2" + } + ], "instrumentations": { "resources": [ { "id": "nr_infra", - "resource_ids": ["host1"], + "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", diff --git a/test/definitions-eu/infra-agent/suse/suse154-infra.json b/test/definitions-eu/infra-agent/suse/suse154-infra.json index e9634e8f4..cc2e11b86 100644 --- a/test/definitions-eu/infra-agent/suse/suse154-infra.json +++ b/test/definitions-eu/infra-agent/suse/suse154-infra.json @@ -5,28 +5,30 @@ "Department": "product", "Product": "virtuoso" }, - - "resources": [{ - "id": "host1", - "provider": "aws", - "type": "ec2", - "size": "t3.nano", - "ami_name": "suse-sles-15-sp4-v????????-hvm-ssd-x86_64" - }], - - "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/suse.yml", - "validate_output": "Infrastructure Agent\\s+\\(installed\\)" - } + "id": "host2", + "provider": "aws", + "type": "ec2", + "size": "t3.nano", + "ami_name": "suse-sles-15-sp4-chost-byos-v????????-hvm-ssd-x86_64" } + ], + "instrumentations": { + "resources": [ + { + "id": "nr_infra", + "resource_ids": [ + "host2" + ], + "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/suse.yml", + "validate_output": "Infrastructure Agent\\s+\\(installed\\)" + } + } ] } -} \ No newline at end of file +} diff --git a/test/definitions-eu/otel/debians/debian11-otel.json b/test/definitions-eu/otel/debians/debian11-otel.json index b2253fc50..2c7da4327 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": "host2", + "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": [ + "host2" + ], + "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/otel/rhel/redhat8arm64-otel.json b/test/definitions-eu/otel/rhel/redhat8arm64-otel.json index b75bf92c0..fd2916324 100644 --- a/test/definitions-eu/otel/rhel/redhat8arm64-otel.json +++ b/test/definitions-eu/otel/rhel/redhat8arm64-otel.json @@ -5,29 +5,31 @@ "Department": "product", "Product": "virtuoso" }, - - "resources": [{ - "id": "host1", - "provider": "aws", - "type": "ec2", - "size": "t4g.micro", - "ami_name": "RHEL-8.4.?_HVM-????????-arm64-??-Hourly2-GP2" - }], - + "resources": [ + { + "id": "host1", + "provider": "aws", + "type": "ec2", + "size": "t4g.micro", + "ami_name": "RHEL-8.*_HVM-????????-arm64-*-Hourly2-GP2" + } + ], "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/rhel.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/rhel.yml", + "validate_output": "New Relic OpenTelemetry Collector\\s+\\(installed\\)", + "recipe_targeted": "newrelic-opentelemetry-collector" + } + } + ] + } } diff --git a/test/definitions-eu/otel/suse/suse154-otel.json b/test/definitions-eu/otel/suse/suse154-otel.json index 1e6b50a12..96dbd9fe9 100644 --- a/test/definitions-eu/otel/suse/suse154-otel.json +++ b/test/definitions-eu/otel/suse/suse154-otel.json @@ -5,29 +5,31 @@ "Department": "product", "Product": "virtuoso" }, - - "resources": [{ - "id": "host1", - "provider": "aws", - "type": "ec2", - "size": "t3.nano", - "ami_name": "suse-sles-15-sp4-v????????-hvm-ssd-x86_64" - }], - + "resources": [ + { + "id": "host1", + "provider": "aws", + "type": "ec2", + "size": "t3.nano", + "ami_name": "suse-sles-15-sp4-chost-byos-v????????-hvm-ssd-x86_64" + } + ], "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/suse.yml", - "validate_output": "New Relic OpenTelemetry Collector\\s+\\(installed\\)", - "recipe_targeted": "newrelic-opentelemetry-collector" - } - } - ] - } -} \ No newline at end of file + { + "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/suse.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..d3cea3325 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-202?????-*", + "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-eu/super-agent/debians/ubuntu16-super-agent-eu.json b/test/definitions-eu/super-agent/debians/ubuntu16-super-agent-eu-fail.json similarity index 95% rename from test/definitions-eu/super-agent/debians/ubuntu16-super-agent-eu.json rename to test/definitions-eu/super-agent/debians/ubuntu16-super-agent-eu-fail.json index a943992a2..dba029a55 100644 --- a/test/definitions-eu/super-agent/debians/ubuntu16-super-agent-eu.json +++ b/test/definitions-eu/super-agent/debians/ubuntu16-super-agent-eu-fail.json @@ -10,7 +10,7 @@ "id": "ubuntu16-super-eu", "provider": "aws", "type": "ec2", - "size": "t3.nano", + "size": "t3.small", "ami_name": "ubuntu-pro-server/images/hvm-ssd/ubuntu-xenial-16.04-amd64-pro-server-????????", "user_name": "ubuntu" } @@ -27,7 +27,7 @@ "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\\)", + "validate_output": "New Relic Super Agent\\s+\\(incomplete\\)", "recipe_targeted": "super-agent" } } diff --git a/test/definitions-eu/super-agent/debians/ubuntu18-super-agent-eu-fail.json b/test/definitions-eu/super-agent/debians/ubuntu18-super-agent-eu-fail.json new file mode 100644 index 000000000..42573fa13 --- /dev/null +++ b/test/definitions-eu/super-agent/debians/ubuntu18-super-agent-eu-fail.json @@ -0,0 +1,36 @@ +{ + "global_tags": { + "owning_team": "virtuoso", + "Environment": "development", + "Department": "product", + "Product": "virtuoso" + }, + "resources": [ + { + "id": "host1", + "provider": "aws", + "type": "ec2", + "size": "t3.nano", + "ami_name": "ubuntu/images/hvm-ssd/ubuntu-bionic-18.04-amd64-server-????????", + "user_name": "ubuntu" + } + ], + "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+\\(incomplete\\)", + "recipe_targeted": "super-agent" + } + } + ] + } +} diff --git a/test/definitions-eu/super-agent/debians/ubuntu18-super-agent-eu.json b/test/definitions-eu/super-agent/debians/ubuntu18-super-agent-eu.json deleted file mode 100644 index 37b57f12b..000000000 --- a/test/definitions-eu/super-agent/debians/ubuntu18-super-agent-eu.json +++ /dev/null @@ -1,34 +0,0 @@ -{ - "global_tags": { - "owning_team": "virtuoso", - "Environment": "development", - "Department": "product", - "Product": "virtuoso" - }, - - "resources": [{ - "id": "host1", - "provider": "aws", - "type": "ec2", - "size": "t3.nano", - "ami_name": "ubuntu/images/hvm-ssd/ubuntu-bionic-18.04-amd64-server-????????", - "user_name": "ubuntu" - }], - - "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" - } - } - ] - } -} diff --git a/test/definitions-eu/super-agent/logs/suse154-super-agent-logs-eu.json b/test/definitions-eu/super-agent/logs/suse154-super-agent-logs-eu.json index 681319788..a9bdfb8c8 100644 --- a/test/definitions-eu/super-agent/logs/suse154-super-agent-logs-eu.json +++ b/test/definitions-eu/super-agent/logs/suse154-super-agent-logs-eu.json @@ -11,22 +11,24 @@ "provider": "aws", "type": "ec2", "size": "t3.nano", - "ami_name": "suse-sles-15-sp4-v????????-hvm-*" + "ami_name": "suse-sles-15-sp4-chost-byos-v????????-hvm-ssd-x86_64" } ], "instrumentations": { "resources": [ { "id": "nr_super_agent_logs", - "resource_ids": ["host1"], + "resource_ids": [ + "host1" + ], "provider": "newrelic", "source_repository": "https://github.com/newrelic/open-install-library", "deploy_script_path": "test/deploy/linux/newrelic-cli/install/roles", "params": { - "env_var": "NEW_RELIC_CLI_SKIP_CORE=1", - "newrelic_cli_option": "-n super-agent,logs-integration-super-agent", - "validate_output": "Logs Integration\\s+\\(installed\\)", - "local_recipes": true + "env_var": "NEW_RELIC_CLI_SKIP_CORE=1", + "newrelic_cli_option": "-n super-agent,logs-integration-super-agent", + "validate_output": "Logs Integration\\s+\\(installed\\)", + "local_recipes": true } } ] diff --git a/test/definitions-eu/super-agent/rhel/awslinux23-super-agent-eu-fail.json b/test/definitions-eu/super-agent/rhel/awslinux23-super-agent-eu-fail.json new file mode 100644 index 000000000..0f1281544 --- /dev/null +++ b/test/definitions-eu/super-agent/rhel/awslinux23-super-agent-eu-fail.json @@ -0,0 +1,36 @@ +{ + "global_tags": { + "owning_team": "virtuoso", + "Environment": "development", + "Department": "product", + "Product": "virtuoso" + }, + "resources": [ + { + "id": "host1", + "provider": "aws", + "ami_name": "al2023-ami-2023.*-x86_64", + "type": "ec2", + "size": "t3.nano", + "user_name": "ec2-user" + } + ], + "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/rhel.yml", + "validate_output": "New Relic Super Agent\\s+\\(incomplete\\)", + "recipe_targeted": "super-agent" + } + } + ] + } +} diff --git a/test/definitions-eu/super-agent/rhel/awslinux23-super-agent-eu.json b/test/definitions-eu/super-agent/rhel/awslinux23-super-agent-eu.json deleted file mode 100644 index 9e5dad952..000000000 --- a/test/definitions-eu/super-agent/rhel/awslinux23-super-agent-eu.json +++ /dev/null @@ -1,34 +0,0 @@ -{ - "global_tags": { - "owning_team": "virtuoso", - "Environment": "development", - "Department": "product", - "Product": "virtuoso" - }, - - "resources": [{ - "id": "host1", - "provider": "aws", - "ami_name": "al2023-ami-2023.*-x86_64", - "type": "ec2", - "size": "t3.nano", - "user_name": "ec2-user" - }], - - "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/rhel.yml", - "validate_output": "New Relic Super Agent\\s+\\(installed\\)", - "recipe_targeted": "super-agent" - } - } - ] - } -} diff --git a/test/definitions-eu/super-agent/rhel/awslinuxarm64-super-agent-eu-fail.json b/test/definitions-eu/super-agent/rhel/awslinuxarm64-super-agent-eu-fail.json new file mode 100644 index 000000000..d18d391b3 --- /dev/null +++ b/test/definitions-eu/super-agent/rhel/awslinuxarm64-super-agent-eu-fail.json @@ -0,0 +1,35 @@ +{ + "global_tags": { + "owning_team": "virtuoso", + "Environment": "development", + "Department": "product", + "Product": "virtuoso" + }, + "resources": [ + { + "id": "host1", + "provider": "aws", + "ami_name": "amzn2-ami-hvm-2.0.????????.?-arm64-gp2", + "type": "ec2", + "size": "t4g.nano" + } + ], + "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/rhel.yml", + "validate_output": "New Relic Super Agent\\s+\\(incomplete\\)", + "recipe_targeted": "super-agent" + } + } + ] + } +} diff --git a/test/definitions-eu/super-agent/rhel/awslinuxarm64-super-agent-eu.json b/test/definitions-eu/super-agent/rhel/awslinuxarm64-super-agent-eu.json deleted file mode 100644 index 8ec15453f..000000000 --- a/test/definitions-eu/super-agent/rhel/awslinuxarm64-super-agent-eu.json +++ /dev/null @@ -1,33 +0,0 @@ -{ - "global_tags": { - "owning_team": "virtuoso", - "Environment": "development", - "Department": "product", - "Product": "virtuoso" - }, - - "resources": [{ - "id": "host1", - "provider": "aws", - "ami_name": "amzn2-ami-hvm-2.0.????????.?-arm64-gp2", - "type": "ec2", - "size": "t4g.nano" - }], - - "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/rhel.yml", - "validate_output": "New Relic Super Agent\\s+\\(installed\\)", - "recipe_targeted": "super-agent" - } - } - ] - } -} diff --git a/test/definitions-eu/super-agent/rhel/centos7-super-agent-eu-fail.json b/test/definitions-eu/super-agent/rhel/centos7-super-agent-eu-fail.json new file mode 100644 index 000000000..14b97cada --- /dev/null +++ b/test/definitions-eu/super-agent/rhel/centos7-super-agent-eu-fail.json @@ -0,0 +1,36 @@ +{ + "global_tags": { + "owning_team": "virtuoso", + "Environment": "development", + "Department": "product", + "Product": "virtuoso" + }, + "resources": [ + { + "id": "host1", + "provider": "aws", + "type": "ec2", + "size": "t3.nano", + "ami_name": "CentOS-7-????-????????_?.x86_64-*", + "user_name": "centos" + } + ], + "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/rhel.yml", + "validate_output": "New Relic Super Agent\\s+\\(incomplete\\)", + "recipe_targeted": "super-agent" + } + } + ] + } +} diff --git a/test/definitions-eu/super-agent/rhel/centos7-super-agent-eu.json b/test/definitions-eu/super-agent/rhel/centos7-super-agent-eu.json deleted file mode 100644 index 0f0a28e0a..000000000 --- a/test/definitions-eu/super-agent/rhel/centos7-super-agent-eu.json +++ /dev/null @@ -1,34 +0,0 @@ -{ - "global_tags": { - "owning_team": "virtuoso", - "Environment": "development", - "Department": "product", - "Product": "virtuoso" - }, - - "resources": [{ - "id": "host1", - "provider": "aws", - "type": "ec2", - "size": "t3.nano", - "ami_name": "CentOS-7-????-????????_?.x86_64-*", - "user_name": "centos" - }], - - "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/rhel.yml", - "validate_output": "New Relic Super Agent\\s+\\(installed\\)", - "recipe_targeted": "super-agent" - } - } - ] - } -} diff --git a/test/definitions-eu/super-agent/rhel/redhat7-super-agent-eu-fail.json b/test/definitions-eu/super-agent/rhel/redhat7-super-agent-eu-fail.json new file mode 100644 index 000000000..71d2f1f63 --- /dev/null +++ b/test/definitions-eu/super-agent/rhel/redhat7-super-agent-eu-fail.json @@ -0,0 +1,35 @@ +{ + "global_tags": { + "owning_team": "virtuoso", + "Environment": "development", + "Department": "product", + "Product": "virtuoso" + }, + "resources": [ + { + "id": "host1", + "provider": "aws", + "type": "ec2", + "size": "t3.micro", + "ami_name": "RHEL_HA-7.?_HVM-????????-x86_64-?-Hourly2-GP2" + } + ], + "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/rhel.yml", + "validate_output": "New Relic Super Agent\\s+\\(incomplete\\)", + "recipe_targeted": "super-agent" + } + } + ] + } +} diff --git a/test/definitions-eu/super-agent/rhel/redhat7-super-agent-eu.json b/test/definitions-eu/super-agent/rhel/redhat7-super-agent-eu.json deleted file mode 100644 index 17cb34765..000000000 --- a/test/definitions-eu/super-agent/rhel/redhat7-super-agent-eu.json +++ /dev/null @@ -1,33 +0,0 @@ -{ - "global_tags": { - "owning_team": "virtuoso", - "Environment": "development", - "Department": "product", - "Product": "virtuoso" - }, - - "resources": [{ - "id": "host1", - "provider": "aws", - "type": "ec2", - "size": "t3.micro", - "ami_name": "RHEL_HA-7.?_HVM-????????-x86_64-?-Hourly2-GP2" - }], - - "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/rhel.yml", - "validate_output": "New Relic Super Agent\\s+\\(installed\\)", - "recipe_targeted": "super-agent" - } - } - ] - } -} diff --git a/test/definitions-eu/super-agent/rhel/redhat8arm64-super-agent-eu.json b/test/definitions-eu/super-agent/rhel/redhat8arm64-super-agent-eu.json index 9ffaaea35..437562774 100644 --- a/test/definitions-eu/super-agent/rhel/redhat8arm64-super-agent-eu.json +++ b/test/definitions-eu/super-agent/rhel/redhat8arm64-super-agent-eu.json @@ -5,29 +5,31 @@ "Department": "product", "Product": "virtuoso" }, - - "resources": [{ - "id": "host1", - "provider": "aws", - "type": "ec2", - "size": "t4g.micro", - "ami_name": "RHEL-8.4.?_HVM-????????-arm64-?-Hourly2-GP2" - }], - + "resources": [ + { + "id": "host1", + "provider": "aws", + "type": "ec2", + "size": "t4g.micro", + "ami_name": "RHEL-8.*_HVM-????????-arm64-*-Hourly2-GP2" + } + ], "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/rhel.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/rhel.yml", + "validate_output": "New Relic Super Agent\\s+\\(installed\\)", + "recipe_targeted": "super-agent" + } + } + ] + } } diff --git a/test/definitions-eu/super-agent/suse/suse125-super-agent-eu-fail.json b/test/definitions-eu/super-agent/suse/suse125-super-agent-eu-fail.json new file mode 100644 index 000000000..b1bf46765 --- /dev/null +++ b/test/definitions-eu/super-agent/suse/suse125-super-agent-eu-fail.json @@ -0,0 +1,35 @@ +{ + "global_tags": { + "owning_team": "virtuoso", + "Environment": "development", + "Department": "product", + "Product": "virtuoso" + }, + "resources": [ + { + "id": "host1", + "provider": "aws", + "type": "ec2", + "size": "t3.micro", + "ami_name": "suse-sles-12-sp5-v????????-hvm-*" + } + ], + "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/suse.yml", + "validate_output": "New Relic Super Agent\\s+\\(incomplete\\)", + "recipe_targeted": "super-agent" + } + } + ] + } +} diff --git a/test/definitions-eu/super-agent/suse/suse125-super-agent-eu.json b/test/definitions-eu/super-agent/suse/suse125-super-agent-eu.json deleted file mode 100644 index bac94f09e..000000000 --- a/test/definitions-eu/super-agent/suse/suse125-super-agent-eu.json +++ /dev/null @@ -1,33 +0,0 @@ -{ - "global_tags": { - "owning_team": "virtuoso", - "Environment": "development", - "Department": "product", - "Product": "virtuoso" - }, - - "resources": [{ - "id": "host1", - "provider": "aws", - "type": "ec2", - "size": "t3.micro", - "ami_name": "suse-sles-12-sp5-v????????-hvm-*" - }], - - "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/suse.yml", - "validate_output": "New Relic Super Agent\\s+\\(installed\\)", - "recipe_targeted": "super-agent" - } - } - ] - } -} diff --git a/test/definitions-eu/super-agent/suse/suse154-super-agent-eu.json b/test/definitions-eu/super-agent/suse/suse154-super-agent-eu.json index ce2115659..b5e19926c 100644 --- a/test/definitions-eu/super-agent/suse/suse154-super-agent-eu.json +++ b/test/definitions-eu/super-agent/suse/suse154-super-agent-eu.json @@ -5,29 +5,31 @@ "Department": "product", "Product": "virtuoso" }, - - "resources": [{ - "id": "host1", - "provider": "aws", - "type": "ec2", - "size": "t3.nano", - "ami_name": "suse-sles-15-sp4-v????????-hvm-ssd-x86_64" - }], - + "resources": [ + { + "id": "host1", + "provider": "aws", + "type": "ec2", + "size": "t3.nano", + "ami_name": "suse-sles-15-sp4-chost-byos-v????????-hvm-ssd-x86_64" + } + ], "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/suse.yml", - "validate_output": "New Relic Super Agent\\s+\\(installed\\)", - "recipe_targeted": "super-agent" - } - } - ] - } -} \ No newline at end of file + { + "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/suse.yml", + "validate_output": "New Relic Super Agent\\s+\\(installed\\)", + "recipe_targeted": "super-agent" + } + } + ] + } +} diff --git a/test/definitions/infra-agent/suse154-infra.json b/test/definitions/infra-agent/suse154-infra.json index 1efd24ff7..80c53a0d8 100644 --- a/test/definitions/infra-agent/suse154-infra.json +++ b/test/definitions/infra-agent/suse154-infra.json @@ -11,7 +11,7 @@ "provider": "aws", "type": "ec2", "size": "t3.nano", - "ami_name": "suse-sles-15-sp4-v????????-hvm-*" + "ami_name": "suse-sles-15-sp4-chost-byos-v????????-hvm-ssd-x86_64" } ], "instrumentations": { @@ -25,10 +25,9 @@ "source_repository": "https://github.com/newrelic/open-install-library", "deploy_script_path": "test/deploy/linux/newrelic-cli/install/roles", "params": { - "validate_output": "Infrastructure Agent\\s+\\(installed\\)", - "local_recipes": true + "validate_output": "Infrastructure Agent\\s+\\(installed\\)" } } ] } -} \ No newline at end of file +} diff --git a/test/definitions/logging/suse154-logs.json b/test/definitions/logging/suse154-logs.json index 8d50478d2..47e19fac6 100644 --- a/test/definitions/logging/suse154-logs.json +++ b/test/definitions/logging/suse154-logs.json @@ -11,7 +11,7 @@ "provider": "aws", "type": "ec2", "size": "t3.nano", - "ami_name": "suse-sles-15-sp4-v????????-hvm-*" + "ami_name": "suse-sles-15-sp4-chost-byos-v????????-hvm-ssd-x86_64" } ], "instrumentations": { @@ -31,4 +31,4 @@ } ] } -} \ No newline at end of file +} diff --git a/test/definitions/ohi/linux/mysql-suse.json b/test/definitions/ohi/linux/mysql-suse.json index e16c70021..ce4bbaa93 100644 --- a/test/definitions/ohi/linux/mysql-suse.json +++ b/test/definitions/ohi/linux/mysql-suse.json @@ -1,22 +1,25 @@ { - "global_tags": { - "owning_team": "virtuoso", - "Environment": "development", - "Department": "product", - "Product": "virtuoso" - }, - - "resources": [{ - "id": "host1", - "provider": "aws", - "type": "ec2", - "size": "t3.micro", - "ami_name": "suse-sles-12-sp5-v????????-hvm-*" - }], - - "services": [{ + "global_tags": { + "owning_team": "virtuoso", + "Environment": "development", + "Department": "product", + "Product": "virtuoso" + }, + "resources": [ + { + "id": "host1", + "provider": "aws", + "type": "ec2", + "size": "t3.micro", + "ami_name": "suse-sles-12-sp5-v????????-hvm-ssd-x86_64" + } + ], + "services": [ + { "id": "mysql1", - "destinations": ["host1"], + "destinations": [ + "host1" + ], "source_repository": "https://github.com/newrelic/open-install-library.git", "deploy_script_path": "test/deploy/linux/mysql/install/suse/roles", "port": 9999, @@ -24,21 +27,23 @@ "create_env_var": true, "create_newrelic_user": true } - }], - - "instrumentations": { - "resources": [ - { - "id": "infra_mysql", - "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/suse.yml,https://raw.githubusercontent.com/newrelic/open-install-library/main/recipes/newrelic/infrastructure/ohi/mysql/suse.yml", - "validate_output": "New Relic installation complete" - } - } - ] } + ], + "instrumentations": { + "resources": [ + { + "id": "infra_mysql", + "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/suse.yml,https://raw.githubusercontent.com/newrelic/open-install-library/main/recipes/newrelic/infrastructure/ohi/mysql/suse.yml", + "validate_output": "New Relic installation complete" + } + } + ] } +} 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/otel/rhel/redhat8arm64-otel.json b/test/definitions/otel/rhel/redhat8arm64-otel.json index b75bf92c0..fd2916324 100644 --- a/test/definitions/otel/rhel/redhat8arm64-otel.json +++ b/test/definitions/otel/rhel/redhat8arm64-otel.json @@ -5,29 +5,31 @@ "Department": "product", "Product": "virtuoso" }, - - "resources": [{ - "id": "host1", - "provider": "aws", - "type": "ec2", - "size": "t4g.micro", - "ami_name": "RHEL-8.4.?_HVM-????????-arm64-??-Hourly2-GP2" - }], - + "resources": [ + { + "id": "host1", + "provider": "aws", + "type": "ec2", + "size": "t4g.micro", + "ami_name": "RHEL-8.*_HVM-????????-arm64-*-Hourly2-GP2" + } + ], "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/rhel.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/rhel.yml", + "validate_output": "New Relic OpenTelemetry Collector\\s+\\(installed\\)", + "recipe_targeted": "newrelic-opentelemetry-collector" + } + } + ] + } } diff --git a/test/definitions/otel/suse/suse154-otel.json b/test/definitions/otel/suse/suse154-otel.json index 1e6b50a12..96dbd9fe9 100644 --- a/test/definitions/otel/suse/suse154-otel.json +++ b/test/definitions/otel/suse/suse154-otel.json @@ -5,29 +5,31 @@ "Department": "product", "Product": "virtuoso" }, - - "resources": [{ - "id": "host1", - "provider": "aws", - "type": "ec2", - "size": "t3.nano", - "ami_name": "suse-sles-15-sp4-v????????-hvm-ssd-x86_64" - }], - + "resources": [ + { + "id": "host1", + "provider": "aws", + "type": "ec2", + "size": "t3.nano", + "ami_name": "suse-sles-15-sp4-chost-byos-v????????-hvm-ssd-x86_64" + } + ], "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/suse.yml", - "validate_output": "New Relic OpenTelemetry Collector\\s+\\(installed\\)", - "recipe_targeted": "newrelic-opentelemetry-collector" - } - } - ] - } -} \ No newline at end of file + { + "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/suse.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..d3cea3325 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-202?????-*", + "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/super-agent/debians/ubuntu16-super-agent.json b/test/definitions/super-agent/debians/ubuntu16-super-agent-fail.json similarity index 98% rename from test/definitions/super-agent/debians/ubuntu16-super-agent.json rename to test/definitions/super-agent/debians/ubuntu16-super-agent-fail.json index 30f2026c3..bc2a9f6a6 100644 --- a/test/definitions/super-agent/debians/ubuntu16-super-agent.json +++ b/test/definitions/super-agent/debians/ubuntu16-super-agent-fail.json @@ -27,7 +27,7 @@ "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\\)", + "validate_output": "New Relic Super Agent\\s+\\(incomplete\\)", "recipe_targeted": "super-agent" } } diff --git a/test/definitions/super-agent/debians/ubuntu18-super-agent-fail.json b/test/definitions/super-agent/debians/ubuntu18-super-agent-fail.json new file mode 100644 index 000000000..42573fa13 --- /dev/null +++ b/test/definitions/super-agent/debians/ubuntu18-super-agent-fail.json @@ -0,0 +1,36 @@ +{ + "global_tags": { + "owning_team": "virtuoso", + "Environment": "development", + "Department": "product", + "Product": "virtuoso" + }, + "resources": [ + { + "id": "host1", + "provider": "aws", + "type": "ec2", + "size": "t3.nano", + "ami_name": "ubuntu/images/hvm-ssd/ubuntu-bionic-18.04-amd64-server-????????", + "user_name": "ubuntu" + } + ], + "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+\\(incomplete\\)", + "recipe_targeted": "super-agent" + } + } + ] + } +} diff --git a/test/definitions/super-agent/debians/ubuntu18-super-agent.json b/test/definitions/super-agent/debians/ubuntu18-super-agent.json deleted file mode 100644 index 37b57f12b..000000000 --- a/test/definitions/super-agent/debians/ubuntu18-super-agent.json +++ /dev/null @@ -1,34 +0,0 @@ -{ - "global_tags": { - "owning_team": "virtuoso", - "Environment": "development", - "Department": "product", - "Product": "virtuoso" - }, - - "resources": [{ - "id": "host1", - "provider": "aws", - "type": "ec2", - "size": "t3.nano", - "ami_name": "ubuntu/images/hvm-ssd/ubuntu-bionic-18.04-amd64-server-????????", - "user_name": "ubuntu" - }], - - "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" - } - } - ] - } -} diff --git a/test/definitions/super-agent/logs/suse154-super-agent-logs.json b/test/definitions/super-agent/logs/suse154-super-agent-logs.json index 681319788..a9bdfb8c8 100644 --- a/test/definitions/super-agent/logs/suse154-super-agent-logs.json +++ b/test/definitions/super-agent/logs/suse154-super-agent-logs.json @@ -11,22 +11,24 @@ "provider": "aws", "type": "ec2", "size": "t3.nano", - "ami_name": "suse-sles-15-sp4-v????????-hvm-*" + "ami_name": "suse-sles-15-sp4-chost-byos-v????????-hvm-ssd-x86_64" } ], "instrumentations": { "resources": [ { "id": "nr_super_agent_logs", - "resource_ids": ["host1"], + "resource_ids": [ + "host1" + ], "provider": "newrelic", "source_repository": "https://github.com/newrelic/open-install-library", "deploy_script_path": "test/deploy/linux/newrelic-cli/install/roles", "params": { - "env_var": "NEW_RELIC_CLI_SKIP_CORE=1", - "newrelic_cli_option": "-n super-agent,logs-integration-super-agent", - "validate_output": "Logs Integration\\s+\\(installed\\)", - "local_recipes": true + "env_var": "NEW_RELIC_CLI_SKIP_CORE=1", + "newrelic_cli_option": "-n super-agent,logs-integration-super-agent", + "validate_output": "Logs Integration\\s+\\(installed\\)", + "local_recipes": true } } ] diff --git a/test/definitions/super-agent/rhel/awslinux23-super-agent-fail.json b/test/definitions/super-agent/rhel/awslinux23-super-agent-fail.json new file mode 100644 index 000000000..0f1281544 --- /dev/null +++ b/test/definitions/super-agent/rhel/awslinux23-super-agent-fail.json @@ -0,0 +1,36 @@ +{ + "global_tags": { + "owning_team": "virtuoso", + "Environment": "development", + "Department": "product", + "Product": "virtuoso" + }, + "resources": [ + { + "id": "host1", + "provider": "aws", + "ami_name": "al2023-ami-2023.*-x86_64", + "type": "ec2", + "size": "t3.nano", + "user_name": "ec2-user" + } + ], + "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/rhel.yml", + "validate_output": "New Relic Super Agent\\s+\\(incomplete\\)", + "recipe_targeted": "super-agent" + } + } + ] + } +} diff --git a/test/definitions/super-agent/rhel/awslinux23-super-agent.json b/test/definitions/super-agent/rhel/awslinux23-super-agent.json deleted file mode 100644 index 9e5dad952..000000000 --- a/test/definitions/super-agent/rhel/awslinux23-super-agent.json +++ /dev/null @@ -1,34 +0,0 @@ -{ - "global_tags": { - "owning_team": "virtuoso", - "Environment": "development", - "Department": "product", - "Product": "virtuoso" - }, - - "resources": [{ - "id": "host1", - "provider": "aws", - "ami_name": "al2023-ami-2023.*-x86_64", - "type": "ec2", - "size": "t3.nano", - "user_name": "ec2-user" - }], - - "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/rhel.yml", - "validate_output": "New Relic Super Agent\\s+\\(installed\\)", - "recipe_targeted": "super-agent" - } - } - ] - } -} diff --git a/test/definitions/super-agent/rhel/awslinuxarm64-super-agent-fail.json b/test/definitions/super-agent/rhel/awslinuxarm64-super-agent-fail.json new file mode 100644 index 000000000..d18d391b3 --- /dev/null +++ b/test/definitions/super-agent/rhel/awslinuxarm64-super-agent-fail.json @@ -0,0 +1,35 @@ +{ + "global_tags": { + "owning_team": "virtuoso", + "Environment": "development", + "Department": "product", + "Product": "virtuoso" + }, + "resources": [ + { + "id": "host1", + "provider": "aws", + "ami_name": "amzn2-ami-hvm-2.0.????????.?-arm64-gp2", + "type": "ec2", + "size": "t4g.nano" + } + ], + "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/rhel.yml", + "validate_output": "New Relic Super Agent\\s+\\(incomplete\\)", + "recipe_targeted": "super-agent" + } + } + ] + } +} diff --git a/test/definitions/super-agent/rhel/awslinuxarm64-super-agent.json b/test/definitions/super-agent/rhel/awslinuxarm64-super-agent.json deleted file mode 100644 index 8ec15453f..000000000 --- a/test/definitions/super-agent/rhel/awslinuxarm64-super-agent.json +++ /dev/null @@ -1,33 +0,0 @@ -{ - "global_tags": { - "owning_team": "virtuoso", - "Environment": "development", - "Department": "product", - "Product": "virtuoso" - }, - - "resources": [{ - "id": "host1", - "provider": "aws", - "ami_name": "amzn2-ami-hvm-2.0.????????.?-arm64-gp2", - "type": "ec2", - "size": "t4g.nano" - }], - - "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/rhel.yml", - "validate_output": "New Relic Super Agent\\s+\\(installed\\)", - "recipe_targeted": "super-agent" - } - } - ] - } -} diff --git a/test/definitions/super-agent/rhel/centos7-super-agent-fail.json b/test/definitions/super-agent/rhel/centos7-super-agent-fail.json new file mode 100644 index 000000000..14b97cada --- /dev/null +++ b/test/definitions/super-agent/rhel/centos7-super-agent-fail.json @@ -0,0 +1,36 @@ +{ + "global_tags": { + "owning_team": "virtuoso", + "Environment": "development", + "Department": "product", + "Product": "virtuoso" + }, + "resources": [ + { + "id": "host1", + "provider": "aws", + "type": "ec2", + "size": "t3.nano", + "ami_name": "CentOS-7-????-????????_?.x86_64-*", + "user_name": "centos" + } + ], + "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/rhel.yml", + "validate_output": "New Relic Super Agent\\s+\\(incomplete\\)", + "recipe_targeted": "super-agent" + } + } + ] + } +} diff --git a/test/definitions/super-agent/rhel/centos7-super-agent.json b/test/definitions/super-agent/rhel/centos7-super-agent.json deleted file mode 100644 index 0f0a28e0a..000000000 --- a/test/definitions/super-agent/rhel/centos7-super-agent.json +++ /dev/null @@ -1,34 +0,0 @@ -{ - "global_tags": { - "owning_team": "virtuoso", - "Environment": "development", - "Department": "product", - "Product": "virtuoso" - }, - - "resources": [{ - "id": "host1", - "provider": "aws", - "type": "ec2", - "size": "t3.nano", - "ami_name": "CentOS-7-????-????????_?.x86_64-*", - "user_name": "centos" - }], - - "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/rhel.yml", - "validate_output": "New Relic Super Agent\\s+\\(installed\\)", - "recipe_targeted": "super-agent" - } - } - ] - } -} diff --git a/test/definitions/super-agent/rhel/redhat7-super-agent-fail.json b/test/definitions/super-agent/rhel/redhat7-super-agent-fail.json new file mode 100644 index 000000000..71d2f1f63 --- /dev/null +++ b/test/definitions/super-agent/rhel/redhat7-super-agent-fail.json @@ -0,0 +1,35 @@ +{ + "global_tags": { + "owning_team": "virtuoso", + "Environment": "development", + "Department": "product", + "Product": "virtuoso" + }, + "resources": [ + { + "id": "host1", + "provider": "aws", + "type": "ec2", + "size": "t3.micro", + "ami_name": "RHEL_HA-7.?_HVM-????????-x86_64-?-Hourly2-GP2" + } + ], + "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/rhel.yml", + "validate_output": "New Relic Super Agent\\s+\\(incomplete\\)", + "recipe_targeted": "super-agent" + } + } + ] + } +} diff --git a/test/definitions/super-agent/rhel/redhat7-super-agent.json b/test/definitions/super-agent/rhel/redhat7-super-agent.json deleted file mode 100644 index 17cb34765..000000000 --- a/test/definitions/super-agent/rhel/redhat7-super-agent.json +++ /dev/null @@ -1,33 +0,0 @@ -{ - "global_tags": { - "owning_team": "virtuoso", - "Environment": "development", - "Department": "product", - "Product": "virtuoso" - }, - - "resources": [{ - "id": "host1", - "provider": "aws", - "type": "ec2", - "size": "t3.micro", - "ami_name": "RHEL_HA-7.?_HVM-????????-x86_64-?-Hourly2-GP2" - }], - - "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/rhel.yml", - "validate_output": "New Relic Super Agent\\s+\\(installed\\)", - "recipe_targeted": "super-agent" - } - } - ] - } -} diff --git a/test/definitions/super-agent/rhel/redhat8arm64-super-agent.json b/test/definitions/super-agent/rhel/redhat8arm64-super-agent.json index 9ffaaea35..437562774 100644 --- a/test/definitions/super-agent/rhel/redhat8arm64-super-agent.json +++ b/test/definitions/super-agent/rhel/redhat8arm64-super-agent.json @@ -5,29 +5,31 @@ "Department": "product", "Product": "virtuoso" }, - - "resources": [{ - "id": "host1", - "provider": "aws", - "type": "ec2", - "size": "t4g.micro", - "ami_name": "RHEL-8.4.?_HVM-????????-arm64-?-Hourly2-GP2" - }], - + "resources": [ + { + "id": "host1", + "provider": "aws", + "type": "ec2", + "size": "t4g.micro", + "ami_name": "RHEL-8.*_HVM-????????-arm64-*-Hourly2-GP2" + } + ], "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/rhel.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/rhel.yml", + "validate_output": "New Relic Super Agent\\s+\\(installed\\)", + "recipe_targeted": "super-agent" + } + } + ] + } } diff --git a/test/definitions/super-agent/suse/suse154-super-agent.json b/test/definitions/super-agent/suse/suse154-super-agent.json index ce2115659..b5e19926c 100644 --- a/test/definitions/super-agent/suse/suse154-super-agent.json +++ b/test/definitions/super-agent/suse/suse154-super-agent.json @@ -5,29 +5,31 @@ "Department": "product", "Product": "virtuoso" }, - - "resources": [{ - "id": "host1", - "provider": "aws", - "type": "ec2", - "size": "t3.nano", - "ami_name": "suse-sles-15-sp4-v????????-hvm-ssd-x86_64" - }], - + "resources": [ + { + "id": "host1", + "provider": "aws", + "type": "ec2", + "size": "t3.nano", + "ami_name": "suse-sles-15-sp4-chost-byos-v????????-hvm-ssd-x86_64" + } + ], "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/suse.yml", - "validate_output": "New Relic Super Agent\\s+\\(installed\\)", - "recipe_targeted": "super-agent" - } - } - ] - } -} \ No newline at end of file + { + "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/suse.yml", + "validate_output": "New Relic Super Agent\\s+\\(installed\\)", + "recipe_targeted": "super-agent" + } + } + ] + } +} diff --git a/test/deploy/linux/jetty/systemd/install/roles/configure/tasks/main.yml b/test/deploy/linux/jetty/systemd/install/roles/configure/tasks/main.yml index 532eddf3b..10a1bb1ee 100644 --- a/test/deploy/linux/jetty/systemd/install/roles/configure/tasks/main.yml +++ b/test/deploy/linux/jetty/systemd/install/roles/configure/tasks/main.yml @@ -2,7 +2,7 @@ - debug: msg: Install Systemd Jetty -- name: Install Java for debian +- name: Install Java for debian package: name: ["default-jdk"] update_cache: yes @@ -19,15 +19,15 @@ when: ansible_pkg_mgr == 'yum' - name: Download Jetty package - shell: wget https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-distribution/9.4.17.v20190418/jetty-distribution-9.4.17.v20190418.tar.gz + shell: wget https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-distribution/9.4.53.v20231009/jetty-distribution-9.4.53.v20231009.tar.gz become: true - name: Unpack Jetty - shell: tar -zxvf jetty-distribution-9.4.17.v20190418.tar.gz + shell: tar -zxvf jetty-distribution-9.4.53.v20231009.tar.gz become: true - name: Move Jetty to opt - shell: mv jetty-distribution-9.4.17.v20190418 /opt/jetty + shell: mv jetty-distribution-9.4.53.v20231009 /opt/jetty become: true - name: Create jetty user @@ -39,10 +39,10 @@ become: true - name: Create and change ownership of jetty pid - shell: | + shell: | mkdir /var/run/jetty chown -R jetty:jetty /var/run/jetty - become: true + become: true - name: Create symbolic link for Jetty shell: ln -s /opt/jetty/bin/jetty.sh /etc/init.d/jetty @@ -55,11 +55,11 @@ package: name: ["sysv-rc-conf"] update_cache: yes - state: latest + state: latest - name: Enable jetty to start on boot shell: sysv-rc-conf --level S jetty on - + when: ansible_pkg_mgr == 'apt' become: true @@ -91,7 +91,7 @@ JETTY_PORT=8080 JETTY_HOST=192.168.1.10' >> /etc/default/jetty become: true - + - name: Start Jetty - shell: service jetty start + shell: /opt/jetty/bin/jetty.sh start become: true diff --git a/test/manual/definitions/infra-agent/redhat8arm64-infra.json b/test/manual/definitions/infra-agent/redhat8arm64-infra.json index f4c7a4f12..e6a17c116 100644 --- a/test/manual/definitions/infra-agent/redhat8arm64-infra.json +++ b/test/manual/definitions/infra-agent/redhat8arm64-infra.json @@ -5,12 +5,13 @@ "Department": "product", "Product": "virtuoso" }, - - "resources": [{ - "id": "host1", - "provider": "aws", - "type": "ec2", - "size": "t4g.micro", - "ami_name": "RHEL-8.4.?_HVM-????????-arm64-??-Hourly2-GP2" - }] + "resources": [ + { + "id": "host1", + "provider": "aws", + "type": "ec2", + "size": "t4g.micro", + "ami_name": "RHEL-8.*_HVM-????????-arm64-*-Hourly2-GP2" + } + ] } diff --git a/test/manual/definitions/infra-agent/suse154-infra.json b/test/manual/definitions/infra-agent/suse154-infra.json index 3b9c96f5b..d46c62ac3 100644 --- a/test/manual/definitions/infra-agent/suse154-infra.json +++ b/test/manual/definitions/infra-agent/suse154-infra.json @@ -5,12 +5,13 @@ "Department": "product", "Product": "virtuoso" }, - - "resources": [{ - "id": "infrasuse154", - "provider": "aws", - "type": "ec2", - "size": "t3.nano", - "ami_name": "suse-sles-15-sp4-v????????-hvm-*" - }] -} \ No newline at end of file + "resources": [ + { + "id": "infrasuse154", + "provider": "aws", + "type": "ec2", + "size": "t3.nano", + "ami_name": "suse-sles-15-sp4-chost-byos-v????????-hvm-ssd-x86_64" + } + ] +}