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

Hide file tree

Showing 52 changed files with 861 additions and 797 deletions.
diff --git a/test/definitions-eu/apm/dotNet/linux/debian10-nginx-aspnetcore.json b/test/definitions-eu/apm/dotNet/linux/debian10-nginx-aspnetcore.json
@@ -10,7 +10,7 @@
         "id": "debiannginxnetcore1",
         "provider": "aws",
         "type": "ec2",
-        "size": "t3.micro",
+        "size": "t3.small",
         "comment": "This AMI requires to accept terms and conditions https://aws.amazon.com/marketplace/server/procurement?productId=0f258a51-0979-4be2-a6a9-ec8fe108514a",
         "ami_name": "debian-10-amd64-202?????-*",
         "user_name": "admin"

diff --git a/...ns-eu/apm/java/deb10-apt-sysd-tomcat.json → ...ns-eu/apm/java/deb11-apt-sysd-tomcat.json b/...ns-eu/apm/java/deb10-apt-sysd-tomcat.json → ...ns-eu/apm/java/deb11-apt-sysd-tomcat.json
@@ -11,7 +11,7 @@
       "provider": "aws",
       "type": "ec2",
       "size": "t3.micro",
-      "ami_name": "debian-10-amd64-202?????-*",
+      "ami_name": "debian-11-amd64-daily-202?????-*",
       "user_name": "admin"
     }
   ],

diff --git a/.../definitions-eu/apm/java/deb10-jetty.json → .../definitions-eu/apm/java/deb11-jetty.json b/.../definitions-eu/apm/java/deb10-jetty.json → .../definitions-eu/apm/java/deb11-jetty.json
@@ -11,7 +11,7 @@
       "provider": "aws",
       "type": "ec2",
       "size": "t3.micro",
-      "ami_name": "debian-10-amd64-202?????-*",
+      "ami_name": "debian-11-amd64-daily-202?????-*",
       "user_name": "admin"
     }
   ],
@@ -21,7 +21,9 @@
       "source_repository": "https://github.com/newrelic/open-install-library.git",
       "deploy_script_path": "test/deploy/linux/jetty/systemd/install/roles",
       "port": 6001,
-      "destinations": ["jettyhost"]
+      "destinations": [
+        "jettyhost"
+      ]
     }
   ]
 }
diff --git a/...nitions-eu/apm/java/deb10-sysd-jboss.json → ...nitions-eu/apm/java/deb11-sysd-jboss.json b/...nitions-eu/apm/java/deb10-sysd-jboss.json → ...nitions-eu/apm/java/deb11-sysd-jboss.json
@@ -7,11 +7,11 @@
   },
   "resources": [
     {
-      "id": "deb10-jboss",
+      "id": "deb11-jboss",
       "provider": "aws",
       "type": "ec2",
       "size": "t3.micro",
-      "ami_name": "debian-10-amd64-202?????-*",
+      "ami_name": "debian-11-amd64-daily-202?????-*",
       "user_name": "admin"
     }
   ],
@@ -22,7 +22,7 @@
       "deploy_script_path": "test/deploy/linux/jboss/systemd/install/linux/roles",
       "port": 6001,
       "destinations": [
-        "deb10-jboss"
+        "deb11-jboss"
       ]
     }
   ],
@@ -31,7 +31,7 @@
       {
         "id": "jbossRecipe",
         "resource_ids": [
-          "deb10-jboss"
+          "deb11-jboss"
         ],
         "provider": "newrelic",
         "source_repository": "https://github.com/newrelic/open-install-library.git",
@@ -44,7 +44,7 @@
       {
         "id": "recipeValidation",
         "resource_ids": [
-          "deb10-jboss"
+          "deb11-jboss"
         ],
         "provider": "newrelic",
         "source_repository": "https://github.com/newrelic/open-install-library.git",

diff --git a/test/definitions-eu/apm/java/rhl2-jetty.json b/test/definitions-eu/apm/java/rhl2-jetty.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 @@
       ]
     }
   ]
-}
+}
diff --git a/test/definitions-eu/infra-agent/debians/debian11-infra.json b/test/definitions-eu/infra-agent/debians/debian11-infra.json
@@ -5,29 +5,31 @@
         "Department": "product",
         "Product": "virtuoso"
     },
-
-    "resources": [{
-        "id": "host1",
-        "provider": "aws",
-        "type": "ec2",
-        "size": "t3.nano",
-        "ami_name": "debian-11-amd64-2021????-*",
-        "user_name": "admin"
-    }],
-
-    "instrumentations": {
-      "resources": [
+    "resources": [
         {
-            "id": "nr_infra",
-            "resource_ids": ["host1"],
-            "provider": "newrelic",
-            "source_repository": "https://github.com/newrelic/open-install-library",
-            "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/debian.yml",
-                "validate_output": "Infrastructure Agent\\s+\\(installed\\)"
-            }
+            "id": "host1",
+            "provider": "aws",
+            "type": "ec2",
+            "size": "t3.nano",
+            "ami_name": "debian-11-amd64-daily-*",
+            "user_name": "admin"
         }
+    ],
+    "instrumentations": {
+        "resources": [
+            {
+                "id": "nr_infra",
+                "resource_ids": [
+                    "host1"
+                ],
+                "provider": "newrelic",
+                "source_repository": "https://github.com/newrelic/open-install-library",
+                "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/debian.yml",
+                    "validate_output": "Infrastructure Agent\\s+\\(installed\\)"
+                }
+            }
         ]
     }
 }
