remove from canaries EOL Centos 7 and 8 (#1895)

newrelic · Jul 12, 2024 · 7b652ad · 7b652ad
1 parent ae8f4c6
commit 7b652ad
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 30 deletions.
diff --git a/test/automated/ansible/group_vars/localhost/main.yml b/test/automated/ansible/group_vars/localhost/main.yml
@@ -94,20 +94,6 @@ instances:
   ############################
   # centos amd64
   ############################
-  - ami: "ami-00f8e2c955f7ffa9b"
-    type: "t3a.small"
-    name: "amd64:centos7"
-    username: "centos"
-    platform: "linux"
-    python_interpreter: "/usr/bin/python"
-    launch_template: "LaunchTemplateId=lt-0b00afb3f5110a0e6,Version=3"
-  - ami: "ami-0ac6967966621d983"
-    type: "t3a.small"
-    name: "amd64:centos8"
-    username: "centos"
-    platform: "linux"
-    python_interpreter: "/usr/bin/python3"
-    launch_template: "LaunchTemplateId=lt-0b00afb3f5110a0e6,Version=3"
   - ami: "ami-013f9ee48907190f5"
     type: "t3a.small"
     name: "amd64:centos-stream"
@@ -118,20 +104,6 @@ instances:
   ############################
   # centos arm64
   ############################
-  # - ami: "ami-07f692d95b2b9c8c5"
-  #   type: "t4g.small"
-  #   name: "arm64:centos7"
-  #   username: "centos"
-  #   platform: "linux"
-  #   python_interpreter: "/usr/bin/python"
-  #   launch_template: "LaunchTemplateId=lt-0b00afb3f5110a0e6,Version=3"
-  - ami: "ami-035734c938e7da7af"
-    type: "t4g.small"
-    name: "arm64:centos8"
-    username: "centos"
-    platform: "linux"
-    python_interpreter: "/usr/bin/python3"
-    launch_template: "LaunchTemplateId=lt-0b00afb3f5110a0e6,Version=3"
   - ami: "ami-0dce27ea07b1afb8f"
     type: "t4g.small"
     name: "arm64:centos-stream"

diff --git a/test/provision/terraform/caos.auto.tfvars.dist b/test/provision/terraform/caos.auto.tfvars.dist
@@ -2,9 +2,9 @@ ec2_prefix = "PREFIX:TAG_OR_UNIQUE_NAME"
 
 windows_ec2 = ["windows_2012", "windows_2016", "windows_2019", "windows_2022"]
 
-linux_ec2_amd = ["amd64:ubuntu24.04", "amd64:ubuntu22.04", "amd64:ubuntu20.04", "amd64:ubuntu18.04", "amd64:centos7", "amd64:centos8", "amd64:centos-stream", "amd64:sles-12.5", "amd64:sles-15.3",  "amd64:sles-15.4", "amd64:sles-15.5", "amd64:redhat-7.9", "amd64:redhat-8.4", "amd64:redhat-9.0", "amd64:debian-bookworm", "amd64:al-2", "amd64:al-2023"]
+linux_ec2_amd = ["amd64:ubuntu24.04", "amd64:ubuntu22.04", "amd64:ubuntu20.04", "amd64:ubuntu18.04", "amd64:centos-stream", "amd64:sles-12.5", "amd64:sles-15.3",  "amd64:sles-15.4", "amd64:sles-15.5", "amd64:redhat-7.9", "amd64:redhat-8.4", "amd64:redhat-9.0", "amd64:debian-bookworm", "amd64:al-2", "amd64:al-2023"]
 
-linux_ec2_arm = ["arm64:ubuntu24.04", "arm64:ubuntu22.04", "arm64:ubuntu20.04", "arm64:ubuntu18.04", "arm64:centos7", "arm64:centos8", "arm64:centos-stream", "arm64:sles-15.3",  "arm64:sles-15.4", "arm64:sles-15.5", "arm64:redhat-7.6", "arm64:redhat-9.0", "arm64:debian-bookworm", "arm64:al-2", "arm64:al-2023"]
+linux_ec2_arm = ["arm64:ubuntu24.04", "arm64:ubuntu22.04", "arm64:ubuntu20.04", "arm64:ubuntu18.04", "arm64:centos-stream", "arm64:sles-15.3",  "arm64:sles-15.4", "arm64:sles-15.5", "arm64:redhat-7.6", "arm64:redhat-9.0", "arm64:debian-bookworm", "arm64:al-2", "arm64:al-2023"]
 
 ssh_pub_key      = "AAAAB3NzaC1yc2EAAAADAQABAAABAQDH9C7BS2XrtXGXFFyL0pNku/Hfy84RliqvYKpuslJFeUivf5QY6Ipi8yXfXn6TsRDbdxfGPi6oOR60Fa+4cJmCo6N5g57hBS6f2IdzQBNrZr7i1I/a3cFeK6XOc1G1tQaurx7Pu+qvACfJjLXKG66tHlaVhAHd/1l2FocgFNUDFFuKS3mnzt9hKys7sB4aO3O0OdohN/0NJC4ldV8/OmeXqqfkiPWcgPx3C8bYyXCX7QJNBHKrzbX1jW51Px7SIDWFDV6kxGwpQGGBMJg/k79gjjM+jhn4fg1/VP/Fx37mAnfLqpcTfiOkzSE80ORGefQ1XfGK/Dpa3ITrzRYW8xlR caos-dev-arm"
 pvt_key          = "~/.ssh/caos-dev-arm.cer"