Skip to content

Commit 70a4b03

Browse files
authored
Fix failing tests followup (#1009)
* chore: Expect SA suse 12.5 to fail * chore: Use AL2 w/ updated linux kernel * chore: Use AL2 w/ updated linux kernel
1 parent fe642b9 commit 70a4b03

File tree

5 files changed

+40
-38
lines changed

5 files changed

+40
-38
lines changed

test/definitions-eu/apm/java/rhl2-sysd-tomcat-cmd.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
],
@@ -55,4 +55,4 @@
5555
}
5656
]
5757
}
58-
}
58+
}

test/definitions/smoke/rhl2-sysd-jboss.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": "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
],
Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
{
2+
"global_tags": {
3+
"owning_team": "virtuoso",
4+
"Environment": "development",
5+
"Department": "product",
6+
"Product": "virtuoso"
7+
},
8+
"resources": [
9+
{
10+
"id": "host1",
11+
"provider": "aws",
12+
"type": "ec2",
13+
"size": "t3.micro",
14+
"ami_name": "suse-sles-12-sp5-v????????-hvm-*"
15+
}
16+
],
17+
"instrumentations": {
18+
"resources": [
19+
{
20+
"id": "nr_super_agent",
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/super-agent/suse.yml",
29+
"validate_output": "New Relic Super Agent\\s+\\(incomplete\\)",
30+
"recipe_targeted": "super-agent"
31+
}
32+
}
33+
]
34+
}
35+
}

test/definitions/super-agent/suse/suse125-super-agent.json

Lines changed: 0 additions & 33 deletions
This file was deleted.

test/manual/definitions/apm/java/linux/tomcat/systemd/rhl2-sysd-tomcat-cmd.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+
}

0 commit comments

Comments
 (0)