Update to modern platforms (#87)

* Remove EPEL Modular This has been removed upstream: https://pagure.io/epel/issue/198 Signed-off-by: Lance Albertson <[email protected]> * Add support for Amazon Linux 2023 Signed-off-by: Lance Albertson <[email protected]> * Remove circleci files Signed-off-by: Lance Albertson <[email protected]> * Update actions/stale action to v8 * Update actions/checkout action to v3 * Properly fix EPEL version for Amazon Linux globally Signed-off-by: Lance Albertson <[email protected]> * Update README with EL9 Signed-off-by: Lance Albertson <[email protected]> * Update workflow and remove md-links Signed-off-by: Lance Albertson <[email protected]> * Updates Signed-off-by: Lance Albertson <[email protected]> * Add missing .markdownlint-cli2.yaml and fix README.md Signed-off-by: Lance Albertson <[email protected]> --------- Signed-off-by: Lance Albertson <[email protected]> Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
sous-chefs · Apr 17, 2023 · eeda605 · eeda605
1 parent 88a88f3
commit eeda605
Show file tree

Hide file tree

Showing 31 changed files with 185 additions and 289 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -9,7 +9,12 @@ name: ci
 
 jobs:
   lint-unit:
-    uses: sous-chefs/.github/.github/workflows/[email protected]
+    uses: sous-chefs/.github/.github/workflows/[email protected]
+    permissions:
+      actions: write
+      checks: write
+      pull-requests: write
+      statuses: write
 
   integration:
     needs: 'lint-unit'
@@ -18,24 +23,28 @@ jobs:
       matrix:
         os:
           - 'almalinux-8'
-          - 'amazonlinux-2'
+          - 'almalinux-9'
+          - 'amazonlinux-2023'
           - 'centos-7'
           - 'centos-stream-8'
+          - 'centos-stream-9'
           - 'oraclelinux-7'
           - 'oraclelinux-8'
+          - 'oraclelinux-9'
           - 'rockylinux-8'
+          - 'rockylinux-9'
         suite:
           - 'default'
           - 'all'
       fail-fast: false
 
     steps:
       - name: Check out code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
       - name: Install Chef
-        uses: actionshub/chef-install@main
+        uses: actionshub/chef-install@2.0.4
       - name: Dokken
-        uses: actionshub/test-kitchen@main
+        uses: actionshub/test-kitchen@2.1.0
         env:
           CHEF_LICENSE: accept-no-persist
           KITCHEN_LOCAL_YAML: kitchen.dokken.yml

diff --git a/.github/workflows/md-links.yml b/.github/workflows/md-links.yml
diff --git a/.github/workflows/stale.yml b/.github/workflows/stale.yml
@@ -8,7 +8,7 @@ jobs:
   stale:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/stale@v3
+      - uses: actions/stale@v8
         with:
           repo-token: ${{ secrets.GITHUB_TOKEN }}
           close-issue-message: >

diff --git a/.markdownlint-cli2.yaml b/.markdownlint-cli2.yaml
@@ -0,0 +1,5 @@
+config:
+  ul-indent: false # MD007
+  line-length: false # MD013
+  no-duplicate-heading: false # MD024
+  reference-links-images: false # MD052
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,8 +4,13 @@ This file is used to list changes made in each version of the yum-epel cookbook.
 
 ## Unreleased
 
+- Remove EPEL Modular
+- Add support for Amazon Linux 2023
+
 ## 4.5.1 - *2023-04-13*
 
+- Add renovate.json
+
 ## 4.5.0 - *2022-06-03*
 
 - Remove epel-playground per upstream removal

diff --git a/README.md b/README.md
@@ -12,26 +12,20 @@ The yum-epel cookbook takes over management of the default repositoryids shipped
 
 Below is a table showing which repositoryids we manage that are shipped by default via the epel-release package:
 
-| Repo ID                        | EL 7             | EL 8             | CentOS Stream 8  |
-| ------------------------------ | :--------------: | :--------------: | :--------------: |
-| epel                           |:heavy_check_mark:|:heavy_check_mark:|:heavy_check_mark:|
-| epel-debuginfo                 |:heavy_check_mark:|:heavy_check_mark:|:heavy_check_mark:|
-| epel-modular                   |       :x:        |:heavy_check_mark:|:heavy_check_mark:|
-| epel-modular-debuginfo         |       :x:        |:heavy_check_mark:|:heavy_check_mark:|
-| epel-modular-source            |       :x:        |:heavy_check_mark:|:heavy_check_mark:|
-| epel-next                      |       :x:        |       :x:        |:heavy_check_mark:|
-| epel-next-debuginfo            |       :x:        |       :x:        |:heavy_check_mark:|
-| epel-next-source               |       :x:        |       :x:        |:heavy_check_mark:|
-| epel-next-testing              |       :x:        |       :x:        |:heavy_check_mark:|
-| epel-next-testing-debug        |       :x:        |       :x:        |:heavy_check_mark:|
-| epel-next-testing-source       |       :x:        |       :x:        |:heavy_check_mark:|
-| epel-source                    |:heavy_check_mark:|:heavy_check_mark:|:heavy_check_mark:|
-| epel-testing                   |:heavy_check_mark:|:heavy_check_mark:|:heavy_check_mark:|
-| epel-testing-debuginfo         |:heavy_check_mark:|:heavy_check_mark:|:heavy_check_mark:|
-| epel-testing-modular           |       :x:        |:heavy_check_mark:|:heavy_check_mark:|
-| epel-testing-modular-debuginfo |       :x:        |:heavy_check_mark:|:heavy_check_mark:|
-| epel-testing-modular-source    |       :x:        |:heavy_check_mark:|:heavy_check_mark:|
-| epel-testing-source            |:heavy_check_mark:|:heavy_check_mark:|:heavy_check_mark:|
+| Repo ID                        | EL 7             | EL 8             | EL 9             | CentOS Stream 8  | CentOS Stream 9  |
+| ------------------------------ | :--------------: | :--------------: | :--------------: | :--------------: | :--------------: |
+| epel                           |:heavy_check_mark:|:heavy_check_mark:|:heavy_check_mark:|:heavy_check_mark:|:heavy_check_mark:|
+| epel-debuginfo                 |:heavy_check_mark:|:heavy_check_mark:|:heavy_check_mark:|:heavy_check_mark:|:heavy_check_mark:|
+| epel-next                      |       :x:        |       :x:        |       :x:        |:heavy_check_mark:|:heavy_check_mark:|
+| epel-next-debuginfo            |       :x:        |       :x:        |       :x:        |:heavy_check_mark:|:heavy_check_mark:|
+| epel-next-source               |       :x:        |       :x:        |       :x:        |:heavy_check_mark:|:heavy_check_mark:|
+| epel-next-testing              |       :x:        |       :x:        |       :x:        |:heavy_check_mark:|:heavy_check_mark:|
+| epel-next-testing-debug        |       :x:        |       :x:        |       :x:        |:heavy_check_mark:|:heavy_check_mark:|
+| epel-next-testing-source       |       :x:        |       :x:        |       :x:        |:heavy_check_mark:|:heavy_check_mark:|
+| epel-source                    |:heavy_check_mark:|:heavy_check_mark:|:heavy_check_mark:|:heavy_check_mark:|:heavy_check_mark:|
+| epel-testing                   |:heavy_check_mark:|:heavy_check_mark:|:heavy_check_mark:|:heavy_check_mark:|:heavy_check_mark:|
+| epel-testing-debuginfo         |:heavy_check_mark:|:heavy_check_mark:|:heavy_check_mark:|:heavy_check_mark:|:heavy_check_mark:|
+| epel-testing-source            |:heavy_check_mark:|:heavy_check_mark:|:heavy_check_mark:|:heavy_check_mark:|:heavy_check_mark:|
 
 ## Requirements
 
@@ -63,7 +57,7 @@ See individual repository attribute files for defaults.
 
 To disable the epel repository through a Role or Environment definition
 
-```
+```ruby
 default_attributes(
   :yum => {
     :epel => {

diff --git a/attributes/default.rb b/attributes/default.rb
@@ -1,7 +1,7 @@
 default['yum-epel']['repos'] =
   value_for_platform(
     %w(almalinux redhat centos oracle rocky) => {
-      '>= 8.0' => epel_8_repos,
+      '>= 8.0' => epel_repos,
       '~> 7.0' =>
         %w(
           epel

diff --git a/attributes/epel-debuginfo.rb b/attributes/epel-debuginfo.rb
@@ -1,14 +1,10 @@
 default['yum']['epel-debuginfo']['repositoryid'] = 'epel-debuginfo'
-
-if platform?('amazon')
-  default['yum']['epel-debuginfo']['description'] = 'Extra Packages for 7 - $basearch - Debug'
-  default['yum']['epel-debuginfo']['mirrorlist'] = 'https://mirrors.fedoraproject.org/mirrorlist?repo=epel-debug-7&arch=$basearch'
-  default['yum']['epel-debuginfo']['gpgkey'] = 'https://download.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-7'
-else
-  default['yum']['epel-debuginfo']['description'] = "Extra Packages for #{node['platform_version'].to_i} - $basearch - Debug"
-  default['yum']['epel-debuginfo']['mirrorlist'] = "https://mirrors.fedoraproject.org/mirrorlist?repo=epel-debug-#{node['platform_version'].to_i}&arch=$basearch"
-  default['yum']['epel-debuginfo']['gpgkey'] = "https://download.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-#{node['platform_version'].to_i}"
-end
+default['yum']['epel-debuginfo']['description'] =
+  "Extra Packages for #{yum_epel_release} - $basearch - Debug"
+default['yum']['epel-debuginfo']['mirrorlist'] =
+  "https://mirrors.fedoraproject.org/mirrorlist?repo=epel-debug-#{yum_epel_release}&arch=$basearch"
+default['yum']['epel-debuginfo']['gpgkey'] =
+  "https://download.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-#{yum_epel_release}"
 default['yum']['epel-debuginfo']['gpgcheck'] = true
 default['yum']['epel-debuginfo']['enabled'] = false
 default['yum']['epel-debuginfo']['managed'] = false

diff --git a/attributes/epel-modular-debuginfo.rb b/attributes/epel-modular-debuginfo.rb
diff --git a/attributes/epel-modular-source.rb b/attributes/epel-modular-source.rb
diff --git a/attributes/epel-modular.rb b/attributes/epel-modular.rb
diff --git a/attributes/epel-next-debuginfo.rb b/attributes/epel-next-debuginfo.rb
@@ -1,10 +1,10 @@
 default['yum']['epel-next-debuginfo']['repositoryid'] = 'epel-next-debuginfo'
 default['yum']['epel-next-debuginfo']['description'] =
-  "Extra Packages for #{node['platform_version'].to_i} - $basearch - Next - Debug"
+  "Extra Packages for #{yum_epel_release} - $basearch - Next - Debug"
 default['yum']['epel-next-debuginfo']['mirrorlist'] =
-  "https://mirrors.fedoraproject.org/mirrorlist?repo=epel-next-debug-#{node['platform_version'].to_i}&arch=$basearch"
+  "https://mirrors.fedoraproject.org/mirrorlist?repo=epel-next-debug-#{yum_epel_release}&arch=$basearch"
 default['yum']['epel-next-debuginfo']['gpgkey'] =
-  "https://download.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-#{node['platform_version'].to_i}"
+  "https://download.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-#{yum_epel_release}"
 default['yum']['epel-next-debuginfo']['gpgcheck'] = true
 default['yum']['epel-next-debuginfo']['enabled'] = false
 default['yum']['epel-next-debuginfo']['managed'] = false

diff --git a/attributes/epel-next-source.rb b/attributes/epel-next-source.rb
@@ -1,10 +1,10 @@
 default['yum']['epel-next-source']['repositoryid'] = 'epel-next-source'
 default['yum']['epel-next-source']['description'] =
-  "Extra Packages for #{node['platform_version'].to_i} $basearch - Next -Source"
+  "Extra Packages for #{yum_epel_release} $basearch - Next -Source"
 default['yum']['epel-next-source']['mirrorlist'] =
-  "https://mirrors.fedoraproject.org/mirrorlist?repo=epel-next-source-#{node['platform_version'].to_i}&arch=$basearch"
+  "https://mirrors.fedoraproject.org/mirrorlist?repo=epel-next-source-#{yum_epel_release}&arch=$basearch"
 default['yum']['epel-next-source']['gpgkey'] =
-  "https://download.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-#{node['platform_version'].to_i}"
+  "https://download.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-#{yum_epel_release}"
 default['yum']['epel-next-source']['gpgcheck'] = true
 default['yum']['epel-next-source']['enabled'] = false
 default['yum']['epel-next-source']['managed'] = false

diff --git a/attributes/epel-next-testing-debuginfo.rb b/attributes/epel-next-testing-debuginfo.rb
@@ -1,10 +1,10 @@
 default['yum']['epel-next-testing-debuginfo']['repositoryid'] = 'epel-next-testing-debuginfo'
 default['yum']['epel-next-testing-debuginfo']['description'] =
-  "Extra Packages for #{node['platform_version'].to_i} - $basearch - Next - Testing Debug"
+  "Extra Packages for #{yum_epel_release} - $basearch - Next - Testing Debug"
 default['yum']['epel-next-testing-debuginfo']['mirrorlist'] =
-  "https://mirrors.fedoraproject.org/mirrorlist?repo=epel-testing-next-debug-#{node['platform_version'].to_i}&arch=$basearch"
+  "https://mirrors.fedoraproject.org/mirrorlist?repo=epel-testing-next-debug-#{yum_epel_release}&arch=$basearch"
 default['yum']['epel-next-testing-debuginfo']['gpgkey'] =
-  "https://download.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-#{node['platform_version'].to_i}"
+  "https://download.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-#{yum_epel_release}"
 default['yum']['epel-next-testing-debuginfo']['gpgcheck'] = true
 default['yum']['epel-next-testing-debuginfo']['enabled'] = false
 default['yum']['epel-next-testing-debuginfo']['managed'] = false

diff --git a/attributes/epel-next-testing-source.rb b/attributes/epel-next-testing-source.rb
@@ -1,10 +1,10 @@
 default['yum']['epel-next-testing-source']['repositoryid'] = 'epel-next-testing-source'
 default['yum']['epel-next-testing-source']['description'] =
-  "Extra Packages for #{node['platform_version'].to_i} - $basearch - Next - Testing Source"
+  "Extra Packages for #{yum_epel_release} - $basearch - Next - Testing Source"
 default['yum']['epel-next-testing-source']['mirrorlist'] =
-  "https://mirrors.fedoraproject.org/mirrorlist?repo=testing-source-epel#{node['platform_version'].to_i}&arch=$basearch"
+  "https://mirrors.fedoraproject.org/mirrorlist?repo=testing-source-epel#{yum_epel_release}&arch=$basearch"
 default['yum']['epel-next-testing-source']['gpgkey'] =
-  "https://download.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-#{node['platform_version'].to_i}"
+  "https://download.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-#{yum_epel_release}"
 default['yum']['epel-next-testing-source']['gpgcheck'] = true
 default['yum']['epel-next-testing-source']['enabled'] = false
 default['yum']['epel-next-testing-source']['managed'] = false

diff --git a/attributes/epel-next-testing.rb b/attributes/epel-next-testing.rb
@@ -1,10 +1,10 @@
 default['yum']['epel-next-testing']['repositoryid'] = 'epel-next-testing'
 default['yum']['epel-next-testing']['description'] =
-  "Extra Packages for #{node['platform_version'].to_i} - $basearch - Next - Testing"
+  "Extra Packages for #{yum_epel_release} - $basearch - Next - Testing"
 default['yum']['epel-next-testing']['mirrorlist'] =
-  "https://mirrors.fedoraproject.org/mirrorlist?repo=epel-testing-next-#{node['platform_version'].to_i}&arch=$basearch"
+  "https://mirrors.fedoraproject.org/mirrorlist?repo=epel-testing-next-#{yum_epel_release}&arch=$basearch"
 default['yum']['epel-next-testing']['gpgkey'] =
-  "https://download.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-#{node['platform_version'].to_i}"
+  "https://download.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-#{yum_epel_release}"
 default['yum']['epel-next-testing']['gpgcheck'] = true
 default['yum']['epel-next-testing']['enabled'] = false
 default['yum']['epel-next-testing']['managed'] = false

diff --git a/attributes/epel-next.rb b/attributes/epel-next.rb
@@ -2,9 +2,9 @@
 default['yum']['epel-next']['gpgcheck'] = true
 default['yum']['epel-next']['description'] = 'Extra Packages for $releasever - Next - $basearch'
 default['yum']['epel-next']['mirrorlist'] =
-  "https://mirrors.fedoraproject.org/mirrorlist?repo=epel-next-#{node['platform_version'].to_i}&arch=$basearch"
+  "https://mirrors.fedoraproject.org/mirrorlist?repo=epel-next-#{yum_epel_release}&arch=$basearch"
 default['yum']['epel-next']['gpgkey'] =
-  "https://download.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-#{node['platform_version'].to_i}"
+  "https://download.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-#{yum_epel_release}"
 default['yum']['epel-next']['enabled'] = true
 default['yum']['epel-next']['managed'] = true
 default['yum']['epel-next']['make_cache'] = true
diff --git a/attributes/epel-source.rb b/attributes/epel-source.rb
@@ -1,14 +1,10 @@
 default['yum']['epel-source']['repositoryid'] = 'epel-source'
-
-if platform?('amazon')
-  default['yum']['epel-source']['description'] = 'Extra Packages for 7 - $basearch - Source'
-  default['yum']['epel-source']['mirrorlist'] = 'https://mirrors.fedoraproject.org/mirrorlist?repo=epel-source-7&arch=$basearch'
-  default['yum']['epel-source']['gpgkey'] = 'https://download.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-7'
-else
-  default['yum']['epel-source']['description'] = "Extra Packages for #{node['platform_version'].to_i} - $basearch - Source"
-  default['yum']['epel-source']['mirrorlist'] = "https://mirrors.fedoraproject.org/mirrorlist?repo=epel-source-#{node['platform_version'].to_i}&arch=$basearch"
-  default['yum']['epel-source']['gpgkey'] = "https://download.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-#{node['platform_version'].to_i}"
-end
+default['yum']['epel-source']['description'] =
+  "Extra Packages for #{yum_epel_release} - $basearch - Source"
+default['yum']['epel-source']['mirrorlist'] =
+  "https://mirrors.fedoraproject.org/mirrorlist?repo=epel-source-#{yum_epel_release}&arch=$basearch"
+default['yum']['epel-source']['gpgkey'] =
+  "https://download.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-#{yum_epel_release}"
 default['yum']['epel-source']['gpgcheck'] = true
 default['yum']['epel-source']['enabled'] = false
 default['yum']['epel-source']['managed'] = false

diff --git a/attributes/epel-testing-debuginfo.rb b/attributes/epel-testing-debuginfo.rb
@@ -1,14 +1,10 @@
 default['yum']['epel-testing-debuginfo']['repositoryid'] = 'epel-testing-debuginfo'
-
-if platform?('amazon')
-  default['yum']['epel-testing-debuginfo']['description'] = 'Extra Packages for 7 - $basearch - Testing Debug'
-  default['yum']['epel-testing-debuginfo']['mirrorlist'] = 'https://mirrors.fedoraproject.org/mirrorlist?repo=testing-debug-epel7&arch=$basearch'
-  default['yum']['epel-testing-debuginfo']['gpgkey'] = 'https://download.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-7'
-else
-  default['yum']['epel-testing-debuginfo']['description'] = "Extra Packages for #{node['platform_version'].to_i} - $basearch - Testing Debug"
-  default['yum']['epel-testing-debuginfo']['mirrorlist'] = "https://mirrors.fedoraproject.org/mirrorlist?repo=testing-debug-epel#{node['platform_version'].to_i}&arch=$basearch"
-  default['yum']['epel-testing-debuginfo']['gpgkey'] = "https://download.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-#{node['platform_version'].to_i}"
-end
+default['yum']['epel-testing-debuginfo']['description'] =
+  "Extra Packages for #{yum_epel_release} - $basearch - Testing Debug"
+default['yum']['epel-testing-debuginfo']['mirrorlist'] =
+  "https://mirrors.fedoraproject.org/mirrorlist?repo=testing-debug-epel#{yum_epel_release}&arch=$basearch"
+default['yum']['epel-testing-debuginfo']['gpgkey'] =
+  "https://download.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-#{yum_epel_release}"
 default['yum']['epel-testing-debuginfo']['gpgcheck'] = true
 default['yum']['epel-testing-debuginfo']['enabled'] = false
 default['yum']['epel-testing-debuginfo']['managed'] = false

diff --git a/attributes/epel-testing-modular-debuginfo.rb b/attributes/epel-testing-modular-debuginfo.rb