Skip to content

Commit fe642b9

Browse files
rthorn-nrrthorn-nr
authored
Fix failing tests (#1008)
* chore: Update suse 15.4 ami * chore: Use debian11 daily build * chore: Install ca certs in java sysd deploy * chore: Fix instance name collisions * chore: Autoformat to trigger tests * chore: Narrow down suse 12.4 ami * chore: Fix host name collision * chore: Use default AL2 ami * chore: Rename host id * chore: Rename host id * chore: Use deb11 for failing deb java tests * chore: Expect SA tests to fail (EU) * chore: Restore passing SA test * chore: Restore passing suse eu SA tests * chore: Expect SA tests to fail * chore: Specify daily deb11 ami * chore: Fix validation for expected failures in SA tests * chore: Update rhel8 arm64 ami * chore: Restore ec2 size * chore: Bump size for test timing out
1 parent 960a5cc commit fe642b9

File tree

52 files changed

+861
-797
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

52 files changed

+861
-797
lines changed

‎test/definitions-eu/apm/dotNet/linux/debian10-nginx-aspnetcore.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
"id": "debiannginxnetcore1",
1111
"provider": "aws",
1212
"type": "ec2",
13-
"size": "t3.micro",
13+
"size": "t3.small",
1414
"comment": "This AMI requires to accept terms and conditions https://aws.amazon.com/marketplace/server/procurement?productId=0f258a51-0979-4be2-a6a9-ec8fe108514a",
1515
"ami_name": "debian-10-amd64-202?????-*",
1616
"user_name": "admin"

‎test/definitions-eu/apm/java/deb10-apt-sysd-tomcat.json‎ renamed to ‎test/definitions-eu/apm/java/deb11-apt-sysd-tomcat.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
"provider": "aws",
1212
"type": "ec2",
1313
"size": "t3.micro",
14-
"ami_name": "debian-10-amd64-202?????-*",
14+
"ami_name": "debian-11-amd64-daily-202?????-*",
1515
"user_name": "admin"
1616
}
1717
],

‎test/definitions-eu/apm/java/deb10-jetty.json‎ renamed to ‎test/definitions-eu/apm/java/deb11-jetty.json‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
"provider": "aws",
1212
"type": "ec2",
1313
"size": "t3.micro",
14-
"ami_name": "debian-10-amd64-202?????-*",
14+
"ami_name": "debian-11-amd64-daily-202?????-*",
1515
"user_name": "admin"
1616
}
1717
],
@@ -21,7 +21,9 @@
2121
"source_repository": "https://github.com/newrelic/open-install-library.git",
2222
"deploy_script_path": "test/deploy/linux/jetty/systemd/install/roles",
2323
"port": 6001,
24-
"destinations": ["jettyhost"]
24+
"destinations": [
25+
"jettyhost"
26+
]
2527
}
2628
]
2729
}

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@
77
},
88
"resources": [
99
{
10-
"id": "deb10-jboss",
10+
"id": "deb11-jboss",
1111
"provider": "aws",
1212
"type": "ec2",
1313
"size": "t3.micro",
14-
"ami_name": "debian-10-amd64-202?????-*",
14+
"ami_name": "debian-11-amd64-daily-202?????-*",
1515
"user_name": "admin"
1616
}
1717
],
@@ -22,7 +22,7 @@
2222
"deploy_script_path": "test/deploy/linux/jboss/systemd/install/linux/roles",
2323
"port": 6001,
2424
"destinations": [
25-
"deb10-jboss"
25+
"deb11-jboss"
2626
]
2727
}
2828
],
@@ -31,7 +31,7 @@
3131
{
3232
"id": "jbossRecipe",
3333
"resource_ids": [
34-
"deb10-jboss"
34+
"deb11-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-
"deb10-jboss"
47+
"deb11-jboss"
4848
],
4949
"provider": "newrelic",
5050
"source_repository": "https://github.com/newrelic/open-install-library.git",

‎test/definitions-eu/apm/java/rhl2-jetty.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
"provider": "aws",
1212
"type": "ec2",
1313
"size": "t3.micro",
14-
"ami_name": "amzn2-ami-hvm-2.0.????????.?-x86_64-gp2",
14+
"ami_name": "amzn2-ami-kernel-*-hvm-*-x86_64-gp2",
1515
"user_name": "ec2-user"
1616
}
1717
],
@@ -26,4 +26,4 @@
2626
]
2727
}
2828
]
29-
}
29+
}

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

Lines changed: 23 additions & 21 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": "debian-11-amd64-2021????-*",
15-
"user_name": "admin"
16-
}],
17-
18-
"instrumentations": {
19-
"resources": [
8+
"resources": [
209
{
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-recipe/roles",
26-
"params": {
27-
"recipe_content_url": "https://raw.githubusercontent.com/newrelic/open-install-library/main/recipes/newrelic/infrastructure/debian.yml",
28-
"validate_output": "Infrastructure Agent\\s+\\(installed\\)"
29-
}
10+
"id": "host1",
11+
"provider": "aws",
12+
"type": "ec2",
13+
"size": "t3.nano",
14+
"ami_name": "debian-11-amd64-daily-*",
15+
"user_name": "admin"
3016
}
17+
],
18+
"instrumentations": {
19+
"resources": [
20+
{
21+
"id": "nr_infra",
22+
"resource_ids": [
23+
"host1"
24+
],
25+
"provider": "newrelic",
26+
"source_repository": "https://github.com/newrelic/open-install-library",
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/debian.yml",
30+
"validate_output": "Infrastructure Agent\\s+\\(installed\\)"
31+
}
32+
}
3133
]
3234
}
3335
}

