Skip to content

Commit

Permalink
check for infra/logs installed instead of install complete
Browse files Browse the repository at this point in the history 
validate infra agent installed

validate logs installed

validate infra agent installed

fix version of ubuntu hirsute (eol)

increase centos8 instance size (OOM err)

delete suse 12.4 (latest ami has incompatible python3)

fix syntax for logs-integration unsupported

correct unsupported logs validation

revert ohi validation formatting

revert mssql ohi formatting change
  • Loading branch information
@rthorn-nr
rthorn-nr committed Dec 12, 2022
1 parent 92fbfc3 commit f199698
Show file tree
Hide file tree
Showing 49 changed files with 56 additions and 83 deletions.
2 changes: 1 addition & 1 deletion test/definitions-eu/infra-agent/debians/debian10-infra.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,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",
"validate_output": "New Relic installation complete"
"validate_output": "Infrastructure Agent\\s+\\(installed\\)"
}
}
]
Expand Down
2 changes: 1 addition & 1 deletion test/definitions-eu/infra-agent/debians/debian10arm64-infra.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,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",
"validate_output": "New Relic installation complete"
"validate_output": "Infrastructure Agent\\s+\\(installed\\)"
}
}
]
Expand Down
2 changes: 1 addition & 1 deletion test/definitions-eu/infra-agent/debians/debian11-infra.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,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",
"validate_output": "New Relic installation complete"
"validate_output": "Infrastructure Agent\\s+\\(installed\\)"
}
}
]
Expand Down
2 changes: 1 addition & 1 deletion test/definitions-eu/infra-agent/debians/debian9-infra.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
"deploy_script_path": "test/deploy/linux/newrelic-cli/install/roles",
"params": {
"local_recipes": true,
"validate_output": "New Relic installation complete"
"validate_output": "Infrastructure Agent\\s+\\(installed\\)"
}
}
]
Expand Down
2 changes: 1 addition & 1 deletion test/definitions-eu/infra-agent/debians/ubuntu16-infra.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
"deploy_script_path": "test/deploy/linux/newrelic-cli/install/roles",
"params": {
"local_recipes": true,
"validate_output": "New Relic installation complete"
"validate_output": "Infrastructure Agent\\s+\\(installed\\)"
}
}
]
Expand Down
2 changes: 1 addition & 1 deletion test/definitions-eu/infra-agent/debians/ubuntu18-infra.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
"deploy_script_path": "test/deploy/linux/newrelic-cli/install/roles",
"params": {
"local_recipes": true,
"validate_output": "New Relic installation complete"
"validate_output": "Infrastructure Agent\\s+\\(installed\\)"
}
}
]
Expand Down
2 changes: 1 addition & 1 deletion test/definitions-eu/infra-agent/debians/ubuntu20-infra.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,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",
"validate_output": "New Relic installation complete"
"validate_output": "Infrastructure Agent\\s+\\(installed\\)"
}
}
]
Expand Down
2 changes: 1 addition & 1 deletion test/definitions-eu/infra-agent/debians/ubuntu20arm64-infra.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,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",
"validate_output": "New Relic installation complete"
"validate_output": "Infrastructure Agent\\s+\\(installed\\)"
}
}
]
Expand Down
2 changes: 1 addition & 1 deletion test/definitions-eu/infra-agent/debians/ubuntu20x10arm64-infra.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,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",
"validate_output": "New Relic installation complete"
"validate_output": "Infrastructure Agent\\s+\\(installed\\)"
}
}
]
Expand Down
4 changes: 2 additions & 2 deletions test/definitions-eu/infra-agent/debians/ubuntu21x04hirsute-infra.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"provider": "aws",
"type": "ec2",
"size": "t3.nano",
"ami_name": "ubuntu-minimal/images-testing/hvm-ssd/ubuntu-hirsute-daily-amd64-minimal-????????",
"ami_name": "ubuntu-minimal/images/hvm-ssd/ubuntu-hirsute-21.04-amd64-minimal-20220119",
"user_name": "ubuntu"
}],

