chore: Update Amazon Linux test AMI from 2022 to 2023 (#895)

newrelic · Mar 30, 2023 · 79cc325 · 79cc325
1 parent 78d3d32
commit 79cc325
Show file tree

Hide file tree

Showing 3 changed files with 43 additions and 74 deletions.
diff --git a/...tions/alerts/amazonlinux-2022-golden.json → ...tions/alerts/amazonlinux-2023-golden.json b/...tions/alerts/amazonlinux-2022-golden.json → ...tions/alerts/amazonlinux-2023-golden.json
@@ -11,7 +11,7 @@
       "provider": "aws",
       "type": "ec2",
       "size": "t3.small",
-      "ami_name": "al2022-ami-2022.0.*-x86_64",
+      "ami_name": "al2023-ami-2023.0.*-x86_64",
       "user_name": "ec2-user"
     }
   ],

diff --git a/test/definitions/infra-agent/amazonlinux2022-infra.json b/test/definitions/infra-agent/amazonlinux2022-infra.json
diff --git a/test/definitions/ohi/linux/nginx-ubuntu.json b/test/definitions/ohi/linux/nginx-ubuntu.json
@@ -1,46 +1,50 @@
 {
-    "global_tags": {
-        "owning_team": "virtuoso",
-        "Environment": "development",
-        "Department": "product",
-        "Product": "virtuoso"
-    },
-
-    "resources": [{
-        "id": "host1",
-        "provider": "aws",
-        "type": "ec2",
-        "size": "t3.nano",
-        "ami_name": "ubuntu/images/hvm-ssd/ubuntu-bionic-18.04-amd64-server-????????.1",
-        "user_name": "ubuntu"
-    }],
-
-    "services": [{
+  "global_tags": {
+    "owning_team": "virtuoso",
+    "Environment": "development",
+    "Department": "product",
+    "Product": "virtuoso"
+  },
+  "resources": [
+    {
+      "id": "host1",
+      "provider": "aws",
+      "type": "ec2",
+      "size": "t3.micro",
+      "ami_name": "ubuntu/images/hvm-ssd/ubuntu-bionic-18.04-amd64-server-????????",
+      "user_name": "ubuntu"
+    }
+  ],
+  "services": [
+    {
       "id": "nginx1",
-      "destinations": ["host1"],
+      "destinations": [
+        "host1"
+      ],
       "source_repository": "https://github.com/newrelic/open-install-library.git",
       "deploy_script_path": "test/deploy/linux/nginx/install/debian/roles",
       "port": 80,
-      "params":{
-            "create_env_var": true,
-            "open_status_url": true
+      "params": {
+        "create_env_var": true,
+        "open_status_url": true
       }
-    }],
-
-    "instrumentations": {
-      "resources": [
-        {
-            "id": "nr_infra_nginx",
-            "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/ubuntu.yml,https://raw.githubusercontent.com/newrelic/open-install-library/main/recipes/newrelic/infrastructure/ohi/nginx/linux.yml",
-                "validate_output": "(NGINX Integration)\\s+\\(installed\\)"
-            }
-        }
-        ]
     }
+  ],
+  "instrumentations": {
+    "resources": [
+      {
+        "id": "nr_infra_nginx",
+        "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/ubuntu.yml,https://raw.githubusercontent.com/newrelic/open-install-library/main/recipes/newrelic/infrastructure/ohi/nginx/linux.yml",
+          "validate_output": "(NGINX Integration)\\s+\\(installed\\)"
+        }
+      }
+    ]
   }
-  
+}