From 4fd5809358edb2ce49f669d2ff7ad6169f602568 Mon Sep 17 00:00:00 2001 From: Rohan Paliwal Date: Fri, 22 Nov 2024 12:41:56 +0530 Subject: [PATCH] fix(demo_deployer): Updated specific regex in validate_output's param value --- .../linux/debian10-nginx-aspnetcore.json | 2 +- .../linux/ubuntu20-apache-aspnetcore.json | 2 +- .../apm/dotNet/windows/iis-blank.json | 2 +- .../apm/dotNet/windows/windows2016-iis.json | 29 +++++++++--------- .../windows/windows2019-core-only-iis.json | 30 +++++++++---------- .../apm/dotNet/windows/windows2019-iis.json | 2 +- .../apm/java/deb10-supd-javatron.json | 2 +- .../apm/java/deb10-sysd-custom-sh.json | 2 +- .../apm/java/deb10-sysd-tomcat-cmd.json | 2 +- .../apm/java/deb10-sysd-tomcat-sh.json | 2 +- .../apm/java/deb11-apt-sysd-tomcat.json | 2 +- .../apm/java/deb11-sysd-jboss.json | 2 +- .../apm/java/rhl2-supd-javatron.json | 2 +- .../apm/java/rhl2-sysd-custom-sh.json | 2 +- .../apm/java/rhl2-sysd-tomcat-cmd.json | 2 +- .../apm/java/rhl2-sysd-tomcat-sh.json | 2 +- .../apm/java/rhl2-yum-docker-jboss.json | 2 +- .../apm/java/rhl2-yum-sysd-tomcat.json | 2 +- .../apm/java/ub20-apt-docker-jboss.json | 2 +- .../apm/java/ub20-apt-docker-tomcat.json | 2 +- .../apm/java/ub20-apt-sysd-tomcat.json | 2 +- .../php-apache-fpm-wordpress-linux2.json | 2 +- .../php-apache-fpm-wordpress-ubuntu18.json | 2 +- .../php-apache-wordpress-linux2.json | 2 +- .../php-apache-wordpress-ubuntu18.json | 2 +- .../php-nginx-fpm-wordpress-linux2.json | 2 +- .../php-nginx-fpm-wordpress-ubuntu18.json | 2 +- .../us-php-apache-fpm-wordpress-ubuntu18.json | 2 +- .../us-php-nginx-fpm-wordpress-linux2.json | 2 +- 29 files changed, 57 insertions(+), 56 deletions(-) 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 ec9fcfb84..e41140fdb 100644 --- a/test/definitions-eu/apm/dotNet/linux/debian10-nginx-aspnetcore.json +++ b/test/definitions-eu/apm/dotNet/linux/debian10-nginx-aspnetcore.json @@ -58,7 +58,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/debian.yml,https://raw.githubusercontent.com/newrelic/open-install-library/main/recipes/newrelic/apm/dotNet/linux-systemd.yml", - "validate_output": "New Relic installation complete" + "validate_output": ".NET Agent\\s+\\(installed\\)" } } ] diff --git a/test/definitions-eu/apm/dotNet/linux/ubuntu20-apache-aspnetcore.json b/test/definitions-eu/apm/dotNet/linux/ubuntu20-apache-aspnetcore.json index b3d16e89c..dc9c86db3 100644 --- a/test/definitions-eu/apm/dotNet/linux/ubuntu20-apache-aspnetcore.json +++ b/test/definitions-eu/apm/dotNet/linux/ubuntu20-apache-aspnetcore.json @@ -57,7 +57,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/ubuntu.yml,https://raw.githubusercontent.com/newrelic/open-install-library/main/recipes/newrelic/apm/dotNet/linux-systemd.yml", - "validate_output": "New Relic installation complete" + "validate_output": ".NET Agent\\s+\\(installed\\)" } } ] diff --git a/test/definitions-eu/apm/dotNet/windows/iis-blank.json b/test/definitions-eu/apm/dotNet/windows/iis-blank.json index ccf63dd8b..876e822f4 100644 --- a/test/definitions-eu/apm/dotNet/windows/iis-blank.json +++ b/test/definitions-eu/apm/dotNet/windows/iis-blank.json @@ -34,7 +34,7 @@ "deploy_script_path": "test/deploy/windows/newrelic-cli/install-recipe/roles", "params": { "recipe_content_url": "https://raw.githubusercontent.com/newrelic/open-install-library/main/recipes/newrelic/infrastructure/windows.yml,https://raw.githubusercontent.com/newrelic/open-install-library/main/recipes/newrelic/apm/dotNet/windows-iis.yml", - "validate_output": "New Relic installation complete" + "validate_output": ".NET Agent\\s+\\(installed\\)" } } ] diff --git a/test/definitions-eu/apm/dotNet/windows/windows2016-iis.json b/test/definitions-eu/apm/dotNet/windows/windows2016-iis.json index 8b5afec14..e1bf194fa 100644 --- a/test/definitions-eu/apm/dotNet/windows/windows2016-iis.json +++ b/test/definitions-eu/apm/dotNet/windows/windows2016-iis.json @@ -44,20 +44,21 @@ "is_core_app": "true" } }], - - "instrumentations": { - "resources": [ - { - "id": "nr_infra", - "resource_ids": ["iiswindows2016"], - "provider": "newrelic", - "source_repository": "https://github.com/newrelic/open-install-library.git", - "deploy_script_path": "test/deploy/windows/newrelic-cli/install/roles", - "params": { - "local_recipes": true - } + + "instrumentations": { + "resources": [ + { + "id": "nr_infra", + "resource_ids": ["iiswindows2016"], + "provider": "newrelic", + "source_repository": "https://github.com/newrelic/open-install-library.git", + "deploy_script_path": "test/deploy/windows/newrelic-cli/install-recipe/roles", + "params": { + "recipe_content_url": "https://raw.githubusercontent.com/newrelic/open-install-library/main/recipes/newrelic/infrastructure/windows.yml,https://raw.githubusercontent.com/newrelic/open-install-library/main/recipes/newrelic/apm/dotNet/windows-iis.yml", + "validate_output": ".NET Agent\\s+\\(installed\\)" } - ] - } + } + ] + } } \ No newline at end of file diff --git a/test/definitions-eu/apm/dotNet/windows/windows2019-core-only-iis.json b/test/definitions-eu/apm/dotNet/windows/windows2019-core-only-iis.json index 3c6abc4f9..b18ecaab6 100644 --- a/test/definitions-eu/apm/dotNet/windows/windows2019-core-only-iis.json +++ b/test/definitions-eu/apm/dotNet/windows/windows2019-core-only-iis.json @@ -33,20 +33,20 @@ "is_core_app": "true" } }], - - "instrumentations": { - "resources": [ - { - "id": "nr_infra", - "resource_ids": ["iiswindows2019"], - "provider": "newrelic", - "source_repository": "https://github.com/newrelic/open-install-library.git", - "deploy_script_path": "test/deploy/windows/newrelic-cli/install/roles", - "params": { - "local_recipes": true - } - } - ] - } + + "instrumentations": { + "resources": [ + { + "id": "nr_infra", + "resource_ids": ["iiswindows2019"], + "provider": "newrelic", + "source_repository": "https://github.com/newrelic/open-install-library.git", + "deploy_script_path": "test/deploy/windows/newrelic-cli/install/roles", + "params": { + "recipe_content_url": "https://raw.githubusercontent.com/newrelic/open-install-library/main/recipes/newrelic/infrastructure/windows.yml,https://raw.githubusercontent.com/newrelic/open-install-library/main/recipes/newrelic/apm/dotNet/windows-iis.yml", + "validate_output": ".NET Agent\\s+\\(installed\\)" } + } + ] + } } \ No newline at end of file diff --git a/test/definitions-eu/apm/dotNet/windows/windows2019-iis.json b/test/definitions-eu/apm/dotNet/windows/windows2019-iis.json index dcb8f094d..b10bc2eeb 100644 --- a/test/definitions-eu/apm/dotNet/windows/windows2019-iis.json +++ b/test/definitions-eu/apm/dotNet/windows/windows2019-iis.json @@ -55,7 +55,7 @@ "deploy_script_path": "test/deploy/windows/newrelic-cli/install-recipe/roles", "params": { "recipe_content_url": "https://raw.githubusercontent.com/newrelic/open-install-library/main/recipes/newrelic/infrastructure/windows.yml,https://raw.githubusercontent.com/newrelic/open-install-library/main/recipes/newrelic/apm/dotNet/windows-iis.yml", - "validate_output": "New Relic installation complete" + "validate_output": ".NET Agent\\s+\\(installed\\)" } } ] diff --git a/test/definitions-eu/apm/java/deb10-supd-javatron.json b/test/definitions-eu/apm/java/deb10-supd-javatron.json index 63eea9551..2c6358166 100644 --- a/test/definitions-eu/apm/java/deb10-supd-javatron.json +++ b/test/definitions-eu/apm/java/deb10-supd-javatron.json @@ -53,7 +53,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/debian.yml,https://raw.githubusercontent.com/newrelic/open-install-library/main/recipes/newrelic/apm/java/linux.yml", - "validate_output": "New Relic installation complete" + "validate_output": "Java Agent\\s+\\(installed\\)" } }, { diff --git a/test/definitions-eu/apm/java/deb10-sysd-custom-sh.json b/test/definitions-eu/apm/java/deb10-sysd-custom-sh.json index ffc7ea394..894424a4e 100644 --- a/test/definitions-eu/apm/java/deb10-sysd-custom-sh.json +++ b/test/definitions-eu/apm/java/deb10-sysd-custom-sh.json @@ -42,7 +42,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/debian.yml,https://raw.githubusercontent.com/newrelic/open-install-library/main/recipes/newrelic/apm/java/linux.yml", - "validate_output": "New Relic installation complete" + "validate_output": "Java Agent\\s+\\(installed\\)" } }, { diff --git a/test/definitions-eu/apm/java/deb10-sysd-tomcat-cmd.json b/test/definitions-eu/apm/java/deb10-sysd-tomcat-cmd.json index a2a89057b..a84e71c0c 100644 --- a/test/definitions-eu/apm/java/deb10-sysd-tomcat-cmd.json +++ b/test/definitions-eu/apm/java/deb10-sysd-tomcat-cmd.json @@ -42,7 +42,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/debian.yml,https://raw.githubusercontent.com/newrelic/open-install-library/main/recipes/newrelic/apm/java/linux.yml", - "validate_output": "New Relic installation complete" + "validate_output": "Java Agent\\s+\\(installed\\)" } }, { diff --git a/test/definitions-eu/apm/java/deb10-sysd-tomcat-sh.json b/test/definitions-eu/apm/java/deb10-sysd-tomcat-sh.json index 05ed3293d..dcddf9e23 100644 --- a/test/definitions-eu/apm/java/deb10-sysd-tomcat-sh.json +++ b/test/definitions-eu/apm/java/deb10-sysd-tomcat-sh.json @@ -42,7 +42,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/debian.yml,https://raw.githubusercontent.com/newrelic/open-install-library/main/recipes/newrelic/apm/java/linux.yml", - "validate_output": "New Relic installation complete" + "validate_output": "Java Agent\\s+\\(installed\\)" } }, { diff --git a/test/definitions-eu/apm/java/deb11-apt-sysd-tomcat.json b/test/definitions-eu/apm/java/deb11-apt-sysd-tomcat.json index 61bf5371e..157c3fa11 100644 --- a/test/definitions-eu/apm/java/deb11-apt-sysd-tomcat.json +++ b/test/definitions-eu/apm/java/deb11-apt-sysd-tomcat.json @@ -38,7 +38,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/debian.yml,https://raw.githubusercontent.com/newrelic/open-install-library/main/recipes/newrelic/apm/java/linux.yml", - "validate_output": "New Relic installation complete" + "validate_output": "Java Agent\\s+\\(installed\\)" } }, { diff --git a/test/definitions-eu/apm/java/deb11-sysd-jboss.json b/test/definitions-eu/apm/java/deb11-sysd-jboss.json index 40d5af1f8..40dc1f9f4 100644 --- a/test/definitions-eu/apm/java/deb11-sysd-jboss.json +++ b/test/definitions-eu/apm/java/deb11-sysd-jboss.json @@ -38,7 +38,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/debian.yml,https://raw.githubusercontent.com/newrelic/open-install-library/main/recipes/newrelic/apm/java/linux.yml", - "validate_output": "New Relic installation complete" + "validate_output": "Java Agent\\s+\\(installed\\)" } }, { diff --git a/test/definitions-eu/apm/java/rhl2-supd-javatron.json b/test/definitions-eu/apm/java/rhl2-supd-javatron.json index 59ad75c72..93c6d01d7 100644 --- a/test/definitions-eu/apm/java/rhl2-supd-javatron.json +++ b/test/definitions-eu/apm/java/rhl2-supd-javatron.json @@ -52,7 +52,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/awslinux.yml,https://raw.githubusercontent.com/newrelic/open-install-library/main/recipes/newrelic/apm/java/linux.yml", - "validate_output": "New Relic installation complete" + "validate_output": "Java Agent\\s+\\(installed\\)" } }, { diff --git a/test/definitions-eu/apm/java/rhl2-sysd-custom-sh.json b/test/definitions-eu/apm/java/rhl2-sysd-custom-sh.json index 41e1d0831..be2911beb 100644 --- a/test/definitions-eu/apm/java/rhl2-sysd-custom-sh.json +++ b/test/definitions-eu/apm/java/rhl2-sysd-custom-sh.json @@ -38,7 +38,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/awslinux.yml,https://raw.githubusercontent.com/newrelic/open-install-library/main/recipes/newrelic/apm/java/linux.yml", - "validate_output": "New Relic installation complete" + "validate_output": "Java Agent\\s+\\(installed\\)" } }, { diff --git a/test/definitions-eu/apm/java/rhl2-sysd-tomcat-cmd.json b/test/definitions-eu/apm/java/rhl2-sysd-tomcat-cmd.json index 9ebeb0442..b6da877a7 100644 --- a/test/definitions-eu/apm/java/rhl2-sysd-tomcat-cmd.json +++ b/test/definitions-eu/apm/java/rhl2-sysd-tomcat-cmd.json @@ -38,7 +38,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/awslinux.yml,https://raw.githubusercontent.com/newrelic/open-install-library/main/recipes/newrelic/apm/java/linux.yml", - "validate_output": "New Relic installation complete" + "validate_output": "Java Agent\\s+\\(installed\\)" } }, { diff --git a/test/definitions-eu/apm/java/rhl2-sysd-tomcat-sh.json b/test/definitions-eu/apm/java/rhl2-sysd-tomcat-sh.json index 18003e550..147286771 100644 --- a/test/definitions-eu/apm/java/rhl2-sysd-tomcat-sh.json +++ b/test/definitions-eu/apm/java/rhl2-sysd-tomcat-sh.json @@ -38,7 +38,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/awslinux.yml,https://raw.githubusercontent.com/newrelic/open-install-library/main/recipes/newrelic/apm/java/linux.yml", - "validate_output": "New Relic installation complete" + "validate_output": "Java Agent\\s+\\(installed\\)" } }, { diff --git a/test/definitions-eu/apm/java/rhl2-yum-docker-jboss.json b/test/definitions-eu/apm/java/rhl2-yum-docker-jboss.json index 0a113fa1d..70e8911d5 100644 --- a/test/definitions-eu/apm/java/rhl2-yum-docker-jboss.json +++ b/test/definitions-eu/apm/java/rhl2-yum-docker-jboss.json @@ -47,7 +47,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/awslinux.yml,https://raw.githubusercontent.com/newrelic/open-install-library/main/recipes/newrelic/apm/java/linux.yml", - "validate_output": "New Relic installation complete" + "validate_output": "Java Agent\\s+\\(installed\\)" } }, { diff --git a/test/definitions-eu/apm/java/rhl2-yum-sysd-tomcat.json b/test/definitions-eu/apm/java/rhl2-yum-sysd-tomcat.json index e5c4752b9..1d2554f7a 100644 --- a/test/definitions-eu/apm/java/rhl2-yum-sysd-tomcat.json +++ b/test/definitions-eu/apm/java/rhl2-yum-sysd-tomcat.json @@ -38,7 +38,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/awslinux.yml,https://raw.githubusercontent.com/newrelic/open-install-library/main/recipes/newrelic/apm/java/linux.yml", - "validate_output": "New Relic installation complete" + "validate_output": "Java Agent\\s+\\(installed\\)" } }, { diff --git a/test/definitions-eu/apm/java/ub20-apt-docker-jboss.json b/test/definitions-eu/apm/java/ub20-apt-docker-jboss.json index e6837cf36..b306dade7 100644 --- a/test/definitions-eu/apm/java/ub20-apt-docker-jboss.json +++ b/test/definitions-eu/apm/java/ub20-apt-docker-jboss.json @@ -45,7 +45,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/ubuntu.yml,https://raw.githubusercontent.com/newrelic/open-install-library/main/recipes/newrelic/apm/java/linux.yml", - "validate_output": "New Relic installation complete" + "validate_output": "Java Agent\\s+\\(installed\\)" } }, { diff --git a/test/definitions-eu/apm/java/ub20-apt-docker-tomcat.json b/test/definitions-eu/apm/java/ub20-apt-docker-tomcat.json index 3bf6c9b27..b7aa70cea 100644 --- a/test/definitions-eu/apm/java/ub20-apt-docker-tomcat.json +++ b/test/definitions-eu/apm/java/ub20-apt-docker-tomcat.json @@ -41,7 +41,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/ubuntu.yml,https://raw.githubusercontent.com/newrelic/open-install-library/main/recipes/newrelic/apm/java/linux.yml", - "validate_output": "New Relic installation complete" + "validate_output": "Java Agent\\s+\\(installed\\)" } }, { diff --git a/test/definitions-eu/apm/java/ub20-apt-sysd-tomcat.json b/test/definitions-eu/apm/java/ub20-apt-sysd-tomcat.json index 8a079dad2..b1a9eb1a0 100644 --- a/test/definitions-eu/apm/java/ub20-apt-sysd-tomcat.json +++ b/test/definitions-eu/apm/java/ub20-apt-sysd-tomcat.json @@ -38,7 +38,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/ubuntu.yml,https://raw.githubusercontent.com/newrelic/open-install-library/main/recipes/newrelic/apm/java/linux.yml", - "validate_output": "New Relic installation complete" + "validate_output": "Java Agent\\s+\\(installed\\)" } }, { diff --git a/test/definitions-eu/apm/php-agent/php-apache-fpm-wordpress-linux2.json b/test/definitions-eu/apm/php-agent/php-apache-fpm-wordpress-linux2.json index 5282e4109..910bcb860 100644 --- a/test/definitions-eu/apm/php-agent/php-apache-fpm-wordpress-linux2.json +++ b/test/definitions-eu/apm/php-agent/php-apache-fpm-wordpress-linux2.json @@ -38,7 +38,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/awslinux.yml,https://raw.githubusercontent.com/newrelic/open-install-library/main/recipes/newrelic/apm/php/redhat.yml", - "validate_output": "New Relic installation complete" + "validate_output": "PHP Agent\\s+\\(installed\\)" } } ] diff --git a/test/definitions-eu/apm/php-agent/php-apache-fpm-wordpress-ubuntu18.json b/test/definitions-eu/apm/php-agent/php-apache-fpm-wordpress-ubuntu18.json index d70d3cb4f..2d54cf172 100644 --- a/test/definitions-eu/apm/php-agent/php-apache-fpm-wordpress-ubuntu18.json +++ b/test/definitions-eu/apm/php-agent/php-apache-fpm-wordpress-ubuntu18.json @@ -38,7 +38,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/ubuntu.yml,https://raw.githubusercontent.com/newrelic/open-install-library/main/recipes/newrelic/apm/php/debian.yml", - "validate_output": "New Relic installation complete" + "validate_output": "PHP Agent\\s+\\(installed\\)" } } ] diff --git a/test/definitions-eu/apm/php-agent/php-apache-wordpress-linux2.json b/test/definitions-eu/apm/php-agent/php-apache-wordpress-linux2.json index 1f4b0bf84..efc9acabb 100644 --- a/test/definitions-eu/apm/php-agent/php-apache-wordpress-linux2.json +++ b/test/definitions-eu/apm/php-agent/php-apache-wordpress-linux2.json @@ -38,7 +38,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/awslinux.yml,https://raw.githubusercontent.com/newrelic/open-install-library/main/recipes/newrelic/apm/php/redhat.yml", - "validate_output": "New Relic installation complete" + "validate_output": "PHP Agent\\s+\\(installed\\)" } } ] diff --git a/test/definitions-eu/apm/php-agent/php-apache-wordpress-ubuntu18.json b/test/definitions-eu/apm/php-agent/php-apache-wordpress-ubuntu18.json index 2cf9d0e26..5541f23c8 100644 --- a/test/definitions-eu/apm/php-agent/php-apache-wordpress-ubuntu18.json +++ b/test/definitions-eu/apm/php-agent/php-apache-wordpress-ubuntu18.json @@ -38,7 +38,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/ubuntu.yml,https://raw.githubusercontent.com/newrelic/open-install-library/main/recipes/newrelic/apm/php/debian.yml", - "validate_output": "New Relic installation complete" + "validate_output": "PHP Agent\\s+\\(installed\\)" } } ] diff --git a/test/definitions-eu/apm/php-agent/php-nginx-fpm-wordpress-linux2.json b/test/definitions-eu/apm/php-agent/php-nginx-fpm-wordpress-linux2.json index aa9e50027..a384815f2 100644 --- a/test/definitions-eu/apm/php-agent/php-nginx-fpm-wordpress-linux2.json +++ b/test/definitions-eu/apm/php-agent/php-nginx-fpm-wordpress-linux2.json @@ -38,7 +38,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/awslinux.yml,https://raw.githubusercontent.com/newrelic/open-install-library/main/recipes/newrelic/apm/php/redhat.yml", - "validate_output": "New Relic installation complete" + "validate_output": "PHP Agent\\s+\\(installed\\)" } } ] diff --git a/test/definitions-eu/apm/php-agent/php-nginx-fpm-wordpress-ubuntu18.json b/test/definitions-eu/apm/php-agent/php-nginx-fpm-wordpress-ubuntu18.json index babbc762c..e65e7fc36 100644 --- a/test/definitions-eu/apm/php-agent/php-nginx-fpm-wordpress-ubuntu18.json +++ b/test/definitions-eu/apm/php-agent/php-nginx-fpm-wordpress-ubuntu18.json @@ -38,7 +38,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/ubuntu.yml,https://raw.githubusercontent.com/newrelic/open-install-library/main/recipes/newrelic/apm/php/debian.yml", - "validate_output": "New Relic installation complete" + "validate_output": "PHP Agent\\s+\\(installed\\)" } } ] diff --git a/test/definitions/apm/us-php-apache-fpm-wordpress-ubuntu18.json b/test/definitions/apm/us-php-apache-fpm-wordpress-ubuntu18.json index d70d3cb4f..2d54cf172 100644 --- a/test/definitions/apm/us-php-apache-fpm-wordpress-ubuntu18.json +++ b/test/definitions/apm/us-php-apache-fpm-wordpress-ubuntu18.json @@ -38,7 +38,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/ubuntu.yml,https://raw.githubusercontent.com/newrelic/open-install-library/main/recipes/newrelic/apm/php/debian.yml", - "validate_output": "New Relic installation complete" + "validate_output": "PHP Agent\\s+\\(installed\\)" } } ] diff --git a/test/definitions/apm/us-php-nginx-fpm-wordpress-linux2.json b/test/definitions/apm/us-php-nginx-fpm-wordpress-linux2.json index aa9e50027..a384815f2 100644 --- a/test/definitions/apm/us-php-nginx-fpm-wordpress-linux2.json +++ b/test/definitions/apm/us-php-nginx-fpm-wordpress-linux2.json @@ -38,7 +38,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/awslinux.yml,https://raw.githubusercontent.com/newrelic/open-install-library/main/recipes/newrelic/apm/php/redhat.yml", - "validate_output": "New Relic installation complete" + "validate_output": "PHP Agent\\s+\\(installed\\)" } } ]