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
newrelic · Dec 29, 2023 · 70a4b03 · 70a4b03
1 parent fe642b9
commit 70a4b03
Show file tree

Hide file tree

Showing 5 changed files with 40 additions and 38 deletions.
diff --git 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 @@
       }
     ]
   }
-}
+}
diff --git 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
@@ -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
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
@@ -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 @@
       ]
     }
   ]
-}
+}