Expand All @@ -25,7 +25,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",
"validate_output": "New Relic installation complete"
"validate_output": "Infrastructure Agent\\s+\\(installed\\)"
}
}
]
Expand Down
2 changes: 1 addition & 1 deletion test/definitions-eu/infra-agent/rhel/awslinux-infra.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,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",
"validate_output": "New Relic installation complete"
"validate_output": "Infrastructure Agent\\s+\\(installed\\)"
}
}
]
Expand Down
2 changes: 1 addition & 1 deletion test/definitions-eu/infra-agent/rhel/awslinuxarm64-infra.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,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",
"validate_output": "New Relic installation complete"
"validate_output": "Infrastructure Agent\\s+\\(installed\\)"
}
}
]
Expand Down
2 changes: 1 addition & 1 deletion test/definitions-eu/infra-agent/rhel/centos7-infra.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
"deploy_script_path": "test/deploy/linux/newrelic-cli/install/roles",
"params": {
"local_recipes": true,
"validate_output": "New Relic installation complete"
"validate_output": "Infrastructure Agent\\s+\\(installed\\)"
}
}
]
Expand Down
2 changes: 1 addition & 1 deletion test/definitions-eu/infra-agent/rhel/centos8-infra.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,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/centos_rhel.yml",
"validate_output": "New Relic installation complete"
"validate_output": "Infrastructure Agent\\s+\\(installed\\)"
}
}
]
Expand Down
4 changes: 2 additions & 2 deletions test/definitions-eu/infra-agent/rhel/centos8arm64-infra.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"id": "host1",
"provider": "aws",
"type": "ec2",
"size": "t4g.micro",
"size": "t4g.small",
"ami_name": "ProComputers CentOS-8-stream-arm64-Minimal-8GiB-HVM-????????_*",
"user_name": "centos"
}],
Expand All @@ -25,7 +25,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/centos_rhel.yml",
"validate_output": "New Relic installation complete"
"validate_output": "Infrastructure Agent\\s+\\(installed\\)"
}
}
]
Expand Down
2 changes: 1 addition & 1 deletion test/definitions-eu/infra-agent/rhel/oracle8-infra.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,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/centos_rhel.yml",
"validate_output": "New Relic installation complete"
"validate_output": "Infrastructure Agent\\s+\\(installed\\)"
}
}
]
Expand Down
2 changes: 1 addition & 1 deletion test/definitions-eu/infra-agent/rhel/redhat7-infra.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,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/centos_rhel.yml",
"validate_output": "New Relic installation complete"
"validate_output": "Infrastructure Agent\\s+\\(installed\\)"
}
}
]
Expand Down
2 changes: 1 addition & 1 deletion test/definitions-eu/infra-agent/rhel/redhat8-infra.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
"deploy_script_path": "test/deploy/linux/newrelic-cli/install/roles",
"params": {
"local_recipes": true,
"validate_output": "New Relic installation complete"
"validate_output": "Infrastructure Agent\\s+\\(installed\\)"
}
}
]
Expand Down
2 changes: 1 addition & 1 deletion test/definitions-eu/infra-agent/rhel/redhat8arm64-infra.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,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/centos_rhel.yml",
"validate_output": "New Relic installation complete"
"validate_output": "Infrastructure Agent\\s+\\(installed\\)"
}
}
]
Expand Down
32 changes: 0 additions & 32 deletions test/definitions-eu/infra-agent/suse/suse124-infra.json
View file

This file was deleted.

