Skip to content

Commit 3459db4

Browse files
rthorn-nrrthorn-nr
authored
Fix nonregression tests (#982)
* chore(e2e): Update ubuntu 16 AMIs * chore(e2e): Fix ubuntu 16 host collisions * chore(e2e): Fix invalid resource ID * chore(e2e): Rename ubuntu16 resource ids * chore(e2e): Update manual ubuntu16 AMI * chore(e2e): Avoid id collision
1 parent fcabf76 commit 3459db4

File tree

8 files changed

+151
-138
lines changed

8 files changed

+151
-138
lines changed

‎test/definitions-eu/apm/java/deb10-sysd-jboss.json‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
},
88
"resources": [
99
{
10-
"id": "jboss",
10+
"id": "deb10-jboss",
1111
"provider": "aws",
1212
"type": "ec2",
1313
"size": "t3.micro",
@@ -21,15 +21,17 @@
2121
"source_repository": "https://github.com/newrelic/open-install-library.git",
2222
"deploy_script_path": "test/deploy/linux/jboss/systemd/install/linux/roles",
2323
"port": 6001,
24-
"destinations": ["jboss"]
24+
"destinations": [
25+
"deb10-jboss"
26+
]
2527
}
2628
],
2729
"instrumentations": {
2830
"resources": [
2931
{
3032
"id": "jbossRecipe",
3133
"resource_ids": [
32-
"jboss"
34+
"deb10-jboss"
3335
],
3436
"provider": "newrelic",
3537
"source_repository": "https://github.com/newrelic/open-install-library.git",
@@ -42,7 +44,7 @@
4244
{
4345
"id": "recipeValidation",
4446
"resource_ids": [
45-
"jboss"
47+
"deb10-jboss"
4648
],
4749
"provider": "newrelic",
4850
"source_repository": "https://github.com/newrelic/open-install-library.git",

‎test/definitions-eu/infra-agent/debians/ubuntu16-infra.json‎

Lines changed: 25 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -5,29 +5,31 @@
55
"Department": "product",
66
"Product": "virtuoso"
77
},
8-
9-
"resources": [{
10-
"id": "host1",
11-
"provider": "aws",
12-
"type": "ec2",
13-
"size": "t3.nano",
14-
"ami_name": "ubuntu/images/hvm-ssd/ubuntu-xenial-16.04-amd64-server-????????",
15-
"user_name": "ubuntu"
16-
}],
17-
8+
"resources": [
9+
{
10+
"id": "ubuntu16-infra-eu",
11+
"provider": "aws",
12+
"type": "ec2",
13+
"size": "t3.nano",
14+
"ami_name": "ubuntu-pro-server/images/hvm-ssd/ubuntu-xenial-16.04-amd64-pro-server-????????",
15+
"user_name": "ubuntu"
16+
}
17+
],
1818
"instrumentations": {
1919
"resources": [
20-
{
21-
"id": "nr_infra",
22-
"resource_ids": ["host1"],
23-
"provider": "newrelic",
24-
"source_repository": "https://github.com/newrelic/open-install-library",
25-
"deploy_script_path": "test/deploy/linux/newrelic-cli/install/roles",
26-
"params": {
27-
"local_recipes": true,
28-
"validate_output": "Infrastructure Agent\\s+\\(installed\\)"
29-
}
30-
}
31-
]
32-
}
20+
{
21+
"id": "nr_infra",
22+
"resource_ids": [
23+
"ubuntu16-infra-eu"
24+
],
25+
"provider": "newrelic",
26+
"source_repository": "https://github.com/newrelic/open-install-library",
27+
"deploy_script_path": "test/deploy/linux/newrelic-cli/install/roles",
28+
"params": {
29+
"local_recipes": true,
30+
"validate_output": "Infrastructure Agent\\s+\\(installed\\)"
31+
}
32+
}
33+
]
34+
}
3335
}

‎test/definitions-eu/otel/debians/ubuntu16-otel.json‎