diff --git a/test/definitions-eu/infra-agent/rhel/redhat8arm64-infra.json b/test/definitions-eu/infra-agent/rhel/redhat8arm64-infra.json
@@ -5,20 +5,22 @@
         "Department": "product",
         "Product": "virtuoso"
     },
-
-    "resources": [{
-        "id": "host1",
-        "provider": "aws",
-        "type": "ec2",
-        "size": "t4g.micro",
-        "ami_name": "RHEL-8.4.?_HVM-????????-arm64-??-Hourly2-GP2"
-    }],
-
+    "resources": [
+        {
+            "id": "host1",
+            "provider": "aws",
+            "type": "ec2",
+            "size": "t4g.micro",
+            "ami_name": "RHEL-8.*_HVM-????????-arm64-*-Hourly2-GP2"
+        }
+    ],
     "instrumentations": {
         "resources": [
             {
                 "id": "nr_infra",
-                "resource_ids": ["host1"],
+                "resource_ids": [
+                    "host1"
+                ],
                 "provider": "newrelic",
                 "source_repository": "https://github.com/newrelic/open-install-library",
                 "deploy_script_path": "test/deploy/linux/newrelic-cli/install-recipe/roles",

diff --git a/test/definitions-eu/infra-agent/suse/suse154-infra.json b/test/definitions-eu/infra-agent/suse/suse154-infra.json
@@ -5,28 +5,30 @@
         "Department": "product",
         "Product": "virtuoso"
     },
-
-    "resources": [{
-        "id": "host1",
-        "provider": "aws",
-        "type": "ec2",
-        "size": "t3.nano",
-        "ami_name": "suse-sles-15-sp4-v????????-hvm-ssd-x86_64"
-    }],
-
-    "instrumentations": {
-      "resources": [
+    "resources": [
         {
-            "id": "nr_infra",
-            "resource_ids": ["host1"],
-            "provider": "newrelic",
-            "source_repository": "https://github.com/newrelic/open-install-library",
-            "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/suse.yml",
-                "validate_output": "Infrastructure Agent\\s+\\(installed\\)"
-            }
+            "id": "host2",
+            "provider": "aws",
+            "type": "ec2",
+            "size": "t3.nano",
+            "ami_name": "suse-sles-15-sp4-chost-byos-v????????-hvm-ssd-x86_64"
         }
+    ],
+    "instrumentations": {
+        "resources": [
+            {
+                "id": "nr_infra",
+                "resource_ids": [
+                    "host2"
+                ],
+                "provider": "newrelic",
+                "source_repository": "https://github.com/newrelic/open-install-library",
+                "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/suse.yml",
+                    "validate_output": "Infrastructure Agent\\s+\\(installed\\)"
+                }
+            }
         ]
     }
-}
+}
diff --git a/test/definitions-eu/otel/debians/debian11-otel.json b/test/definitions-eu/otel/debians/debian11-otel.json
@@ -5,30 +5,32 @@
         "Department": "product",
         "Product": "virtuoso"
     },
-
-    "resources": [{
-        "id": "host1",
-        "provider": "aws",
-        "type": "ec2",
-        "size": "t3.nano",
-        "ami_name": "debian-11-amd64-2021????-*",
-        "user_name": "admin"
-    }],
-
+    "resources": [
+        {
+            "id": "host2",
+            "provider": "aws",
+            "type": "ec2",
+            "size": "t3.nano",
+            "ami_name": "debian-11-amd64-daily-*",
+            "user_name": "admin"
+        }
+    ],
     "instrumentations": {
         "resources": [
-          {
-              "id": "nr_infra_otel",
-              "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/otel/debian.yml",
-                  "validate_output": "New Relic OpenTelemetry Collector\\s+\\(installed\\)",
-                  "recipe_targeted": "newrelic-opentelemetry-collector"
-              }
-          }
-          ]
-      }
+            {
+                "id": "nr_infra_otel",
+                "resource_ids": [
+                    "host2"
+                ],
+                "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/otel/debian.yml",
+                    "validate_output": "New Relic OpenTelemetry Collector\\s+\\(installed\\)",
+                    "recipe_targeted": "newrelic-opentelemetry-collector"
+                }
+            }
+        ]
+    }
 }
diff --git a/test/definitions-eu/otel/rhel/redhat8arm64-otel.json b/test/definitions-eu/otel/rhel/redhat8arm64-otel.json
@@ -5,29 +5,31 @@
         "Department": "product",
         "Product": "virtuoso"
     },
-
-    "resources": [{
-        "id": "host1",
-        "provider": "aws",
-        "type": "ec2",
-        "size": "t4g.micro",
-        "ami_name": "RHEL-8.4.?_HVM-????????-arm64-??-Hourly2-GP2"
-    }],
-
+    "resources": [
+        {
+            "id": "host1",
+            "provider": "aws",
+            "type": "ec2",
+            "size": "t4g.micro",
+            "ami_name": "RHEL-8.*_HVM-????????-arm64-*-Hourly2-GP2"
+        }
+    ],
     "instrumentations": {
         "resources": [
-          {
-              "id": "nr_infra_otel",
-              "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/otel/rhel.yml",
-                  "validate_output": "New Relic OpenTelemetry Collector\\s+\\(installed\\)",
-                  "recipe_targeted": "newrelic-opentelemetry-collector"
-              }
-          }
-          ]
-      }
+            {
+                "id": "nr_infra_otel",
+                "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/otel/rhel.yml",
+                    "validate_output": "New Relic OpenTelemetry Collector\\s+\\(installed\\)",
+                    "recipe_targeted": "newrelic-opentelemetry-collector"
+                }
+            }
+        ]
+    }
 }