‎test/definitions-eu/infra-agent/rhel/redhat8arm64-infra.json‎

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -5,20 +5,22 @@
55
"Department": "product",
66
"Product": "virtuoso"
77
},
8-
9-
"resources": [{
10-
"id": "host1",
11-
"provider": "aws",
12-
"type": "ec2",
13-
"size": "t4g.micro",
14-
"ami_name": "RHEL-8.4.?_HVM-????????-arm64-??-Hourly2-GP2"
15-
}],
16-
8+
"resources": [
9+
{
10+
"id": "host1",
11+
"provider": "aws",
12+
"type": "ec2",
13+
"size": "t4g.micro",
14+
"ami_name": "RHEL-8.*_HVM-????????-arm64-*-Hourly2-GP2"
15+
}
16+
],
1717
"instrumentations": {
1818
"resources": [
1919
{
2020
"id": "nr_infra",
21-
"resource_ids": ["host1"],
21+
"resource_ids": [
22+
"host1"
23+
],
2224
"provider": "newrelic",
2325
"source_repository": "https://github.com/newrelic/open-install-library",
2426
"deploy_script_path": "test/deploy/linux/newrelic-cli/install-recipe/roles",

‎test/definitions-eu/infra-agent/suse/suse154-infra.json‎

Lines changed: 23 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -5,28 +5,30 @@
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": "suse-sles-15-sp4-v????????-hvm-ssd-x86_64"
15-
}],
16-
17-
"instrumentations": {
18-
"resources": [
8+
"resources": [
199
{
20-
"id": "nr_infra",
21-
"resource_ids": ["host1"],
22-
"provider": "newrelic",
23-
"source_repository": "https://github.com/newrelic/open-install-library",
24-
"deploy_script_path": "test/deploy/linux/newrelic-cli/install-recipe/roles",
25-
"params": {
26-
"recipe_content_url": "https://raw.githubusercontent.com/newrelic/open-install-library/main/recipes/newrelic/infrastructure/suse.yml",
27-
"validate_output": "Infrastructure Agent\\s+\\(installed\\)"
28-
}
10+
"id": "host2",
11+
"provider": "aws",
12+
"type": "ec2",
13+
"size": "t3.nano",
14+
"ami_name": "suse-sles-15-sp4-chost-byos-v????????-hvm-ssd-x86_64"
2915
}
16+
],
17+
"instrumentations": {
18+
"resources": [
19+
{
20+
"id": "nr_infra",
21+
"resource_ids": [
22+
"host2"
23+
],
24+
"provider": "newrelic",
25+
"source_repository": "https://github.com/newrelic/open-install-library",
26+
"deploy_script_path": "test/deploy/linux/newrelic-cli/install-recipe/roles",
27+
"params": {
28+
"recipe_content_url": "https://raw.githubusercontent.com/newrelic/open-install-library/main/recipes/newrelic/infrastructure/suse.yml",
29+
"validate_output": "Infrastructure Agent\\s+\\(installed\\)"
30+
}
31+
}
3032
]
3133
}
32-
}
34+
}

‎test/definitions-eu/otel/debians/debian11-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": "debian-11-amd64-2021????-*",
15-
"user_name": "admin"
16-
}],
17-
8+
"resources": [
9+
{
10+
"id": "host2",
11+
"provider": "aws",
12+
"type": "ec2",
13+
"size": "t3.nano",
14+
"ami_name": "debian-11-amd64-daily-*",
15+
"user_name": "admin"
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_infra_otel",
22+
"resource_ids": [
23+
"host2"
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/otel/rhel/redhat8arm64-otel.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": "t4g.micro",
14-
"ami_name": "RHEL-8.4.?_HVM-????????-arm64-??-Hourly2-GP2"
15-
}],
16-
8+
"resources": [
9+
{
10+
"id": "host1",
11+
"provider": "aws",
12+
"type": "ec2",
13+
"size": "t4g.micro",
14+
"ami_name": "RHEL-8.*_HVM-????????-arm64-*-Hourly2-GP2"
15+
}
16+
],
1717
"instrumentations": {
1818
"resources": [
19-
{
20-
"id": "nr_infra_otel",
21-
"resource_ids": ["host1"],
22-
"provider": "newrelic",
23-
"source_repository": "https://github.com/newrelic/open-install-library.git",
24-
"deploy_script_path": "test/deploy/linux/newrelic-cli/install-recipe/roles",
25-
"params": {
26-
"recipe_content_url": "https://raw.githubusercontent.com/newrelic/open-install-library/main/recipes/newrelic/infrastructure/otel/rhel.yml",
27-
"validate_output": "New Relic OpenTelemetry Collector\\s+\\(installed\\)",
28-
"recipe_targeted": "newrelic-opentelemetry-collector"
29-
}
30-
}
31-
]
32-
}
19+
{
20+
"id": "nr_infra_otel",
21+
"resource_ids": [
22+
"host1"
23+
],
24+
"provider": "newrelic",
25+
"source_repository": "https://github.com/newrelic/open-install-library.git",
26+
"deploy_script_path": "test/deploy/linux/newrelic-cli/install-recipe/roles",
27+
"params": {
28+
"recipe_content_url": "https://raw.githubusercontent.com/newrelic/open-install-library/main/recipes/newrelic/infrastructure/otel/rhel.yml",
29+
"validate_output": "New Relic OpenTelemetry Collector\\s+\\(installed\\)",
30+
"recipe_targeted": "newrelic-opentelemetry-collector"
31+
}
32+
}
33+
]
34+
}
3335
}

0 commit comments

Comments
 (0)