Lines changed: 26 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -5,30 +5,32 @@
55
"Department": "product",
66
"Product": "virtuoso"
77
},
8-
9-
"resources": [{
10-
"id": "host1",
11-
"provider": "aws",
12-
"type": "ec2",
13-
"size": "t3.nano",
14-
"ami_name": "ubuntu/images/hvm-ssd/ubuntu-xenial-16.04-amd64-server-????????",
15-
"user_name": "ubuntu"
16-
}],
17-
8+
"resources": [
9+
{
10+
"id": "ubuntu16-otel-eu",
11+
"provider": "aws",
12+
"type": "ec2",
13+
"size": "t3.nano",
14+
"ami_name": "ubuntu-pro-server/images/hvm-ssd/ubuntu-xenial-16.04-amd64-pro-server-????????",
15+
"user_name": "ubuntu"
16+
}
17+
],
1818
"instrumentations": {
1919
"resources": [
20-
{
21-
"id": "nr_infra_otel",
22-
"resource_ids": ["host1"],
23-
"provider": "newrelic",
24-
"source_repository": "https://github.com/newrelic/open-install-library.git",
25-
"deploy_script_path": "test/deploy/linux/newrelic-cli/install-recipe/roles",
26-
"params": {
27-
"recipe_content_url": "https://raw.githubusercontent.com/newrelic/open-install-library/main/recipes/newrelic/infrastructure/otel/debian.yml",
28-
"validate_output": "New Relic OpenTelemetry Collector\\s+\\(installed\\)",
29-
"recipe_targeted": "newrelic-opentelemetry-collector"
30-
}
31-
}
32-
]
33-
}
20+
{
21+
"id": "nr_otel",
22+
"resource_ids": [
23+
"ubuntu16-otel-eu"
24+
],
25+
"provider": "newrelic",
26+
"source_repository": "https://github.com/newrelic/open-install-library.git",
27+
"deploy_script_path": "test/deploy/linux/newrelic-cli/install-recipe/roles",
28+
"params": {
29+
"recipe_content_url": "https://raw.githubusercontent.com/newrelic/open-install-library/main/recipes/newrelic/infrastructure/otel/debian.yml",
30+
"validate_output": "New Relic OpenTelemetry Collector\\s+\\(installed\\)",
31+
"recipe_targeted": "newrelic-opentelemetry-collector"
32+
}
33+
}
34+
]
35+
}
3436
}

‎test/definitions-eu/super-agent/debians/ubuntu16-super-agent.json‎

Lines changed: 26 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -5,30 +5,32 @@
55
"Department": "product",
66
"Product": "virtuoso"
77
},
8-
9-
"resources": [{
10-
"id": "host1",
11-
"provider": "aws",
12-
"type": "ec2",
13-
"size": "t3.nano",
14-
"ami_name": "ubuntu/images/hvm-ssd/ubuntu-xenial-16.04-amd64-server-????????",
15-
"user_name": "ubuntu"
16-
}],
17-
8+
"resources": [
9+
{
10+
"id": "ubuntu16-super-eu",
11+
"provider": "aws",
12+
"type": "ec2",
13+
"size": "t3.nano",
14+
"ami_name": "ubuntu-pro-server/images/hvm-ssd/ubuntu-xenial-16.04-amd64-pro-server-????????",
15+
"user_name": "ubuntu"
16+
}
17+
],
1818
"instrumentations": {
1919
"resources": [
20-
{
21-
"id": "nr_super_agent",
22-
"resource_ids": ["host1"],
23-
"provider": "newrelic",
24-
"source_repository": "https://github.com/newrelic/open-install-library.git",
25-
"deploy_script_path": "test/deploy/linux/newrelic-cli/install-recipe/roles",
26-
"params": {
27-
"recipe_content_url": "https://raw.githubusercontent.com/newrelic/open-install-library/main/recipes/newrelic/infrastructure/super-agent/debian.yml",
28-
"validate_output": "New Relic Super Agent\\s+\\(installed\\)",
29-
"recipe_targeted": "super-agent"
30-
}
31-
}
32-
]
33-
}
20+
{
21+
"id": "nr_super_agent",
22+
"resource_ids": [
23+
"ubuntu16-super-eu"
24+
],
25+
"provider": "newrelic",
26+
"source_repository": "https://github.com/newrelic/open-install-library.git",
27+
"deploy_script_path": "test/deploy/linux/newrelic-cli/install-recipe/roles",
28+
"params": {
29+
"recipe_content_url": "https://raw.githubusercontent.com/newrelic/open-install-library/main/recipes/newrelic/infrastructure/super-agent/debian.yml",
30+
"validate_output": "New Relic Super Agent\\s+\\(installed\\)",
31+
"recipe_targeted": "super-agent"
32+
}
33+
}
34+
]
35+
}
3436
}

