Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(demo_deployer): Updated specific regex in validate_output's param #1135

Merged
merged 1 commit into from
Dec 4, 2024
Merged

fix(demo_deployer): Updated specific regex in validate_output's param #1135

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion test/definitions-eu/apm/dotNet/linux/debian10-nginx-aspnetcore.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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\\)"
}
}
]
Expand Down
2 changes: 1 addition & 1 deletion test/definitions-eu/apm/dotNet/linux/ubuntu20-apache-aspnetcore.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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\\)"
}
}
]
Expand Down
2 changes: 1 addition & 1 deletion test/definitions-eu/apm/dotNet/windows/iis-blank.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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\\)"
}
}
]
Expand Down
29 changes: 15 additions & 14 deletions test/definitions-eu/apm/dotNet/windows/windows2016-iis.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
shashank-reddy-nr marked this conversation as resolved.
Show resolved Hide resolved
"validate_output": ".NET Agent\\s+\\(installed\\)"
}
]
}
}
]
}
}

30 changes: 15 additions & 15 deletions test/definitions-eu/apm/dotNet/windows/windows2019-core-only-iis.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
shashank-reddy-nr marked this conversation as resolved.
Show resolved Hide resolved
"validate_output": ".NET Agent\\s+\\(installed\\)" }
}
]
}
}

2 changes: 1 addition & 1 deletion test/definitions-eu/apm/dotNet/windows/windows2019-iis.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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\\)"
}
}
]
Expand Down
2 changes: 1 addition & 1 deletion test/definitions-eu/apm/java/deb10-supd-javatron.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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\\)"
}
},
{
Expand Down
2 changes: 1 addition & 1 deletion test/definitions-eu/apm/java/deb10-sysd-custom-sh.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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\\)"
}
},
{
Expand Down
2 changes: 1 addition & 1 deletion test/definitions-eu/apm/java/deb10-sysd-tomcat-cmd.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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\\)"
}
},
{
Expand Down
2 changes: 1 addition & 1 deletion test/definitions-eu/apm/java/deb10-sysd-tomcat-sh.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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\\)"
}
},
{
Expand Down
2 changes: 1 addition & 1 deletion test/definitions-eu/apm/java/deb11-apt-sysd-tomcat.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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\\)"
}
},
{
Expand Down
2 changes: 1 addition & 1 deletion test/definitions-eu/apm/java/deb11-sysd-jboss.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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\\)"
}
},
{
Expand Down
2 changes: 1 addition & 1 deletion test/definitions-eu/apm/java/rhl2-supd-javatron.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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\\)"
}
},
{
Expand Down
2 changes: 1 addition & 1 deletion test/definitions-eu/apm/java/rhl2-sysd-custom-sh.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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\\)"
}
},
{
Expand Down
2 changes: 1 addition & 1 deletion test/definitions-eu/apm/java/rhl2-sysd-tomcat-cmd.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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\\)"
}
},
{
Expand Down
2 changes: 1 addition & 1 deletion test/definitions-eu/apm/java/rhl2-sysd-tomcat-sh.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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\\)"
}
},
{
Expand Down
2 changes: 1 addition & 1 deletion test/definitions-eu/apm/java/rhl2-yum-docker-jboss.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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\\)"
}
},
{
Expand Down
2 changes: 1 addition & 1 deletion test/definitions-eu/apm/java/rhl2-yum-sysd-tomcat.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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\\)"
}
},
{
Expand Down
2 changes: 1 addition & 1 deletion test/definitions-eu/apm/java/ub20-apt-docker-jboss.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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\\)"
}
},
{
Expand Down
2 changes: 1 addition & 1 deletion test/definitions-eu/apm/java/ub20-apt-docker-tomcat.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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\\)"
}
},
{
Expand Down
2 changes: 1 addition & 1 deletion test/definitions-eu/apm/java/ub20-apt-sysd-tomcat.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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\\)"
}
},
{
Expand Down
2 changes: 1 addition & 1 deletion test/definitions-eu/apm/php-agent/php-apache-fpm-wordpress-linux2.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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\\)"
}
}
]
Expand Down
2 changes: 1 addition & 1 deletion test/definitions-eu/apm/php-agent/php-apache-fpm-wordpress-ubuntu18.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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\\)"
}
}
]
Expand Down
2 changes: 1 addition & 1 deletion test/definitions-eu/apm/php-agent/php-apache-wordpress-linux2.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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\\)"
}
}
]
Expand Down
2 changes: 1 addition & 1 deletion test/definitions-eu/apm/php-agent/php-apache-wordpress-ubuntu18.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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\\)"
}
}
]
Expand Down
2 changes: 1 addition & 1 deletion test/definitions-eu/apm/php-agent/php-nginx-fpm-wordpress-linux2.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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\\)"
}
}
]
Expand Down
2 changes: 1 addition & 1 deletion test/definitions-eu/apm/php-agent/php-nginx-fpm-wordpress-ubuntu18.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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\\)"
}
}
]
Expand Down
2 changes: 1 addition & 1 deletion test/definitions/apm/us-php-apache-fpm-wordpress-ubuntu18.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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\\)"
}
}
]
Expand Down
2 changes: 1 addition & 1 deletion test/definitions/apm/us-php-nginx-fpm-wordpress-linux2.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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\\)"
}
}
]
Expand Down
Loading