2 changes: 1 addition & 1 deletion test/definitions-eu/infra-agent/suse/suse125-infra.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,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/suse.yml",
"validate_output": "New Relic installation complete"
"validate_output": "Infrastructure Agent\\s+\\(installed\\)"
}
}
]
Expand Down
2 changes: 1 addition & 1 deletion test/definitions-eu/infra-agent/suse/suse152-infra.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,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/suse.yml",
"validate_output": "New Relic installation complete"
"validate_output": "Infrastructure Agent\\s+\\(installed\\)"
}
}
]
Expand Down
2 changes: 1 addition & 1 deletion test/definitions-eu/infra-agent/windows/windows2016.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,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",
"validate_output": "New Relic installation complete"
"validate_output": "Infrastructure Agent\\s+\\(installed\\)"
}
}
]
Expand Down
2 changes: 1 addition & 1 deletion test/definitions-eu/logging/debian/debian10-arm64-logs.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,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/infrastructure/logs/linux-logs.yml",
"validate_output": "New Relic installation complete"
"validate_output": "Logs Integration\\s+\\(installed\\)"
}
}
]
Expand Down
2 changes: 1 addition & 1 deletion test/definitions-eu/logging/debian/ubuntu20-arm64-logs.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,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/infrastructure/logs/linux-logs.yml",
"validate_output": "New Relic installation complete"
"validate_output": "Logs Integration\\s+\\(installed\\)"
}
}
]
Expand Down
2 changes: 1 addition & 1 deletion test/definitions-eu/logging/rhel/amazonlinux2-arm64-logs.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,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/infrastructure/logs/linux-logs.yml",
"validate_output": "New Relic installation complete"
"validate_output": "Logs Integration\\s+\\(installed\\)"
}
}
]
Expand Down
4 changes: 2 additions & 2 deletions test/definitions-eu/logging/rhel/centos8-arm64-logs.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"id": "logfwd-centos8-arm64",
"provider": "aws",
"type": "ec2",
"size": "t4g.micro",
"size": "t4g.small",
"ami_name": "ProComputers CentOS-8-stream-arm64-Minimal-8GiB-HVM-????????_*",
"user_name": "centos"
}],
Expand All @@ -25,7 +25,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/centos_rhel.yml,https://raw.githubusercontent.com/newrelic/open-install-library/main/recipes/newrelic/infrastructure/logs/linux-logs.yml",
"validate_output": "New Relic installation complete"
"validate_output": "Logs Integration\\s+\\(installed\\)"
}
}
]
Expand Down
2 changes: 1 addition & 1 deletion test/definitions-eu/smoke/awslinux2-infra.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,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",
"validate_output": "New Relic installation complete"
"validate_output": "Infrastructure Agent\\s+\\(installed\\)"
}
}
]
Expand Down
2 changes: 1 addition & 1 deletion test/definitions-eu/smoke/awslinuxarm64-infra.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,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",
"validate_output": "New Relic installation complete"
"validate_output": "Infrastructure Agent\\s+\\(installed\\)"
}
}
]
Expand Down
3 changes: 2 additions & 1 deletion test/definitions-eu/smoke/debian10-infra.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,8 @@
"source_repository": "https://github.com/newrelic/open-install-library",
"deploy_script_path": "test/deploy/linux/newrelic-cli/install/roles",
"params": {
"local_recipes": true
"local_recipes": true,
"validate_output": "Infrastructure Agent\\s+\\(installed\\)"
}
}
]
Expand Down
3 changes: 2 additions & 1 deletion test/definitions-eu/smoke/ubuntu20-infra.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,8 @@
"source_repository": "https://github.com/newrelic/open-install-library",
"deploy_script_path": "test/deploy/linux/newrelic-cli/install/roles",
"params": {
"local_recipes": true
"local_recipes": true,
"validate_output": "Infrastructure Agent\\s+\\(installed\\)"
}
}
]
Expand Down
3 changes: 2 additions & 1 deletion test/definitions-eu/smoke/windows2019.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,8 @@
"source_repository": "https://github.com/newrelic/open-install-library",
"deploy_script_path": "test/deploy/windows/newrelic-cli/install/roles",
"params": {
"local_recipes": true
"local_recipes": true,
"validate_output": "Infrastructure Agent\\s+\\(installed\\)"
}
}
]
Expand Down
2 changes: 1 addition & 1 deletion test/definitions/infra-agent/RHEL9-infra.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
"source_repository": "https://github.com/newrelic/open-install-library",
"deploy_script_path": "test/deploy/linux/newrelic-cli/install/roles",
"params": {
"validate_output": "(infrastructure-agent-installer|Infrastructure Agent)\\s+\\(installed\\)",
"validate_output": "Infrastructure Agent\\s+\\(installed\\)",
"local_recipes": true
}
}
Expand Down
2 changes: 1 addition & 1 deletion test/definitions/infra-agent/amazonlinux2022-infra.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
"source_repository": "https://github.com/newrelic/open-install-library",
"deploy_script_path": "test/deploy/linux/newrelic-cli/install/roles",
"params": {
"validate_output": "(infrastructure-agent-installer|Infrastructure Agent)\\s+\\(installed\\)",
"validate_output": "Infrastructure Agent\\s+\\(installed\\)",
"local_recipes": true
}
}
Expand Down
2 changes: 1 addition & 1 deletion test/definitions/infra-agent/ubuntu21-infra-unsupported.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
"source_repository": "https://github.com/newrelic/open-install-library",
"deploy_script_path": "test/deploy/linux/newrelic-cli/install/roles",
"params": {
"validate_output": "(infrastructure-agent-installer|Infrastructure Agent)\\s+\\(unsupported\\)",
"validate_output": "Infrastructure Agent\\s+\\(unsupported\\)",
"local_recipes": true
}
}
Expand Down
2 changes: 1 addition & 1 deletion test/definitions/infra-agent/ubuntu22-infra.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
"source_repository": "https://github.com/newrelic/open-install-library",
"deploy_script_path": "test/deploy/linux/newrelic-cli/install/roles",
"params": {
"validate_output": "(infrastructure-agent-installer|Infrastructure Agent)\\s+\\(installed\\)",
"validate_output": "Infrastructure Agent\\s+\\(installed\\)",
"local_recipes": true
}
}
Expand Down
2 changes: 1 addition & 1 deletion test/definitions/logging/amazonlinux2-logs.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
"deploy_script_path": "test/deploy/linux/newrelic-cli/install/roles",
"params": {
"newrelic_cli_option": "-n logs-integration",
"validate_output": "(logs-integration|Logs Integration)\\s+\\(installed\\)",
"validate_output": "Logs Integration\\s+\\(installed\\)",
"local_recipes": true
}
}
Expand Down
2 changes: 1 addition & 1 deletion test/definitions/logging/amazonlinux2018-logs-unsupported.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
"deploy_script_path": "test/deploy/linux/newrelic-cli/install/roles",
"params": {
"newrelic_cli_option": "-n logs-integration",
"validate_output": "(logs-integration|Logs Integration)\\s+\\(unsupported\\)",
"validate_output": "logs-integration\\s+\\(unsupported\\)",
"local_recipes": true
}
}
Expand Down
Loading

0 comments on commit f199698

Please sign in to comment.