diff --git a/Berksfile b/Berksfile index 5d0c3eedf..240e6d3a3 100644 --- a/Berksfile +++ b/Berksfile @@ -15,7 +15,7 @@ cookbook "openssh", path: "./cookbooks/third-party/openssh-2.11.3" cookbook "pyenv", path: "./cookbooks/third-party/pyenv-4.2.3" cookbook "selinux", path: "./cookbooks/third-party/selinux-6.1.12" cookbook "yum", path: "./cookbooks/third-party/yum-7.4.13" -cookbook "yum-epel", path: "./cookbooks/third-party/yum-epel-4.5.0" +cookbook "yum-epel", path: "./cookbooks/third-party/yum-epel-5.0.2" cookbook "aws-parallelcluster-awsbatch", path: "./cookbooks/aws-parallelcluster-awsbatch" cookbook "aws-parallelcluster-computefleet", path: "./cookbooks/aws-parallelcluster-computefleet" diff --git a/CHANGELOG.md b/CHANGELOG.md index cafea4a60..660bd30e6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -15,6 +15,7 @@ This file is used to list changes made in each version of the AWS ParallelCluste - openssh-2.11.3 (from openssh-2.10.3) - pyenv-4.2.3 (from pyenv-3.5.1) - selinux-6.1.12 (from selinux-6.0.5) + - yum-7.4.13 (from yum-7.4.0) **BUG FIXES** @@ -52,6 +53,7 @@ This file is used to list changes made in each version of the AWS ParallelCluste - pyenv-4.2.3 (from pyenv-3.5.1) - selinux-6.1.12 (from selinux-6.0.5) - yum-7.4.13 (from yum-7.4.0) + - yum-epel-5.0.2 (from yum-epel-4.5.0) **BUG FIXES** - Fix cluster creation failure with Ubuntu Deep Learning AMI on GPU instances and DCV enabled. diff --git a/cookbooks/aws-parallelcluster-awsbatch/Berksfile b/cookbooks/aws-parallelcluster-awsbatch/Berksfile index 8ef487df1..0091cc5c7 100644 --- a/cookbooks/aws-parallelcluster-awsbatch/Berksfile +++ b/cookbooks/aws-parallelcluster-awsbatch/Berksfile @@ -20,4 +20,4 @@ cookbook "openssh", path: "../third-party/openssh-2.11.3" cookbook "pyenv", path: "../third-party/pyenv-4.2.3" cookbook "selinux", path: "../third-party/selinux-6.1.12" cookbook "yum", path: "../third-party/yum-7.4.13" -cookbook "yum-epel", path: "../third-party/yum-epel-4.5.0" +cookbook "yum-epel", path: "../third-party/yum-epel-5.0.2" diff --git a/cookbooks/aws-parallelcluster-awsbatch/metadata.rb b/cookbooks/aws-parallelcluster-awsbatch/metadata.rb index 633fdc052..8e2d9fdc1 100644 --- a/cookbooks/aws-parallelcluster-awsbatch/metadata.rb +++ b/cookbooks/aws-parallelcluster-awsbatch/metadata.rb @@ -21,5 +21,5 @@ depends 'pyenv', '~> 4.2.3' depends 'selinux', '~> 6.1.12' depends 'yum', '~> 7.4.13' -depends 'yum-epel', '~> 4.5.0' +depends 'yum-epel', '~> 5.0.2' depends 'aws-parallelcluster-shared', '~> 3.7.0' diff --git a/cookbooks/aws-parallelcluster-computefleet/Berksfile b/cookbooks/aws-parallelcluster-computefleet/Berksfile index b6e5202c3..647a2463c 100644 --- a/cookbooks/aws-parallelcluster-computefleet/Berksfile +++ b/cookbooks/aws-parallelcluster-computefleet/Berksfile @@ -7,4 +7,4 @@ cookbook "aws-parallelcluster-shared", path: "../aws-parallelcluster-shared" # for shared cookbook cookbook "pyenv", path: "../third-party/pyenv-4.2.3" cookbook "yum", path: "../third-party/yum-7.4.13" -cookbook "yum-epel", path: "../third-party/yum-epel-4.5.0" +cookbook "yum-epel", path: "../third-party/yum-epel-5.0.2" diff --git a/cookbooks/aws-parallelcluster-entrypoints/Berksfile b/cookbooks/aws-parallelcluster-entrypoints/Berksfile index a47d84c40..e6168584b 100644 --- a/cookbooks/aws-parallelcluster-entrypoints/Berksfile +++ b/cookbooks/aws-parallelcluster-entrypoints/Berksfile @@ -17,7 +17,7 @@ cookbook "openssh", path: "../third-party/openssh-2.11.3" cookbook "pyenv", path: "../third-party/pyenv-4.2.3" cookbook "selinux", path: "../third-party/selinux-6.1.12" cookbook "yum", path: "../third-party/yum-7.4.13" -cookbook "yum-epel", path: "../third-party/yum-epel-4.5.0" +cookbook "yum-epel", path: "../third-party/yum-epel-5.0.2" group :integration do cookbook 'aws-parallelcluster-tests', path: '../aws-parallelcluster-tests' diff --git a/cookbooks/aws-parallelcluster-environment/Berksfile b/cookbooks/aws-parallelcluster-environment/Berksfile index e99115ae4..dfad50e05 100644 --- a/cookbooks/aws-parallelcluster-environment/Berksfile +++ b/cookbooks/aws-parallelcluster-environment/Berksfile @@ -12,4 +12,4 @@ cookbook "line", path: "../third-party/line-4.5.13" # for shared cookbook cookbook "pyenv", path: "../third-party/pyenv-4.2.3" cookbook "yum", path: "../third-party/yum-7.4.13" -cookbook "yum-epel", path: "../third-party/yum-epel-4.5.0" +cookbook "yum-epel", path: "../third-party/yum-epel-5.0.2" diff --git a/cookbooks/aws-parallelcluster-platform/Berksfile b/cookbooks/aws-parallelcluster-platform/Berksfile index b4d58e9ed..581b1b3be 100644 --- a/cookbooks/aws-parallelcluster-platform/Berksfile +++ b/cookbooks/aws-parallelcluster-platform/Berksfile @@ -10,4 +10,4 @@ cookbook "selinux", path: "../third-party/selinux-6.1.12" # for shared cookbook cookbook "pyenv", path: "../third-party/pyenv-4.2.3" cookbook "yum", path: "../third-party/yum-7.4.13" -cookbook "yum-epel", path: "../third-party/yum-epel-4.5.0" +cookbook "yum-epel", path: "../third-party/yum-epel-5.0.2" diff --git a/cookbooks/aws-parallelcluster-shared/Berksfile b/cookbooks/aws-parallelcluster-shared/Berksfile index abfca9160..4d15ee95e 100644 --- a/cookbooks/aws-parallelcluster-shared/Berksfile +++ b/cookbooks/aws-parallelcluster-shared/Berksfile @@ -6,4 +6,4 @@ metadata cookbook "pyenv", path: "../third-party/pyenv-4.2.3" cookbook "yum", path: "../third-party/yum-7.4.13" -cookbook "yum-epel", path: "../third-party/yum-epel-4.5.0" +cookbook "yum-epel", path: "../third-party/yum-epel-5.0.2" diff --git a/cookbooks/aws-parallelcluster-shared/metadata.rb b/cookbooks/aws-parallelcluster-shared/metadata.rb index fe4d06cda..52fef216b 100644 --- a/cookbooks/aws-parallelcluster-shared/metadata.rb +++ b/cookbooks/aws-parallelcluster-shared/metadata.rb @@ -16,4 +16,4 @@ depends 'pyenv', '~> 4.2.3' depends 'yum', '~> 7.4.13' -depends 'yum-epel', '~> 4.5.0' +depends 'yum-epel', '~> 5.0.2' diff --git a/cookbooks/aws-parallelcluster-slurm/Berksfile b/cookbooks/aws-parallelcluster-slurm/Berksfile index a9cfa045a..fa669f72a 100644 --- a/cookbooks/aws-parallelcluster-slurm/Berksfile +++ b/cookbooks/aws-parallelcluster-slurm/Berksfile @@ -14,4 +14,4 @@ cookbook "openssh", path: "../third-party/openssh-2.11.3" cookbook "pyenv", path: "../third-party/pyenv-4.2.3" cookbook "selinux", path: "../third-party/selinux-6.1.12" cookbook "yum", path: "../third-party/yum-7.4.13" -cookbook "yum-epel", path: "../third-party/yum-epel-4.5.0" +cookbook "yum-epel", path: "../third-party/yum-epel-5.0.2" diff --git a/cookbooks/aws-parallelcluster-slurm/metadata.rb b/cookbooks/aws-parallelcluster-slurm/metadata.rb index 70bc823f6..d7aeb73c1 100644 --- a/cookbooks/aws-parallelcluster-slurm/metadata.rb +++ b/cookbooks/aws-parallelcluster-slurm/metadata.rb @@ -21,7 +21,7 @@ depends 'pyenv', '~> 4.2.3' depends 'selinux', '~> 6.1.12' depends 'yum', '~> 7.4.13' -depends 'yum-epel', '~> 4.5.0' +depends 'yum-epel', '~> 5.0.2' depends 'aws-parallelcluster-computefleet', '~> 3.7.0' depends 'aws-parallelcluster-environment', '~> 3.7.0' depends 'aws-parallelcluster-shared', '~> 3.7.0' diff --git a/cookbooks/third-party/yum-epel-4.5.0/.circleci/config.yml b/cookbooks/third-party/yum-epel-4.5.0/.circleci/config.yml deleted file mode 100644 index 8af810ef5..000000000 --- a/cookbooks/third-party/yum-epel-4.5.0/.circleci/config.yml +++ /dev/null @@ -1,10 +0,0 @@ ---- -version: 2.1 -orbs: - kitchen: sous-chefs/kitchen@2 -workflows: - danger: - jobs: - - kitchen/danger: - name: danger - context: Danger-Minimal diff --git a/cookbooks/third-party/yum-epel-4.5.0/.editorconfig b/cookbooks/third-party/yum-epel-4.5.0/.editorconfig deleted file mode 100755 index cc21b0460..000000000 --- a/cookbooks/third-party/yum-epel-4.5.0/.editorconfig +++ /dev/null @@ -1,19 +0,0 @@ -# https://EditorConfig.org - -# top-most EditorConfig file -root=true - -# Unix-style newlines with a newline ending every file -[*] -end_of_line = lf -insert_final_newline = true - -# 2 space indentation -indent_style = space -indent_size = 2 - -# Avoid issues parsing cookbook files later -charset = utf-8 - -# Avoid cookstyle warnings -trim_trailing_whitespace = true diff --git a/cookbooks/third-party/yum-epel-4.5.0/.envrc b/cookbooks/third-party/yum-epel-4.5.0/.envrc deleted file mode 100644 index 6ed589ea8..000000000 --- a/cookbooks/third-party/yum-epel-4.5.0/.envrc +++ /dev/null @@ -1 +0,0 @@ -use chefworkstation diff --git a/cookbooks/third-party/yum-epel-4.5.0/.gitattributes b/cookbooks/third-party/yum-epel-4.5.0/.gitattributes deleted file mode 100644 index 6313b56c5..000000000 --- a/cookbooks/third-party/yum-epel-4.5.0/.gitattributes +++ /dev/null @@ -1 +0,0 @@ -* text=auto eol=lf diff --git a/cookbooks/third-party/yum-epel-4.5.0/.github/CODEOWNERS b/cookbooks/third-party/yum-epel-4.5.0/.github/CODEOWNERS deleted file mode 100644 index 7cc52a972..000000000 --- a/cookbooks/third-party/yum-epel-4.5.0/.github/CODEOWNERS +++ /dev/null @@ -1 +0,0 @@ -* @sous-chefs/maintainers diff --git a/cookbooks/third-party/yum-epel-4.5.0/.github/workflows/ci.yml b/cookbooks/third-party/yum-epel-4.5.0/.github/workflows/ci.yml deleted file mode 100644 index f94022027..000000000 --- a/cookbooks/third-party/yum-epel-4.5.0/.github/workflows/ci.yml +++ /dev/null @@ -1,44 +0,0 @@ ---- -name: ci - -"on": - pull_request: - push: - branches: - - main - -jobs: - lint-unit: - uses: sous-chefs/.github/.github/workflows/lint-unit.yml@0.0.3 - - integration: - needs: 'lint-unit' - runs-on: ubuntu-latest - strategy: - matrix: - os: - - 'almalinux-8' - - 'amazonlinux-2' - - 'centos-7' - - 'centos-stream-8' - - 'oraclelinux-7' - - 'oraclelinux-8' - - 'rockylinux-8' - suite: - - 'default' - - 'all' - fail-fast: false - - steps: - - name: Check out code - uses: actions/checkout@v2 - - name: Install Chef - uses: actionshub/chef-install@main - - name: Dokken - uses: actionshub/test-kitchen@main - env: - CHEF_LICENSE: accept-no-persist - KITCHEN_LOCAL_YAML: kitchen.dokken.yml - with: - suite: ${{ matrix.suite }} - os: ${{ matrix.os }} diff --git a/cookbooks/third-party/yum-epel-4.5.0/.github/workflows/md-links.yml b/cookbooks/third-party/yum-epel-4.5.0/.github/workflows/md-links.yml deleted file mode 100644 index ba887a169..000000000 --- a/cookbooks/third-party/yum-epel-4.5.0/.github/workflows/md-links.yml +++ /dev/null @@ -1,19 +0,0 @@ ---- -name: md-links - -"on": - pull_request: - push: - branches: [main] - -jobs: - md-links: - runs-on: ubuntu-latest - steps: - - name: Check out code - uses: actions/checkout@v2 - - name: markdown-link-check - uses: gaurav-nelson/github-action-markdown-link-check@v1 - with: - use-verbose-mode: "yes" - folder-path: "documentation" diff --git a/cookbooks/third-party/yum-epel-4.5.0/.github/workflows/stale.yml b/cookbooks/third-party/yum-epel-4.5.0/.github/workflows/stale.yml deleted file mode 100644 index 9e2ff38e4..000000000 --- a/cookbooks/third-party/yum-epel-4.5.0/.github/workflows/stale.yml +++ /dev/null @@ -1,25 +0,0 @@ ---- -name: Mark stale issues and pull requests - -"on": - schedule: [cron: "0 0 * * *"] - -jobs: - stale: - runs-on: ubuntu-latest - steps: - - uses: actions/stale@v3 - with: - repo-token: ${{ secrets.GITHUB_TOKEN }} - close-issue-message: > - Closing due to inactivity. - If this is still an issue please reopen or open another issue. - Alternatively drop by the #sous-chefs channel on the [Chef Community Slack](http://community-slack.chef.io/) and we'll be happy to help! - Thanks, Sous-Chefs. - days-before-close: 7 - days-before-stale: 365 - stale-issue-message: > - Marking stale due to inactivity. - Remove stale label or comment or this will be closed in 7 days. - Alternatively drop by the #sous-chefs channel on the [Chef Community Slack](http://community-slack.chef.io/) and we'll be happy to help! - Thanks, Sous-Chefs. diff --git a/cookbooks/third-party/yum-epel-4.5.0/.gitignore b/cookbooks/third-party/yum-epel-4.5.0/.gitignore deleted file mode 100644 index be3b9a8bc..000000000 --- a/cookbooks/third-party/yum-epel-4.5.0/.gitignore +++ /dev/null @@ -1,49 +0,0 @@ -*.rbc -.config -InstalledFiles -pkg -test/tmp -test/version_tmp -tmp -_Store -*~ -*# -.#* -\#*# -*.un~ -*.tmp -*.bk -*.bkup - -# editor files -.idea -.*.sw[a-z] - -# ruby/bundler/rspec files -.ruby-version -.ruby-gemset -.rvmrc -Gemfile.lock -.bundle -*.gem -coverage -spec/reports - -# YARD / rdoc artifacts -.yardoc -_yardoc -doc/ -rdoc - -# chef infra stuff -Berksfile.lock -.kitchen -kitchen.local.yml -vendor/ -.coverage/ -.zero-knife.rb -Policyfile.lock.json - -# vagrant stuff -.vagrant/ -.vagrant.d/ diff --git a/cookbooks/third-party/yum-epel-4.5.0/.mdlrc b/cookbooks/third-party/yum-epel-4.5.0/.mdlrc deleted file mode 100644 index 9cc2c6322..000000000 --- a/cookbooks/third-party/yum-epel-4.5.0/.mdlrc +++ /dev/null @@ -1 +0,0 @@ -rules "~MD013", "~MD024", "~MD025" diff --git a/cookbooks/third-party/yum-epel-4.5.0/.overcommit.yml b/cookbooks/third-party/yum-epel-4.5.0/.overcommit.yml deleted file mode 100644 index cd8682a0c..000000000 --- a/cookbooks/third-party/yum-epel-4.5.0/.overcommit.yml +++ /dev/null @@ -1,16 +0,0 @@ ---- -PreCommit: - TrailingWhitespace: - enabled: true - YamlLint: - enabled: true - Rspec: - enabled: true - required_executable: 'rspec' - Cookstyle: - enabled: true - required_executable: 'cookstyle' - command: ["cookstyle"] -CommitMsg: - HardTabs: - enabled: true diff --git a/cookbooks/third-party/yum-epel-4.5.0/.yamllint b/cookbooks/third-party/yum-epel-4.5.0/.yamllint deleted file mode 100644 index 1b5cea097..000000000 --- a/cookbooks/third-party/yum-epel-4.5.0/.yamllint +++ /dev/null @@ -1,13 +0,0 @@ ---- -extends: default -rules: - line-length: - max: 256 - level: warning - document-start: disable - braces: - forbid: false - min-spaces-inside: 0 - max-spaces-inside: 1 - min-spaces-inside-empty: -1 - max-spaces-inside-empty: -1 diff --git a/cookbooks/third-party/yum-epel-4.5.0/Gemfile b/cookbooks/third-party/yum-epel-4.5.0/Gemfile deleted file mode 100644 index 7938c74fc..000000000 --- a/cookbooks/third-party/yum-epel-4.5.0/Gemfile +++ /dev/null @@ -1,9 +0,0 @@ -# This gemfile provides additional gems for testing and releasing this cookbook -# It is meant to be installed on top of ChefDK / Chef Workstation which provide the majority -# of the necessary gems for testing this cookbook -# -# Run 'chef exec bundle install' to install these dependencies - -source 'https://rubygems.org' - -gem 'community_cookbook_releaser' diff --git a/cookbooks/third-party/yum-epel-4.5.0/attributes/epel-debuginfo.rb b/cookbooks/third-party/yum-epel-4.5.0/attributes/epel-debuginfo.rb deleted file mode 100644 index 01b9b1e85..000000000 --- a/cookbooks/third-party/yum-epel-4.5.0/attributes/epel-debuginfo.rb +++ /dev/null @@ -1,15 +0,0 @@ -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']['gpgcheck'] = true -default['yum']['epel-debuginfo']['enabled'] = false -default['yum']['epel-debuginfo']['managed'] = false -default['yum']['epel-debuginfo']['make_cache'] = true diff --git a/cookbooks/third-party/yum-epel-4.5.0/attributes/epel-modular-debuginfo.rb b/cookbooks/third-party/yum-epel-4.5.0/attributes/epel-modular-debuginfo.rb deleted file mode 100644 index 04e9f5214..000000000 --- a/cookbooks/third-party/yum-epel-4.5.0/attributes/epel-modular-debuginfo.rb +++ /dev/null @@ -1,8 +0,0 @@ -default['yum']['epel-modular-debuginfo']['repositoryid'] = 'epel-modular-debuginfo' -default['yum']['epel-modular-debuginfo']['description'] = 'Extra Packages for Enterprise Linux Modular $releasever - $basearch - Debug' -default['yum']['epel-modular-debuginfo']['mirrorlist'] = 'https://mirrors.fedoraproject.org/metalink?repo=epel-modular-debug-$releasever&arch=$basearch&infra=$infra&content=$contentdir' -default['yum']['epel-modular-debuginfo']['gpgkey'] = 'https://download.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-8' -default['yum']['epel-modular-debuginfo']['gpgcheck'] = true -default['yum']['epel-modular-debuginfo']['enabled'] = false -default['yum']['epel-modular-debuginfo']['managed'] = false -default['yum']['epel-modular-debuginfo']['make_cache'] = true diff --git a/cookbooks/third-party/yum-epel-4.5.0/attributes/epel-modular-source.rb b/cookbooks/third-party/yum-epel-4.5.0/attributes/epel-modular-source.rb deleted file mode 100644 index 150e1ebfc..000000000 --- a/cookbooks/third-party/yum-epel-4.5.0/attributes/epel-modular-source.rb +++ /dev/null @@ -1,8 +0,0 @@ -default['yum']['epel-modular-source']['repositoryid'] = 'epel-modular-source' -default['yum']['epel-modular-source']['description'] = 'Extra Packages for Enterprise Linux Modular $releasever - $basearch - Source' -default['yum']['epel-modular-source']['mirrorlist'] = 'https://mirrors.fedoraproject.org/metalink?repo=epel-modular-source-$releasever&arch=$basearch&infra=$infra&content=$contentdir' -default['yum']['epel-modular-source']['gpgkey'] = 'https://download.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-8' -default['yum']['epel-modular-source']['gpgcheck'] = true -default['yum']['epel-modular-source']['enabled'] = false -default['yum']['epel-modular-source']['managed'] = false -default['yum']['epel-modular-source']['make_cache'] = true diff --git a/cookbooks/third-party/yum-epel-4.5.0/attributes/epel-modular.rb b/cookbooks/third-party/yum-epel-4.5.0/attributes/epel-modular.rb deleted file mode 100644 index 9fea914f5..000000000 --- a/cookbooks/third-party/yum-epel-4.5.0/attributes/epel-modular.rb +++ /dev/null @@ -1,8 +0,0 @@ -default['yum']['epel-modular']['repositoryid'] = 'epel-modular' -default['yum']['epel-modular']['description'] = 'Extra Packages for Enterprise Linux Modular $releasever - $basearch' -default['yum']['epel-modular']['mirrorlist'] = 'https://mirrors.fedoraproject.org/metalink?repo=epel-modular-$releasever&arch=$basearch&infra=$infra&content=$contentdir' -default['yum']['epel-modular']['gpgkey'] = 'https://download.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-8' -default['yum']['epel-modular']['gpgcheck'] = true -default['yum']['epel-modular']['enabled'] = false -default['yum']['epel-modular']['managed'] = false -default['yum']['epel-modular']['make_cache'] = true diff --git a/cookbooks/third-party/yum-epel-4.5.0/attributes/epel-source.rb b/cookbooks/third-party/yum-epel-4.5.0/attributes/epel-source.rb deleted file mode 100644 index 6c8998906..000000000 --- a/cookbooks/third-party/yum-epel-4.5.0/attributes/epel-source.rb +++ /dev/null @@ -1,15 +0,0 @@ -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']['gpgcheck'] = true -default['yum']['epel-source']['enabled'] = false -default['yum']['epel-source']['managed'] = false -default['yum']['epel-source']['make_cache'] = true diff --git a/cookbooks/third-party/yum-epel-4.5.0/attributes/epel-testing-debuginfo.rb b/cookbooks/third-party/yum-epel-4.5.0/attributes/epel-testing-debuginfo.rb deleted file mode 100644 index 4330c333e..000000000 --- a/cookbooks/third-party/yum-epel-4.5.0/attributes/epel-testing-debuginfo.rb +++ /dev/null @@ -1,15 +0,0 @@ -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']['gpgcheck'] = true -default['yum']['epel-testing-debuginfo']['enabled'] = false -default['yum']['epel-testing-debuginfo']['managed'] = false -default['yum']['epel-testing-debuginfo']['make_cache'] = true diff --git a/cookbooks/third-party/yum-epel-4.5.0/attributes/epel-testing-modular-debuginfo.rb b/cookbooks/third-party/yum-epel-4.5.0/attributes/epel-testing-modular-debuginfo.rb deleted file mode 100644 index fa938de1c..000000000 --- a/cookbooks/third-party/yum-epel-4.5.0/attributes/epel-testing-modular-debuginfo.rb +++ /dev/null @@ -1,8 +0,0 @@ -default['yum']['epel-testing-modular-debuginfo']['repositoryid'] = 'epel-testing-modular-debuginfo' -default['yum']['epel-testing-modular-debuginfo']['description'] = 'Extra Packages for Enterprise Linux Modular $releasever - Testing - $basearch - Debug' -default['yum']['epel-testing-modular-debuginfo']['mirrorlist'] = 'https://mirrors.fedoraproject.org/metalink?repo=testing-modular-debug-epel$releasever&arch=$basearch&infra=$infra&content=$contentdir' -default['yum']['epel-testing-modular-debuginfo']['gpgkey'] = 'https://download.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-8' -default['yum']['epel-testing-modular-debuginfo']['gpgcheck'] = true -default['yum']['epel-testing-modular-debuginfo']['enabled'] = false -default['yum']['epel-testing-modular-debuginfo']['managed'] = false -default['yum']['epel-testing-modular-debuginfo']['make_cache'] = true diff --git a/cookbooks/third-party/yum-epel-4.5.0/attributes/epel-testing-modular-source.rb b/cookbooks/third-party/yum-epel-4.5.0/attributes/epel-testing-modular-source.rb deleted file mode 100644 index 4a4ae41e5..000000000 --- a/cookbooks/third-party/yum-epel-4.5.0/attributes/epel-testing-modular-source.rb +++ /dev/null @@ -1,8 +0,0 @@ -default['yum']['epel-testing-modular-source']['repositoryid'] = 'epel-testing-modular-source' -default['yum']['epel-testing-modular-source']['description'] = 'Extra Packages for Enterprise Linux Modular $releasever- Testing - $basearch - Source' -default['yum']['epel-testing-modular-source']['mirrorlist'] = 'https://mirrors.fedoraproject.org/metalink?repo=testing-modular-source-epel$releasever&arch=$basearch&infra=$infra&content=$contentdir' -default['yum']['epel-testing-modular-source']['gpgkey'] = 'https://download.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-8' -default['yum']['epel-testing-modular-source']['gpgcheck'] = true -default['yum']['epel-testing-modular-source']['enabled'] = false -default['yum']['epel-testing-modular-source']['managed'] = false -default['yum']['epel-testing-modular-source']['make_cache'] = true diff --git a/cookbooks/third-party/yum-epel-4.5.0/attributes/epel-testing-modular.rb b/cookbooks/third-party/yum-epel-4.5.0/attributes/epel-testing-modular.rb deleted file mode 100644 index a707c65fd..000000000 --- a/cookbooks/third-party/yum-epel-4.5.0/attributes/epel-testing-modular.rb +++ /dev/null @@ -1,8 +0,0 @@ -default['yum']['epel-testing-modular']['repositoryid'] = 'epel-testing-modular' -default['yum']['epel-testing-modular']['description'] = 'Extra Packages for Enterprise Linux Modular $releasever - Testing - $basearch' -default['yum']['epel-testing-modular']['mirrorlist'] = 'https://mirrors.fedoraproject.org/metalink?repo=testing-modular-epel$releasever&arch=$basearch&infra=$infra&content=$contentdir' -default['yum']['epel-testing-modular']['gpgkey'] = 'https://download.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-8' -default['yum']['epel-testing-modular']['gpgcheck'] = true -default['yum']['epel-testing-modular']['enabled'] = false -default['yum']['epel-testing-modular']['managed'] = false -default['yum']['epel-testing-modular']['make_cache'] = true diff --git a/cookbooks/third-party/yum-epel-4.5.0/attributes/epel-testing-source.rb b/cookbooks/third-party/yum-epel-4.5.0/attributes/epel-testing-source.rb deleted file mode 100644 index 7da8d249e..000000000 --- a/cookbooks/third-party/yum-epel-4.5.0/attributes/epel-testing-source.rb +++ /dev/null @@ -1,15 +0,0 @@ -default['yum']['epel-testing-source']['repositoryid'] = 'epel-testing-source' - -if platform?('amazon') - default['yum']['epel-testing-source']['description'] = 'Extra Packages for 7 - $basearch - Testing Source' - default['yum']['epel-testing-source']['mirrorlist'] = 'https://mirrors.fedoraproject.org/mirrorlist?repo=testing-source-epel7&arch=$basearch' - default['yum']['epel-testing-source']['gpgkey'] = 'https://download.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-7' -else - default['yum']['epel-testing-source']['description'] = "Extra Packages for #{node['platform_version'].to_i} - $basearch - Testing Source" - default['yum']['epel-testing-source']['mirrorlist'] = "https://mirrors.fedoraproject.org/mirrorlist?repo=testing-source-epel#{node['platform_version'].to_i}&arch=$basearch" - default['yum']['epel-testing-source']['gpgkey'] = "https://download.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-#{node['platform_version'].to_i}" -end -default['yum']['epel-testing-source']['gpgcheck'] = true -default['yum']['epel-testing-source']['enabled'] = false -default['yum']['epel-testing-source']['managed'] = false -default['yum']['epel-testing-source']['make_cache'] = true diff --git a/cookbooks/third-party/yum-epel-4.5.0/attributes/epel-testing.rb b/cookbooks/third-party/yum-epel-4.5.0/attributes/epel-testing.rb deleted file mode 100644 index ae3aa16a4..000000000 --- a/cookbooks/third-party/yum-epel-4.5.0/attributes/epel-testing.rb +++ /dev/null @@ -1,15 +0,0 @@ -default['yum']['epel-testing']['repositoryid'] = 'epel-testing' - -if platform?('amazon') - default['yum']['epel-testing']['description'] = 'Extra Packages for 7 - $basearch - Testing ' - default['yum']['epel-testing']['mirrorlist'] = 'https://mirrors.fedoraproject.org/mirrorlist?repo=testing-epel7&arch=$basearch' - default['yum']['epel-testing']['gpgkey'] = 'https://download.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-7' -else - default['yum']['epel-testing']['description'] = "Extra Packages for #{node['platform_version'].to_i} - $basearch - Testing " - default['yum']['epel-testing']['mirrorlist'] = "https://mirrors.fedoraproject.org/mirrorlist?repo=testing-epel#{node['platform_version'].to_i}&arch=$basearch" - default['yum']['epel-testing']['gpgkey'] = "https://download.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-#{node['platform_version'].to_i}" -end -default['yum']['epel-testing']['gpgcheck'] = true -default['yum']['epel-testing']['enabled'] = false -default['yum']['epel-testing']['managed'] = false -default['yum']['epel-testing']['make_cache'] = true diff --git a/cookbooks/third-party/yum-epel-4.5.0/attributes/epel.rb b/cookbooks/third-party/yum-epel-4.5.0/attributes/epel.rb deleted file mode 100644 index 119296ddc..000000000 --- a/cookbooks/third-party/yum-epel-4.5.0/attributes/epel.rb +++ /dev/null @@ -1,23 +0,0 @@ -default['yum']['epel']['repositoryid'] = 'epel' -default['yum']['epel']['gpgcheck'] = true -case node['kernel']['machine'] -when 'armv7l', 'armv7hl' - default['yum']['epel']['baseurl'] = 'https://armv7.dev.centos.org/repodir/epel-pass-1/' - default['yum']['epel']['gpgcheck'] = false -when 's390x' - default['yum']['epel']['baseurl'] = 'https://kojipkgs.fedoraproject.org/rhel/rc/7/Server/s390x/os/' - default['yum']['epel']['gpgkey'] = 'https://kojipkgs.fedoraproject.org/rhel/rc/7/Server/s390x/os/RPM-GPG-KEY-redhat-release' -else - if platform?('amazon') - default['yum']['epel']['description'] = 'Extra Packages for 7 - $basearch' - default['yum']['epel']['mirrorlist'] = 'https://mirrors.fedoraproject.org/mirrorlist?repo=epel-7&arch=$basearch' - default['yum']['epel']['gpgkey'] = 'https://download.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-7' - else - default['yum']['epel']['description'] = "Extra Packages for #{node['platform_version'].to_i} - $basearch" - default['yum']['epel']['mirrorlist'] = "https://mirrors.fedoraproject.org/mirrorlist?repo=epel-#{node['platform_version'].to_i}&arch=$basearch" - default['yum']['epel']['gpgkey'] = "https://download.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-#{node['platform_version'].to_i}" - end -end -default['yum']['epel']['enabled'] = true -default['yum']['epel']['managed'] = true -default['yum']['epel']['make_cache'] = true diff --git a/cookbooks/third-party/yum-epel-4.5.0/kitchen.dokken.yml b/cookbooks/third-party/yum-epel-4.5.0/kitchen.dokken.yml deleted file mode 100644 index 4b33f8aad..000000000 --- a/cookbooks/third-party/yum-epel-4.5.0/kitchen.dokken.yml +++ /dev/null @@ -1,51 +0,0 @@ -driver: - name: dokken - privileged: true # because Docker and SystemD - chef_version: <%= ENV['CHEF_VERSION'] || 'current' %> - chef_license: accept-no-persist - -transport: - name: dokken - -provisioner: - name: dokken - deprecations_as_errors: true - -verifier: - name: inspec - -platforms: - - name: almalinux-8 - driver: - image: dokken/almalinux-8 - pid_one_command: /usr/lib/systemd/systemd - - - name: amazonlinux-2 - driver: - image: dokken/amazonlinux-2 - pid_one_command: /usr/lib/systemd/systemd - - - name: centos-7 - driver: - image: dokken/centos-7 - pid_one_command: /usr/lib/systemd/systemd - - - name: centos-stream-8 - driver: - image: dokken/centos-stream-8 - pid_one_command: /usr/lib/systemd/systemd - - - name: oraclelinux-7 - driver: - image: dokken/oraclelinux-7 - pid_one_command: /usr/lib/systemd/systemd - - - name: oraclelinux-8 - driver: - image: dokken/oraclelinux-8 - pid_one_command: /usr/lib/systemd/systemd - - - name: rockylinux-8 - driver: - image: dokken/rockylinux-8 - pid_one_command: /usr/lib/systemd/systemd diff --git a/cookbooks/third-party/yum-epel-4.5.0/Berksfile b/cookbooks/third-party/yum-epel-5.0.2/Berksfile similarity index 100% rename from cookbooks/third-party/yum-epel-4.5.0/Berksfile rename to cookbooks/third-party/yum-epel-5.0.2/Berksfile diff --git a/cookbooks/third-party/yum-epel-4.5.0/CHANGELOG.md b/cookbooks/third-party/yum-epel-5.0.2/CHANGELOG.md similarity index 95% rename from cookbooks/third-party/yum-epel-4.5.0/CHANGELOG.md rename to cookbooks/third-party/yum-epel-5.0.2/CHANGELOG.md index b16da8cf7..c867ed812 100644 --- a/cookbooks/third-party/yum-epel-4.5.0/CHANGELOG.md +++ b/cookbooks/third-party/yum-epel-5.0.2/CHANGELOG.md @@ -2,6 +2,21 @@ This file is used to list changes made in each version of the yum-epel cookbook. +## 5.0.2 - *2023-07-10* + +## 5.0.1 - *2023-06-08* + +Standardise files with files in sous-chefs/repo-management + +## 5.0.0 - *2023-04-17* + +- 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/cookbooks/third-party/yum-epel-4.5.0/CODE_OF_CONDUCT.md b/cookbooks/third-party/yum-epel-5.0.2/CODE_OF_CONDUCT.md similarity index 100% rename from cookbooks/third-party/yum-epel-4.5.0/CODE_OF_CONDUCT.md rename to cookbooks/third-party/yum-epel-5.0.2/CODE_OF_CONDUCT.md diff --git a/cookbooks/third-party/yum-epel-4.5.0/CONTRIBUTING.md b/cookbooks/third-party/yum-epel-5.0.2/CONTRIBUTING.md similarity index 100% rename from cookbooks/third-party/yum-epel-4.5.0/CONTRIBUTING.md rename to cookbooks/third-party/yum-epel-5.0.2/CONTRIBUTING.md diff --git a/cookbooks/third-party/yum-epel-4.5.0/Dangerfile b/cookbooks/third-party/yum-epel-5.0.2/Dangerfile similarity index 100% rename from cookbooks/third-party/yum-epel-4.5.0/Dangerfile rename to cookbooks/third-party/yum-epel-5.0.2/Dangerfile diff --git a/cookbooks/third-party/yum-epel-4.5.0/LICENSE b/cookbooks/third-party/yum-epel-5.0.2/LICENSE similarity index 100% rename from cookbooks/third-party/yum-epel-4.5.0/LICENSE rename to cookbooks/third-party/yum-epel-5.0.2/LICENSE diff --git a/cookbooks/third-party/yum-epel-4.5.0/README.md b/cookbooks/third-party/yum-epel-5.0.2/README.md similarity index 85% rename from cookbooks/third-party/yum-epel-4.5.0/README.md rename to cookbooks/third-party/yum-epel-5.0.2/README.md index 1aa948f3f..3f56bee42 100644 --- a/cookbooks/third-party/yum-epel-4.5.0/README.md +++ b/cookbooks/third-party/yum-epel-5.0.2/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/cookbooks/third-party/yum-epel-4.5.0/TESTING.md b/cookbooks/third-party/yum-epel-5.0.2/TESTING.md similarity index 100% rename from cookbooks/third-party/yum-epel-4.5.0/TESTING.md rename to cookbooks/third-party/yum-epel-5.0.2/TESTING.md diff --git a/cookbooks/third-party/yum-epel-4.5.0/attributes/default.rb b/cookbooks/third-party/yum-epel-5.0.2/attributes/default.rb similarity index 94% rename from cookbooks/third-party/yum-epel-4.5.0/attributes/default.rb rename to cookbooks/third-party/yum-epel-5.0.2/attributes/default.rb index 8d32a0858..74589cc43 100644 --- a/cookbooks/third-party/yum-epel-4.5.0/attributes/default.rb +++ b/cookbooks/third-party/yum-epel-5.0.2/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/cookbooks/third-party/yum-epel-5.0.2/attributes/epel-debuginfo.rb b/cookbooks/third-party/yum-epel-5.0.2/attributes/epel-debuginfo.rb new file mode 100644 index 000000000..6229f6b98 --- /dev/null +++ b/cookbooks/third-party/yum-epel-5.0.2/attributes/epel-debuginfo.rb @@ -0,0 +1,11 @@ +default['yum']['epel-debuginfo']['repositoryid'] = 'epel-debuginfo' +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 +default['yum']['epel-debuginfo']['make_cache'] = true diff --git a/cookbooks/third-party/yum-epel-4.5.0/attributes/epel-next-debuginfo.rb b/cookbooks/third-party/yum-epel-5.0.2/attributes/epel-next-debuginfo.rb similarity index 77% rename from cookbooks/third-party/yum-epel-4.5.0/attributes/epel-next-debuginfo.rb rename to cookbooks/third-party/yum-epel-5.0.2/attributes/epel-next-debuginfo.rb index dd4368760..c16bf6f6f 100644 --- a/cookbooks/third-party/yum-epel-4.5.0/attributes/epel-next-debuginfo.rb +++ b/cookbooks/third-party/yum-epel-5.0.2/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/cookbooks/third-party/yum-epel-4.5.0/attributes/epel-next-source.rb b/cookbooks/third-party/yum-epel-5.0.2/attributes/epel-next-source.rb similarity index 76% rename from cookbooks/third-party/yum-epel-4.5.0/attributes/epel-next-source.rb rename to cookbooks/third-party/yum-epel-5.0.2/attributes/epel-next-source.rb index e7c70a76d..22a2571b0 100644 --- a/cookbooks/third-party/yum-epel-4.5.0/attributes/epel-next-source.rb +++ b/cookbooks/third-party/yum-epel-5.0.2/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/cookbooks/third-party/yum-epel-4.5.0/attributes/epel-next-testing-debuginfo.rb b/cookbooks/third-party/yum-epel-5.0.2/attributes/epel-next-testing-debuginfo.rb similarity index 78% rename from cookbooks/third-party/yum-epel-4.5.0/attributes/epel-next-testing-debuginfo.rb rename to cookbooks/third-party/yum-epel-5.0.2/attributes/epel-next-testing-debuginfo.rb index 118b636e4..115cd8a11 100644 --- a/cookbooks/third-party/yum-epel-4.5.0/attributes/epel-next-testing-debuginfo.rb +++ b/cookbooks/third-party/yum-epel-5.0.2/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/cookbooks/third-party/yum-epel-4.5.0/attributes/epel-next-testing-source.rb b/cookbooks/third-party/yum-epel-5.0.2/attributes/epel-next-testing-source.rb similarity index 77% rename from cookbooks/third-party/yum-epel-4.5.0/attributes/epel-next-testing-source.rb rename to cookbooks/third-party/yum-epel-5.0.2/attributes/epel-next-testing-source.rb index 8548e540b..355b149ec 100644 --- a/cookbooks/third-party/yum-epel-4.5.0/attributes/epel-next-testing-source.rb +++ b/cookbooks/third-party/yum-epel-5.0.2/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/cookbooks/third-party/yum-epel-4.5.0/attributes/epel-next-testing.rb b/cookbooks/third-party/yum-epel-5.0.2/attributes/epel-next-testing.rb similarity index 76% rename from cookbooks/third-party/yum-epel-4.5.0/attributes/epel-next-testing.rb rename to cookbooks/third-party/yum-epel-5.0.2/attributes/epel-next-testing.rb index 18476e3fd..7d9b6bb29 100644 --- a/cookbooks/third-party/yum-epel-4.5.0/attributes/epel-next-testing.rb +++ b/cookbooks/third-party/yum-epel-5.0.2/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/cookbooks/third-party/yum-epel-4.5.0/attributes/epel-next.rb b/cookbooks/third-party/yum-epel-5.0.2/attributes/epel-next.rb similarity index 87% rename from cookbooks/third-party/yum-epel-4.5.0/attributes/epel-next.rb rename to cookbooks/third-party/yum-epel-5.0.2/attributes/epel-next.rb index 246f5a346..a4d192b4e 100644 --- a/cookbooks/third-party/yum-epel-4.5.0/attributes/epel-next.rb +++ b/cookbooks/third-party/yum-epel-5.0.2/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/cookbooks/third-party/yum-epel-5.0.2/attributes/epel-source.rb b/cookbooks/third-party/yum-epel-5.0.2/attributes/epel-source.rb new file mode 100644 index 000000000..4e8f231af --- /dev/null +++ b/cookbooks/third-party/yum-epel-5.0.2/attributes/epel-source.rb @@ -0,0 +1,11 @@ +default['yum']['epel-source']['repositoryid'] = 'epel-source' +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 +default['yum']['epel-source']['make_cache'] = true diff --git a/cookbooks/third-party/yum-epel-5.0.2/attributes/epel-testing-debuginfo.rb b/cookbooks/third-party/yum-epel-5.0.2/attributes/epel-testing-debuginfo.rb new file mode 100644 index 000000000..94b5159ee --- /dev/null +++ b/cookbooks/third-party/yum-epel-5.0.2/attributes/epel-testing-debuginfo.rb @@ -0,0 +1,11 @@ +default['yum']['epel-testing-debuginfo']['repositoryid'] = 'epel-testing-debuginfo' +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 +default['yum']['epel-testing-debuginfo']['make_cache'] = true diff --git a/cookbooks/third-party/yum-epel-5.0.2/attributes/epel-testing-source.rb b/cookbooks/third-party/yum-epel-5.0.2/attributes/epel-testing-source.rb new file mode 100644 index 000000000..805eb0c25 --- /dev/null +++ b/cookbooks/third-party/yum-epel-5.0.2/attributes/epel-testing-source.rb @@ -0,0 +1,11 @@ +default['yum']['epel-testing-source']['repositoryid'] = 'epel-testing-source' +default['yum']['epel-testing-source']['description'] = + "Extra Packages for #{yum_epel_release} - $basearch - Testing Source" +default['yum']['epel-testing-source']['mirrorlist'] = + "https://mirrors.fedoraproject.org/mirrorlist?repo=testing-source-epel#{yum_epel_release}&arch=$basearch" +default['yum']['epel-testing-source']['gpgkey'] = + "https://download.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-#{yum_epel_release}" +default['yum']['epel-testing-source']['gpgcheck'] = true +default['yum']['epel-testing-source']['enabled'] = false +default['yum']['epel-testing-source']['managed'] = false +default['yum']['epel-testing-source']['make_cache'] = true diff --git a/cookbooks/third-party/yum-epel-5.0.2/attributes/epel-testing.rb b/cookbooks/third-party/yum-epel-5.0.2/attributes/epel-testing.rb new file mode 100644 index 000000000..a8ba20f59 --- /dev/null +++ b/cookbooks/third-party/yum-epel-5.0.2/attributes/epel-testing.rb @@ -0,0 +1,11 @@ +default['yum']['epel-testing']['repositoryid'] = 'epel-testing' +default['yum']['epel-testing']['description'] = + "Extra Packages for #{yum_epel_release} - $basearch - Testing " +default['yum']['epel-testing']['mirrorlist'] = + "https://mirrors.fedoraproject.org/mirrorlist?repo=testing-epel#{yum_epel_release}&arch=$basearch" +default['yum']['epel-testing']['gpgkey'] = + "https://download.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-#{yum_epel_release}" +default['yum']['epel-testing']['gpgcheck'] = true +default['yum']['epel-testing']['enabled'] = false +default['yum']['epel-testing']['managed'] = false +default['yum']['epel-testing']['make_cache'] = true diff --git a/cookbooks/third-party/yum-epel-5.0.2/attributes/epel.rb b/cookbooks/third-party/yum-epel-5.0.2/attributes/epel.rb new file mode 100644 index 000000000..e8976dfd3 --- /dev/null +++ b/cookbooks/third-party/yum-epel-5.0.2/attributes/epel.rb @@ -0,0 +1,19 @@ +default['yum']['epel']['repositoryid'] = 'epel' +default['yum']['epel']['gpgcheck'] = true +case node['kernel']['machine'] +when 'armv7l', 'armv7hl' + default['yum']['epel']['baseurl'] = 'https://armv7.dev.centos.org/repodir/epel-pass-1/' + default['yum']['epel']['gpgcheck'] = false +when 's390x' + default['yum']['epel']['baseurl'] = 'https://kojipkgs.fedoraproject.org/rhel/rc/7/Server/s390x/os/' + default['yum']['epel']['gpgkey'] = + 'https://kojipkgs.fedoraproject.org/rhel/rc/7/Server/s390x/os/RPM-GPG-KEY-redhat-release' +else + default['yum']['epel']['description'] = "Extra Packages for #{yum_epel_release} - $basearch" + default['yum']['epel']['mirrorlist'] = + "https://mirrors.fedoraproject.org/mirrorlist?repo=epel-#{yum_epel_release}&arch=$basearch" + default['yum']['epel']['gpgkey'] = "https://download.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-#{yum_epel_release}" +end +default['yum']['epel']['enabled'] = true +default['yum']['epel']['managed'] = true +default['yum']['epel']['make_cache'] = true diff --git a/cookbooks/third-party/yum-epel-4.5.0/chefignore b/cookbooks/third-party/yum-epel-5.0.2/chefignore similarity index 98% rename from cookbooks/third-party/yum-epel-4.5.0/chefignore rename to cookbooks/third-party/yum-epel-5.0.2/chefignore index cc170ea79..a27b0b258 100644 --- a/cookbooks/third-party/yum-epel-4.5.0/chefignore +++ b/cookbooks/third-party/yum-epel-5.0.2/chefignore @@ -61,7 +61,7 @@ Dangerfile examples/* features/* Guardfile -kitchen.yml* +kitchen*.yml mlc_config.json Procfile Rakefile diff --git a/cookbooks/third-party/yum-epel-4.5.0/documentation/.gitkeep b/cookbooks/third-party/yum-epel-5.0.2/documentation/.gitkeep similarity index 100% rename from cookbooks/third-party/yum-epel-4.5.0/documentation/.gitkeep rename to cookbooks/third-party/yum-epel-5.0.2/documentation/.gitkeep diff --git a/cookbooks/third-party/yum-epel-5.0.2/kitchen.dokken.yml b/cookbooks/third-party/yum-epel-5.0.2/kitchen.dokken.yml new file mode 100644 index 000000000..47eff95d8 --- /dev/null +++ b/cookbooks/third-party/yum-epel-5.0.2/kitchen.dokken.yml @@ -0,0 +1,113 @@ +driver: + name: dokken + privileged: true + chef_version: <%= ENV['CHEF_VERSION'] || 'current' %> + +transport: { name: dokken } +provisioner: { name: dokken } + +platforms: + - name: almalinux-8 + driver: + image: dokken/almalinux-8 + pid_one_command: /usr/lib/systemd/systemd + + - name: almalinux-9 + driver: + image: dokken/almalinux-9 + pid_one_command: /usr/lib/systemd/systemd + + - name: amazonlinux-2023 + driver: + image: dokken/amazonlinux-2023 + pid_one_command: /usr/lib/systemd/systemd + + - name: centos-7 + driver: + image: dokken/centos-7 + pid_one_command: /usr/lib/systemd/systemd + + - name: centos-stream-8 + driver: + image: dokken/centos-stream-8 + pid_one_command: /usr/lib/systemd/systemd + + - name: centos-stream-9 + driver: + image: dokken/centos-stream-9 + pid_one_command: /usr/lib/systemd/systemd + + - name: debian-9 + driver: + image: dokken/debian-9 + pid_one_command: /bin/systemd + + - name: debian-10 + driver: + image: dokken/debian-10 + pid_one_command: /bin/systemd + + - name: debian-11 + driver: + image: dokken/debian-11 + pid_one_command: /bin/systemd + + - name: debian-12 + driver: + image: dokken/debian-12 + pid_one_command: /bin/systemd + + - name: fedora-latest + driver: + image: dokken/fedora-latest + pid_one_command: /usr/lib/systemd/systemd + + - name: opensuse-leap-15 + driver: + image: dokken/opensuse-leap-15 + pid_one_command: /usr/lib/systemd/systemd + + - name: oraclelinux-7 + driver: + image: dokken/oraclelinux-7 + pid_one_command: /usr/lib/systemd/systemd + + - name: oraclelinux-8 + driver: + image: dokken/oraclelinux-8 + pid_one_command: /usr/lib/systemd/systemd + + - name: oraclelinux-9 + driver: + image: dokken/oraclelinux-9 + pid_one_command: /usr/lib/systemd/systemd + + - name: rockylinux-8 + driver: + image: dokken/rockylinux-8 + pid_one_command: /usr/lib/systemd/systemd + + - name: rockylinux-9 + driver: + image: dokken/rockylinux-9 + pid_one_command: /usr/lib/systemd/systemd + + - name: ubuntu-18.04 + driver: + image: dokken/ubuntu-18.04 + pid_one_command: /bin/systemd + + - name: ubuntu-20.04 + driver: + image: dokken/ubuntu-20.04 + pid_one_command: /bin/systemd + + - name: ubuntu-22.04 + driver: + image: dokken/ubuntu-22.04 + pid_one_command: /bin/systemd + + - name: ubuntu-23.04 + driver: + image: dokken/ubuntu-23.04 + pid_one_command: /bin/systemd diff --git a/cookbooks/third-party/yum-epel-5.0.2/kitchen.exec.yml b/cookbooks/third-party/yum-epel-5.0.2/kitchen.exec.yml new file mode 100644 index 000000000..ba7b2a962 --- /dev/null +++ b/cookbooks/third-party/yum-epel-5.0.2/kitchen.exec.yml @@ -0,0 +1,7 @@ +--- +driver: { name: exec } +transport: { name: exec } + +platforms: + - name: macos-latest + - name: windows-latest diff --git a/cookbooks/third-party/yum-epel-5.0.2/kitchen.global.yml b/cookbooks/third-party/yum-epel-5.0.2/kitchen.global.yml new file mode 100644 index 000000000..a382fcd0d --- /dev/null +++ b/cookbooks/third-party/yum-epel-5.0.2/kitchen.global.yml @@ -0,0 +1,38 @@ +--- +provisioner: + name: chef_infra + product_name: chef + product_version: <%= ENV['CHEF_VERSION'] || 'latest' %> + channel: stable + install_strategy: once + chef_license: accept + enforce_idempotency: <%= ENV['ENFORCE_IDEMPOTENCY'] || true %> + multiple_converge: <%= ENV['MULTIPLE_CONVERGE'] || 2 %> + deprecations_as_errors: true + log_level: <%= ENV['CHEF_LOG_LEVEL'] || 'auto' %> + +verifier: + name: inspec + +platforms: + - name: almalinux-8 + - name: almalinux-9 + - name: amazonlinux-2023 + - name: centos-7 + - name: centos-stream-8 + - name: centos-stream-9 + - name: debian-9 + - name: debian-10 + - name: debian-11 + - name: debian-12 + - name: fedora-latest + - name: opensuse-leap-15 + - name: oraclelinux-7 + - name: oraclelinux-8 + - name: oraclelinux-9 + - name: rockylinux-8 + - name: rockylinux-9 + - name: ubuntu-18.04 + - name: ubuntu-20.04 + - name: ubuntu-22.04 + - name: ubuntu-23.04 diff --git a/cookbooks/third-party/yum-epel-4.5.0/kitchen.yml b/cookbooks/third-party/yum-epel-5.0.2/kitchen.yml similarity index 73% rename from cookbooks/third-party/yum-epel-4.5.0/kitchen.yml rename to cookbooks/third-party/yum-epel-5.0.2/kitchen.yml index 0452dc392..e966de056 100644 --- a/cookbooks/third-party/yum-epel-4.5.0/kitchen.yml +++ b/cookbooks/third-party/yum-epel-5.0.2/kitchen.yml @@ -30,15 +30,6 @@ suites: epel-debuginfo: managed: true enabled: true - epel-modular: - managed: true - enabled: true - epel-modular-debuginfo: - managed: true - enabled: true - epel-modular-source: - managed: true - enabled: true epel-next: managed: true enabled: true @@ -66,15 +57,6 @@ suites: epel-testing-debuginfo: managed: true enabled: true - epel-testing-modular: - managed: true - enabled: true - epel-testing-modular-debuginfo: - managed: true - enabled: true - epel-testing-modular-source: - managed: true - enabled: true epel-testing-source: managed: true enabled: true diff --git a/cookbooks/third-party/yum-epel-4.5.0/libraries/helpers.rb b/cookbooks/third-party/yum-epel-5.0.2/libraries/helpers.rb similarity index 73% rename from cookbooks/third-party/yum-epel-4.5.0/libraries/helpers.rb rename to cookbooks/third-party/yum-epel-5.0.2/libraries/helpers.rb index 0efea8a32..c772d31c8 100644 --- a/cookbooks/third-party/yum-epel-4.5.0/libraries/helpers.rb +++ b/cookbooks/third-party/yum-epel-5.0.2/libraries/helpers.rb @@ -1,19 +1,13 @@ module YumEpel module Cookbook module Helpers - def epel_8_repos + def epel_repos repos = %w( epel epel-debuginfo - epel-modular - epel-modular-debuginfo - epel-modular-source epel-source epel-testing epel-testing-debuginfo - epel-testing-modular - epel-testing-modular-debuginfo - epel-testing-modular-source epel-testing-source ) @@ -36,6 +30,19 @@ def epel_8_repos def yum_epel_centos_stream? respond_to?(:centos_stream_platform?) && centos_stream_platform? end + + def yum_epel_release + if platform?('amazon') + case node['platform_version'].to_i + when 2023 + 9 + when 2 + 7 + end + else + node['platform_version'].to_i + end + end end end end diff --git a/cookbooks/third-party/yum-epel-4.5.0/metadata.rb b/cookbooks/third-party/yum-epel-5.0.2/metadata.rb similarity index 94% rename from cookbooks/third-party/yum-epel-4.5.0/metadata.rb rename to cookbooks/third-party/yum-epel-5.0.2/metadata.rb index ac9c9af6c..bc5c476a7 100644 --- a/cookbooks/third-party/yum-epel-4.5.0/metadata.rb +++ b/cookbooks/third-party/yum-epel-5.0.2/metadata.rb @@ -3,7 +3,7 @@ maintainer_email 'help@sous-chefs.org' license 'Apache-2.0' description 'Installs and configures the EPEL Yum repository' -version '4.5.0' +version '5.0.2' source_url 'https://github.com/sous-chefs/yum-epel' issues_url 'https://github.com/sous-chefs/yum-epel/issues' chef_version '>= 12.15' diff --git a/cookbooks/third-party/yum-epel-4.5.0/recipes/default.rb b/cookbooks/third-party/yum-epel-5.0.2/recipes/default.rb similarity index 100% rename from cookbooks/third-party/yum-epel-4.5.0/recipes/default.rb rename to cookbooks/third-party/yum-epel-5.0.2/recipes/default.rb diff --git a/cookbooks/third-party/yum-epel-5.0.2/renovate.json b/cookbooks/third-party/yum-epel-5.0.2/renovate.json new file mode 100644 index 000000000..7e7a8bad3 --- /dev/null +++ b/cookbooks/third-party/yum-epel-5.0.2/renovate.json @@ -0,0 +1,17 @@ +{ + "$schema": "https://docs.renovatebot.com/renovate-schema.json", + "extends": ["config:base"], + "packageRules": [{ + "groupName": "Actions", + "matchUpdateTypes": ["patch", "pin", "digest"], + "automerge": true, + "addLabels": ["Release: Patch", "Skip: Announcements"] + }, + { + "groupName": "Actions", + "matchUpdateTypes": ["major"], + "automerge": false, + "addLabels": ["Release: Patch", "Skip: Announcements"] + } + ] +} diff --git a/cookbooks/third-party/yum-epel-4.5.0/spec/default_spec.rb b/cookbooks/third-party/yum-epel-5.0.2/spec/default_spec.rb similarity index 100% rename from cookbooks/third-party/yum-epel-4.5.0/spec/default_spec.rb rename to cookbooks/third-party/yum-epel-5.0.2/spec/default_spec.rb diff --git a/cookbooks/third-party/yum-epel-4.5.0/spec/spec_helper.rb b/cookbooks/third-party/yum-epel-5.0.2/spec/spec_helper.rb similarity index 100% rename from cookbooks/third-party/yum-epel-4.5.0/spec/spec_helper.rb rename to cookbooks/third-party/yum-epel-5.0.2/spec/spec_helper.rb diff --git a/cookbooks/third-party/yum-epel-4.5.0/test/integration/all/all_spec.rb b/cookbooks/third-party/yum-epel-5.0.2/test/integration/all/all_spec.rb similarity index 55% rename from cookbooks/third-party/yum-epel-4.5.0/test/integration/all/all_spec.rb rename to cookbooks/third-party/yum-epel-5.0.2/test/integration/all/all_spec.rb index 4f3c8d7e9..2fbd93911 100644 --- a/cookbooks/third-party/yum-epel-4.5.0/test/integration/all/all_spec.rb +++ b/cookbooks/third-party/yum-epel-5.0.2/test/integration/all/all_spec.rb @@ -1,22 +1,5 @@ -os_release = os.name == 'amazon' ? 7 : os.release.to_i +os_release = os.name == 'amazon' ? 9 : os.release.to_i stream = file('/etc/os-release').content.match?('Stream') -infra = - if os.name == 'oracle' - '$infra' - elsif os.name == 'almalinux' - 'stock' - elsif stream - 'stock' - else - 'container' - end - -content = case os.name - when 'oracle' then '$contentdir' - when 'rocky' then 'pub/rocky' - when 'almalinux' then 'almalinux' - else 'centos' - end describe yum.repo 'epel' do it { should exist } @@ -55,42 +38,6 @@ end if os_release >= 8 - describe yum.repo 'epel-modular' do - it { should exist } - it { should be_enabled } - its('mirrors') { should cmp "https://mirrors.fedoraproject.org/metalink?repo=epel-modular-8&arch=x86_64&infra=#{infra}&content=#{content}" } - end - - describe yum.repo 'epel-modular-debuginfo' do - it { should exist } - it { should be_enabled } - its('mirrors') { should cmp "https://mirrors.fedoraproject.org/metalink?repo=epel-modular-debug-8&arch=x86_64&infra=#{infra}&content=#{content}" } - end - - describe yum.repo 'epel-modular-source' do - it { should exist } - it { should be_enabled } - its('mirrors') { should cmp "https://mirrors.fedoraproject.org/metalink?repo=epel-modular-source-8&arch=x86_64&infra=#{infra}&content=#{content}" } - end - - describe yum.repo 'epel-testing-modular' do - it { should exist } - it { should be_enabled } - its('mirrors') { should cmp "https://mirrors.fedoraproject.org/metalink?repo=testing-modular-epel8&arch=x86_64&infra=#{infra}&content=#{content}" } - end - - describe yum.repo 'epel-testing-modular-debuginfo' do - it { should exist } - it { should be_enabled } - its('mirrors') { should cmp "https://mirrors.fedoraproject.org/metalink?repo=testing-modular-debug-epel8&arch=x86_64&infra=#{infra}&content=#{content}" } - end - - describe yum.repo 'epel-testing-modular-source' do - it { should exist } - it { should be_enabled } - its('mirrors') { should cmp "https://mirrors.fedoraproject.org/metalink?repo=testing-modular-source-epel8&arch=x86_64&infra=#{infra}&content=#{content}" } - end - if stream describe yum.repo 'epel-next' do it { should exist } @@ -128,18 +75,4 @@ its('mirrors') { should cmp "https://mirrors.fedoraproject.org/mirrorlist?repo=testing-source-epel#{os_release}&arch=x86_64" } end end -else - %w( - epel-modular - epel-modular-debuginfo - epel-modular-source - epel-testing-modular - epel-testing-modular-debuginfo - epel-testing-modular-source - ).each do |repo| - describe yum.repo repo do - it { should_not exist } - it { should_not be_enabled } - end - end end diff --git a/cookbooks/third-party/yum-epel-4.5.0/test/integration/default/default_spec.rb b/cookbooks/third-party/yum-epel-5.0.2/test/integration/default/default_spec.rb similarity index 92% rename from cookbooks/third-party/yum-epel-4.5.0/test/integration/default/default_spec.rb rename to cookbooks/third-party/yum-epel-5.0.2/test/integration/default/default_spec.rb index 4436a2644..db334c1e2 100644 --- a/cookbooks/third-party/yum-epel-4.5.0/test/integration/default/default_spec.rb +++ b/cookbooks/third-party/yum-epel-5.0.2/test/integration/default/default_spec.rb @@ -1,4 +1,4 @@ -os_release = os.name == 'amazon' ? '7' : os.release.to_i +os_release = os.name == 'amazon' ? '9' : os.release.to_i stream = file('/etc/os-release').content.match?('Stream') describe yum.repo 'epel' do diff --git a/metadata.rb b/metadata.rb index 44dae715f..d122ef5f3 100644 --- a/metadata.rb +++ b/metadata.rb @@ -21,7 +21,7 @@ depends 'pyenv', '~> 4.2.3' depends 'selinux', '~> 6.1.12' depends 'yum', '~> 7.4.13' -depends 'yum-epel', '~> 4.5.0' +depends 'yum-epel', '~> 5.0.2' depends 'aws-parallelcluster-slurm', '~> 3.7.0' depends 'aws-parallelcluster-awsbatch', '~> 3.7.0' depends 'aws-parallelcluster-platform', '~> 3.7.0'