‎test/definitions/otel/debians/ubuntu16-otel.json‎

Lines changed: 26 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -5,30 +5,32 @@
55
"Department": "product",
66
"Product": "virtuoso"
77
},
8-
9-
"resources": [{
10-
"id": "host1",
11-
"provider": "aws",
12-
"type": "ec2",
13-
"size": "t3.nano",
14-
"ami_name": "ubuntu/images/hvm-ssd/ubuntu-xenial-16.04-amd64-server-????????",
15-
"user_name": "ubuntu"
16-
}],
17-
8+
"resources": [
9+
{
10+
"id": "ubuntu16-otel",
11+
"provider": "aws",
12+
"type": "ec2",
13+
"size": "t3.nano",
14+
"ami_name": "ubuntu-pro-server/images/hvm-ssd/ubuntu-xenial-16.04-amd64-pro-server-????????",
15+
"user_name": "ubuntu"
16+
}
17+
],
1818
"instrumentations": {
1919
"resources": [
20-
{
21-
"id": "nr_infra_otel",
22-
"resource_ids": ["host1"],
23-
"provider": "newrelic",
24-
"source_repository": "https://github.com/newrelic/open-install-library.git",
25-
"deploy_script_path": "test/deploy/linux/newrelic-cli/install-recipe/roles",
26-
"params": {
27-
"recipe_content_url": "https://raw.githubusercontent.com/newrelic/open-install-library/main/recipes/newrelic/infrastructure/otel/debian.yml",
28-
"validate_output": "New Relic OpenTelemetry Collector\\s+\\(installed\\)",
29-
"recipe_targeted": "newrelic-opentelemetry-collector"
30-
}
31-
}
32-
]
33-
}
20+
{
21+
"id": "nr_otel",
22+
"resource_ids": [
23+
"ubuntu16-otel"
24+
],
25+
"provider": "newrelic",
26+
"source_repository": "https://github.com/newrelic/open-install-library.git",
27+
"deploy_script_path": "test/deploy/linux/newrelic-cli/install-recipe/roles",
28+
"params": {
29+
"recipe_content_url": "https://raw.githubusercontent.com/newrelic/open-install-library/main/recipes/newrelic/infrastructure/otel/debian.yml",
30+
"validate_output": "New Relic OpenTelemetry Collector\\s+\\(installed\\)",
31+
"recipe_targeted": "newrelic-opentelemetry-collector"
32+
}
33+
}
34+
]
35+
}
3436
}

‎test/definitions/smoke/rhl2-sysd-jboss.json‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
},
88
"resources": [
99
{
10-
"id": "jboss",
10+
"id": "rhel-jboss",
1111
"provider": "aws",
1212
"type": "ec2",
1313
"size": "t3.micro",
@@ -22,7 +22,7 @@
2222
"deploy_script_path": "test/deploy/linux/jboss/systemd/install/linux/roles",
2323
"port": 6001,
2424
"destinations": [
25-
"jboss"
25+
"rhel-jboss"
2626
]
2727
}
2828
],
@@ -31,7 +31,7 @@
3131
{
3232
"id": "jbossRecipe",
3333
"resource_ids": [
34-
"jboss"
34+
"rhel-jboss"
3535
],
3636
"provider": "newrelic",
3737
"source_repository": "https://github.com/newrelic/open-install-library.git",
@@ -44,7 +44,7 @@
4444
{
4545
"id": "recipeValidation",
4646
"resource_ids": [
47-
"jboss"
47+
"rhel-jboss"
4848
],
4949
"provider": "newrelic",
5050
"source_repository": "https://github.com/newrelic/open-install-library.git",
@@ -55,4 +55,4 @@
5555
}
5656
]
5757
}
58-
}
58+
}

