From 70a4b03d3fe98b67d84665c5db5ebda0e9952c3f Mon Sep 17 00:00:00 2001
From: Ryan Thorn <106628688+rthorn-nr@users.noreply.github.com>
Date: Fri, 29 Dec 2023 15:54:04 -0800
Subject: [PATCH] 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
---
 .../apm/java/rhl2-sysd-tomcat-cmd.json        |  4 +--
 test/definitions/smoke/rhl2-sysd-jboss.json   |  2 +-
 .../suse/suse125-super-agent-fail.json        | 35 +++++++++++++++++++
 .../super-agent/suse/suse125-super-agent.json | 33 -----------------
 .../tomcat/systemd/rhl2-sysd-tomcat-cmd.json  |  4 +--
 5 files changed, 40 insertions(+), 38 deletions(-)
 create mode 100644 test/definitions/super-agent/suse/suse125-super-agent-fail.json
 delete mode 100644 test/definitions/super-agent/suse/suse125-super-agent.json

diff --git a/test/definitions-eu/apm/java/rhl2-sysd-tomcat-cmd.json b/test/definitions-eu/apm/java/rhl2-sysd-tomcat-cmd.json
index 55cb7d093..9ebeb0442 100644
--- a/test/definitions-eu/apm/java/rhl2-sysd-tomcat-cmd.json
+++ b/test/definitions-eu/apm/java/rhl2-sysd-tomcat-cmd.json
@@ -11,7 +11,7 @@
       "provider": "aws",
       "type": "ec2",
       "size": "t3.micro",
-      "ami_name": "amzn2-ami-hvm-2.0.????????.?-x86_64-gp2",
+      "ami_name": "amzn2-ami-kernel-*-hvm-*-x86_64-gp2",
       "user_name": "ec2-user"
     }
   ],
@@ -55,4 +55,4 @@
       }
     ]
   }
-}
\ No newline at end of file
+}
diff --git a/test/definitions/smoke/rhl2-sysd-jboss.json b/test/definitions/smoke/rhl2-sysd-jboss.json
index 981498c55..f5cc6d47e 100644
--- a/test/definitions/smoke/rhl2-sysd-jboss.json
+++ b/test/definitions/smoke/rhl2-sysd-jboss.json
@@ -11,7 +11,7 @@
       "provider": "aws",
       "type": "ec2",
       "size": "t3.micro",
-      "ami_name": "amzn2-ami-hvm-2.0.????????.?-x86_64-gp2",
+      "ami_name": "amzn2-ami-kernel-*-hvm-*-x86_64-gp2",
       "user_name": "ec2-user"
     }
   ],
diff --git a/test/definitions/super-agent/suse/suse125-super-agent-fail.json b/test/definitions/super-agent/suse/suse125-super-agent-fail.json
new file mode 100644
index 000000000..b1bf46765
--- /dev/null
+++ b/test/definitions/super-agent/suse/suse125-super-agent-fail.json
@@ -0,0 +1,35 @@
+{
+    "global_tags": {
+        "owning_team": "virtuoso",
+        "Environment": "development",
+        "Department": "product",
+        "Product": "virtuoso"
+    },
+    "resources": [
+        {
+            "id": "host1",
+            "provider": "aws",
+            "type": "ec2",
+            "size": "t3.micro",
+            "ami_name": "suse-sles-12-sp5-v????????-hvm-*"
+        }
+    ],
+    "instrumentations": {
+        "resources": [
+            {
+                "id": "nr_super_agent",
+                "resource_ids": [
+                    "host1"
+                ],
+                "provider": "newrelic",
+                "source_repository": "https://github.com/newrelic/open-install-library.git",
+                "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/super-agent/suse.yml",
+                    "validate_output": "New Relic Super Agent\\s+\\(incomplete\\)",
+                    "recipe_targeted": "super-agent"
+                }
+            }
+        ]
+    }
+}
diff --git a/test/definitions/super-agent/suse/suse125-super-agent.json b/test/definitions/super-agent/suse/suse125-super-agent.json
deleted file mode 100644
index bac94f09e..000000000
--- a/test/definitions/super-agent/suse/suse125-super-agent.json
+++ /dev/null
@@ -1,33 +0,0 @@
-{
-    "global_tags": {
-        "owning_team": "virtuoso",
-        "Environment": "development",
-        "Department": "product",
-        "Product": "virtuoso"
-    },
-
-    "resources": [{
-        "id": "host1",
-        "provider": "aws",
-        "type": "ec2",
-        "size": "t3.micro",
-        "ami_name": "suse-sles-12-sp5-v????????-hvm-*"
-    }],
-
-    "instrumentations": {
-        "resources": [
-          {
-              "id": "nr_super_agent",
-              "resource_ids": ["host1"],
-              "provider": "newrelic",
-              "source_repository": "https://github.com/newrelic/open-install-library.git",
-              "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/super-agent/suse.yml",
-                  "validate_output": "New Relic Super Agent\\s+\\(installed\\)",
-                  "recipe_targeted": "super-agent"
-              }
-          }
-          ]
-      }
-}
diff --git a/test/manual/definitions/apm/java/linux/tomcat/systemd/rhl2-sysd-tomcat-cmd.json b/test/manual/definitions/apm/java/linux/tomcat/systemd/rhl2-sysd-tomcat-cmd.json
index 3115f1cda..624694f48 100644
--- a/test/manual/definitions/apm/java/linux/tomcat/systemd/rhl2-sysd-tomcat-cmd.json
+++ b/test/manual/definitions/apm/java/linux/tomcat/systemd/rhl2-sysd-tomcat-cmd.json
@@ -11,7 +11,7 @@
       "provider": "aws",
       "type": "ec2",
       "size": "t3.micro",
-      "ami_name": "amzn2-ami-hvm-2.0.????????.?-x86_64-gp2",
+      "ami_name": "amzn2-ami-kernel-*-hvm-*-x86_64-gp2",
       "user_name": "ec2-user"
     }
   ],
@@ -26,4 +26,4 @@
       ]
     }
   ]
-}
\ No newline at end of file
+}