Remove EL7 support

OSC · Sep 6, 2024 · 76e1cc2 · 76e1cc2
1 parent b0131b2
commit 76e1cc2
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 51 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -18,11 +18,11 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - ruby: 2.7.7
+          - ruby: 2.7.8
             puppet: 7
             fixtures: .fixtures.yml
             allow_failure: false
-          - ruby: 3.2.2
+          - ruby: 3.2.3
             puppet: 8
             fixtures: .fixtures.yml
             allow_failure: false
@@ -50,7 +50,6 @@ jobs:
       fail-fast: false
       matrix:
         set:
-          - "el7"
           - "el8"
           - "el9"
           - "amazon2023"

diff --git a/.sync.yml b/.sync.yml
@@ -7,7 +7,7 @@ Rakefile:
     - '0 6 * * 1'
   acceptance_matrix:
       set:
-        - el7
+        - ---el7
         - el8
         - el9
         - amazon2023
@@ -22,9 +22,7 @@ Rakefile:
 appveyor.yml:
   delete: true
 spec/acceptance/nodesets/el7.yml:
-  default_module_install_opts:
-    ignore-dependencies: ~
-    force: ~
+  delete: true
 spec/acceptance/nodesets/el8.yml:
   default_module_install_opts:
     ignore-dependencies: ~

diff --git a/data/os/RedHat/7.yaml b/data/os/RedHat/7.yaml
diff --git a/metadata.json b/metadata.json
@@ -46,12 +46,6 @@
     }
   ],
   "operatingsystem_support": [
-    {
-      "operatingsystem": "CentOS",
-      "operatingsystemrelease": [
-        "7"
-      ]
-    },
     {
       "operatingsystem": "Rocky",
       "operatingsystemrelease": [
@@ -69,7 +63,6 @@
     {
       "operatingsystem": "RedHat",
       "operatingsystemrelease": [
-        "7",
         "8",
         "9"
       ]
@@ -107,5 +100,5 @@
   ],
   "pdk-version": "2.7.1",
   "template-url": "https://github.com/treydock/pdk-templates.git#master",
-  "template-ref": "heads/master-0-g5a59870"
+  "template-ref": "heads/master-0-g50afcd2"
 }
diff --git a/spec/acceptance/nodesets/el7.yml b/spec/acceptance/nodesets/el7.yml
diff --git a/spec/acceptance/nodesets/el8.yml b/spec/acceptance/nodesets/el8.yml
@@ -1,10 +1,10 @@
 HOSTS:
-  rocky-8:
+  el8:
     roles:
       - agent
     platform: el-8-x86_64
     hypervisor: docker
-    image: almalinux:8
+    image: rockylinux:8
     docker_preserve_image: true
     docker_cmd:
       - '/usr/sbin/init'

diff --git a/spec/acceptance/nodesets/el9.yml b/spec/acceptance/nodesets/el9.yml
@@ -1,10 +1,10 @@
 HOSTS:
-  almalinux-9:
+  el9:
     roles:
       - agent
     platform: el-9-x86_64
     hypervisor: docker
-    image: almalinux:9
+    image: rockylinux:9
     docker_preserve_image: true
     docker_cmd:
       - '/usr/sbin/init'