‎test/definitions/super-agent/debians/ubuntu16-super-agent.json‎

Lines changed: 26 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -5,30 +5,32 @@
55
"Department": "product",
66
"Product": "virtuoso"
77
},
8-
9-
"resources": [{
10-
"id": "host1",
11-
"provider": "aws",
12-
"type": "ec2",
13-
"size": "t3.nano",
14-
"ami_name": "ubuntu/images/hvm-ssd/ubuntu-xenial-16.04-amd64-server-????????",
15-
"user_name": "ubuntu"
16-
}],
17-
8+
"resources": [
9+
{
10+
"id": "ubuntu16-super",
11+
"provider": "aws",
12+
"type": "ec2",
13+
"size": "t3.nano",
14+
"ami_name": "ubuntu-pro-server/images/hvm-ssd/ubuntu-xenial-16.04-amd64-pro-server-????????",
15+
"user_name": "ubuntu"
16+
}
17+
],
1818
"instrumentations": {
1919
"resources": [
20-
{
21-
"id": "nr_super_agent",
22-
"resource_ids": ["host1"],
23-
"provider": "newrelic",
24-
"source_repository": "https://github.com/newrelic/open-install-library.git",
25-
"deploy_script_path": "test/deploy/linux/newrelic-cli/install-recipe/roles",
26-
"params": {
27-
"recipe_content_url": "https://raw.githubusercontent.com/newrelic/open-install-library/main/recipes/newrelic/infrastructure/super-agent/debian.yml",
28-
"validate_output": "New Relic Super Agent\\s+\\(installed\\)",
29-
"recipe_targeted": "super-agent"
30-
}
31-
}
32-
]
33-
}
20+
{
21+
"id": "nr_super_agent",
22+
"resource_ids": [
23+
"ubuntu16-super"
24+
],
25+
"provider": "newrelic",
26+
"source_repository": "https://github.com/newrelic/open-install-library.git",
27+
"deploy_script_path": "test/deploy/linux/newrelic-cli/install-recipe/roles",
28+
"params": {
29+
"recipe_content_url": "https://raw.githubusercontent.com/newrelic/open-install-library/main/recipes/newrelic/infrastructure/super-agent/debian.yml",
30+
"validate_output": "New Relic Super Agent\\s+\\(installed\\)",
31+
"recipe_targeted": "super-agent"
32+
}
33+
}
34+
]
35+
}
3436
}

‎test/manual/definitions/infra-agent/ubuntu16-infra.json‎

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,14 @@
55
"Department": "product",
66
"Product": "virtuoso"
77
},
8-
9-
"resources": [{
10-
"id": "infraubuntu16",
11-
"provider": "aws",
12-
"type": "ec2",
13-
"size": "t3.nano",
14-
"ami_name": "ubuntu/images/hvm-ssd/ubuntu-xenial-16.04-amd64-server-????????",
15-
"user_name": "ubuntu"
16-
}]
17-
}
8+
"resources": [
9+
{
10+
"id": "infraubuntu16",
11+
"provider": "aws",
12+
"type": "ec2",
13+
"size": "t3.nano",
14+
"ami_name": "ubuntu-pro-server/images/hvm-ssd/ubuntu-xenial-16.04-amd64-pro-server-????????",
15+
"user_name": "ubuntu"
16+
}
17+
]
18+
}

0 commit comments

Comments
 (0)