From 2ada142059b769b59f4565c36daf86e23e7239a1 Mon Sep 17 00:00:00 2001 From: Ruben Ruiz de Gauna Date: Thu, 30 May 2024 16:24:05 +0200 Subject: [PATCH] only supported versions --- recipes/newrelic/infrastructure/super-agent/rhel.yml | 8 ++------ recipes/newrelic/infrastructure/super-agent/suse.yml | 1 + ...-agent-eu-fail.json => awslinux23-super-agent-eu.json} | 2 +- .../super-agent/rhel/awslinux23-super-agent-fail.json | 2 +- .../super-agent/rhel/awslinuxarm64-super-agent-fail.json | 2 +- .../super-agent/rhel/centos7-super-agent-fail.json | 2 +- .../super-agent/rhel/redhat7-super-agent-fail.json | 2 +- .../super-agent/suse/suse125-super-agent-fail.json | 2 +- 8 files changed, 9 insertions(+), 12 deletions(-) rename test/definitions-eu/super-agent/rhel/{awslinux23-super-agent-eu-fail.json => awslinux23-super-agent-eu.json} (93%) diff --git a/recipes/newrelic/infrastructure/super-agent/rhel.yml b/recipes/newrelic/infrastructure/super-agent/rhel.yml index 437a3c262..2123c039b 100644 --- a/recipes/newrelic/infrastructure/super-agent/rhel.yml +++ b/recipes/newrelic/infrastructure/super-agent/rhel.yml @@ -7,10 +7,6 @@ description: New Relic install recipe for the Super Agent repository: https://github.com/newrelic/newrelic-super-agent installTargets: - - type: host - os: linux - platform: amazon - platformFamily: rhel - type: host os: linux platform: amazon @@ -24,11 +20,11 @@ installTargets: - type: host os: linux platform: "centos" - platformVersion: "((7|8|9)\\.?.*)" + platformVersion: "^((8|9)\\.?.*)" - type: host os: linux platform: "redhat" - platformVersion: "((7|8|9)\\.?.*)" + platformVersion: "^((8|9)\\.?.*)" keywords: - SuperAgent diff --git a/recipes/newrelic/infrastructure/super-agent/suse.yml b/recipes/newrelic/infrastructure/super-agent/suse.yml index 15dbe7685..c870fd39f 100644 --- a/recipes/newrelic/infrastructure/super-agent/suse.yml +++ b/recipes/newrelic/infrastructure/super-agent/suse.yml @@ -10,6 +10,7 @@ installTargets: - type: host os: linux platform: suse + platformVersion: "(15\\.[1-4]|15-SP[1-4])" - type: host os: linux platformFamily: suse 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.json similarity index 93% rename from test/definitions-eu/super-agent/rhel/awslinux23-super-agent-eu-fail.json rename to test/definitions-eu/super-agent/rhel/awslinux23-super-agent-eu.json index 0f1281544..7b108d77e 100644 --- a/test/definitions-eu/super-agent/rhel/awslinux23-super-agent-eu-fail.json +++ b/test/definitions-eu/super-agent/rhel/awslinux23-super-agent-eu.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/rhel.yml", - "validate_output": "New Relic Super Agent\\s+\\(incomplete\\)", + "validate_output": "New Relic Super Agent\\s+\\(installed\\)", "recipe_targeted": "super-agent" } } diff --git a/test/definitions/super-agent/rhel/awslinux23-super-agent-fail.json b/test/definitions/super-agent/rhel/awslinux23-super-agent-fail.json index 0f1281544..ab40fe43f 100644 --- a/test/definitions/super-agent/rhel/awslinux23-super-agent-fail.json +++ b/test/definitions/super-agent/rhel/awslinux23-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/rhel.yml", - "validate_output": "New Relic Super Agent\\s+\\(incomplete\\)", + "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 index d18d391b3..aad51cf0d 100644 --- a/test/definitions/super-agent/rhel/awslinuxarm64-super-agent-fail.json +++ b/test/definitions/super-agent/rhel/awslinuxarm64-super-agent-fail.json @@ -26,7 +26,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/rhel.yml", - "validate_output": "New Relic Super Agent\\s+\\(incomplete\\)", + "validate_output": "super-agent\\s+\\(unsupported\\)", "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 index 14b97cada..2acd85b07 100644 --- a/test/definitions/super-agent/rhel/centos7-super-agent-fail.json +++ b/test/definitions/super-agent/rhel/centos7-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/rhel.yml", - "validate_output": "New Relic Super Agent\\s+\\(incomplete\\)", + "validate_output": "super-agent\\s+\\(unsupported\\)", "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 index 71d2f1f63..9b14aad20 100644 --- a/test/definitions/super-agent/rhel/redhat7-super-agent-fail.json +++ b/test/definitions/super-agent/rhel/redhat7-super-agent-fail.json @@ -26,7 +26,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/rhel.yml", - "validate_output": "New Relic Super Agent\\s+\\(incomplete\\)", + "validate_output": "super-agent\\s+\\(unsupported\\)", "recipe_targeted": "super-agent" } } diff --git a/test/definitions/super-agent/suse/suse125-super-agent-fail.json b/test/definitions/super-agent/suse/suse125-super-agent-fail.json index b1bf46765..a503d3d22 100644 --- a/test/definitions/super-agent/suse/suse125-super-agent-fail.json +++ b/test/definitions/super-agent/suse/suse125-super-agent-fail.json @@ -26,7 +26,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/suse.yml", - "validate_output": "New Relic Super Agent\\s+\\(incomplete\\)", + "validate_output": "super-agent\\s+\\(unsupported\\)", "recipe_targeted": "super-agent" } }