Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Tidy repository before upgrade #57

Merged
merged 1 commit into from
May 2, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 0 additions & 10 deletions .circleci/config.yml

This file was deleted.

18 changes: 9 additions & 9 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ name: ci

jobs:
lint-unit:
uses: sous-chefs/.github/.github/workflows/lint-unit.yml@0.0.3
uses: sous-chefs/.github/.github/workflows/lint-unit.yml@2.0.1
permissions:
actions: write
checks: write
Expand All @@ -23,12 +23,12 @@ jobs:
strategy:
matrix:
os:
- 'centos-7'
- 'centos-stream-8'
- "centos-7"
- "centos-stream-8"
suite:
- 'default'
- 'vault'
- 'all'
- "default"
- "vault"
- "all"
exclude:
- os: centos-stream-8
suite: vault
Expand All @@ -50,6 +50,6 @@ jobs:
- name: Print debug output on failure
if: failure()
run: |
set -x
sudo journalctl -l --since today
KITCHEN_LOCAL_YAML=kitchen.dokken.yml /usr/bin/kitchen exec ${{ matrix.suite }}-${{ matrix.os }} -c "journalctl -l"
set -x
sudo journalctl -l --since today
KITCHEN_LOCAL_YAML=kitchen.dokken.yml /usr/bin/kitchen exec ${{ matrix.suite }}-${{ matrix.os }} -c "journalctl -l"
19 changes: 0 additions & 19 deletions .github/workflows/md-links.yml

This file was deleted.

2 changes: 1 addition & 1 deletion .github/workflows/stale.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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: >
Expand Down
5 changes: 5 additions & 0 deletions .markdownlint-cli2.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
config:
ul-indent: false # MD007
line-length: false # MD013
no-duplicate-heading: false # MD024
reference-links-images: false # MD052
18 changes: 11 additions & 7 deletions .overcommit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,17 +4,21 @@ PreCommit:
enabled: true
YamlLint:
enabled: true
Rspec:
required_executable: "yamllint"
ChefSpec:
enabled: true
required_executable: 'rspec'
required_executable: "chef"
command: ["chef", "exec", "rspec"]
Cookstyle:
enabled: true
required_executable: 'cookstyle'
required_executable: "cookstyle"
command: ["cookstyle"]
Delivery:
enabled: true
required_executable: 'delivery'
flags: ['local', 'all']
MarkdownLint:
enabled: false
required_executable: "npx"
command: ["npx", "markdownlint-cli2", "'**/*.md'"]
include: ["**/*.md"]

CommitMsg:
HardTabs:
enabled: true
7 changes: 4 additions & 3 deletions .vscode/extensions.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
{
"recommendations": [
"chef-software.chef",
"rebornix.ruby",
"editorconfig.editorconfig"
"chef-software.chef",
"rebornix.ruby",
"editorconfig.editorconfig",
"DavidAnson.vscode-markdownlint"
]
}
2 changes: 2 additions & 0 deletions .yamllint
Original file line number Diff line number Diff line change
Expand Up @@ -11,3 +11,5 @@ rules:
max-spaces-inside: 1
min-spaces-inside-empty: -1
max-spaces-inside-empty: -1
comments:
min-spaces-from-content: 1
12 changes: 6 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -49,17 +49,17 @@ are welcome to override those attributes as they see fit for their environment.
| centos-advanced-virtualization | :x: |:heavy_check_mark:|:heavy_check_mark:| centos-release-advanced-virtualization |
| centos-ansible |:heavy_check_mark:|:heavy_check_mark:|:heavy_check_mark:| centos-release-ansible-29 |
| centos-azure |:heavy_check_mark:| :x: | :x: | centos-release-azure |
| centos-ceph |:heavy_check_mark:|:heavy_check_mark:|:heavy_check_mark:| centos-release-ceph-pacific (C8/CS8) <br> centos-release-ceph-nautilus (C7) |
| centos-ceph |:heavy_check_mark:|:heavy_check_mark:|:heavy_check_mark:| centos-release-ceph-pacific (C8/CS8), centos-release-ceph-nautilus (C7) |
| centos-dotnet |:heavy_check_mark:| :x: | :x: | centos-release-dotnet |
| centos-fdio |:heavy_check_mark:| :x: | :x: | centos-release-fdio |
| centos-gluster |:heavy_check_mark:|:heavy_check_mark:|:heavy_check_mark:| centos-release-gluster9 |
| centos-hyperscale | :x: | :x: |:heavy_check_mark:| centos-release-hyperscale |
| centos-nfs-ganesha |:heavy_check_mark:|:heavy_check_mark:|:heavy_check_mark:| centos-release-nfs-ganesha30 |
| centos-nfv-extras | :x: |:heavy_check_mark:|:heavy_check_mark:| centos-release-nfv-extras |
| centos-openshift-origin |:heavy_check_mark:| :x: | :x: | centos-release-openshift-origin311 |
| centos-openstack |:heavy_check_mark:|:heavy_check_mark:|:heavy_check_mark:| centos-release-openstack-xena (CS8) <br> centos-release-openstack-victoria (C8) <br> centos-release-openstack-train (C7) |
| centos-openstack |:heavy_check_mark:|:heavy_check_mark:|:heavy_check_mark:| centos-release-openstack-xena (CS8), centos-release-openstack-victoria (C8), centos-release-openstack-train (C7) |
| centos-opstools |:heavy_check_mark:|:heavy_check_mark:|:heavy_check_mark:| centos-release-opstools |
| centos-ovirt |:heavy_check_mark:|:heavy_check_mark:|:heavy_check_mark:| centos-release-ovirt44 (C8/CS8) <br> centos-release-ovirt43 (C7) |
| centos-ovirt |:heavy_check_mark:|:heavy_check_mark:|:heavy_check_mark:| centos-release-ovirt44 (C8/CS8), centos-release-ovirt43 (C7) |
| centos-qemu-ev |:heavy_check_mark:| :x: | :x: | centos-release-qemu-ev |
| centos-qpid-proton | :x: |:heavy_check_mark:|:heavy_check_mark:| centos-release-qpid-proton |
| centos-rabbitmq | :x: |:heavy_check_mark:|:heavy_check_mark:| centos-release-rabbitmq-38 |
Expand Down Expand Up @@ -157,8 +157,8 @@ default['yum-centos']['virt_xen_version'] =
})
```

_NOTE: If you are migrating from using `node['yum-centos']['keep_scl_repositories']`, you will need to do the following
to enable the repositories using this cookbook:_
**NOTE**: If you are migrating from using `node['yum-centos']['keep_scl_repositories']`, you will need to do the following
to enable the repositories using this cookbook:

```ruby
node.default['yum']['centos-sclo']['enabled'] = true
Expand All @@ -175,7 +175,7 @@ include_recipe 'yum-centos'
and `updates` repos are enabled on CentOS 7. For CentOS 8 and CentOS Stream 8, `base`, `extras` and `appstream` repos
are enabled by default.

_NOTE: If you are running an older CentOS release, i.e. 7.7 when 7.8 is the latest 7.x release, you may want to consider the `yum-centos::vault` recipe._
**NOTE**: If you are running an older CentOS release, i.e. 7.7 when 7.8 is the latest 7.x release, you may want to consider the `yum-centos::vault` recipe.

```ruby
yum_repository 'base' do
Expand Down
2 changes: 1 addition & 1 deletion chefignore
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ Dangerfile
examples/*
features/*
Guardfile
kitchen.yml*
kitchen*.yml
mlc_config.json
Procfile
Rakefile
Expand Down
110 changes: 95 additions & 15 deletions kitchen.dokken.yml
Original file line number Diff line number Diff line change
@@ -1,33 +1,113 @@
driver:
name: dokken
privileged: true # because Docker and SystemD/Upstart
privileged: true
chef_version: <%= ENV['CHEF_VERSION'] || 'current' %>

transport:
name: dokken
transport: { name: dokken }
provisioner: { name: dokken }

provisioner:
name: dokken
deprecations_as_errors: true
chef_license: accept-no-persist
platforms:
- name: almalinux-8
driver:
image: dokken/almalinux-8
pid_one_command: /usr/lib/systemd/systemd

verifier:
name: inspec
- name: almalinux-9
driver:
image: dokken/almalinux-9
pid_one_command: /usr/lib/systemd/systemd

platforms:
- name: centos-7
- name: amazonlinux-2023
driver:
image: dokken/centos-7
image: dokken/amazonlinux-2023
pid_one_command: /usr/lib/systemd/systemd

# Ensure compatibility with Chef 12.15
- name: centos-7-chef-12
- name: centos-7
driver:
image: dokken/centos-7
pid_one_command: /usr/lib/systemd/systemd
chef_version: '12.15.19'

- 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
7 changes: 7 additions & 0 deletions kitchen.exec.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
---
driver: { name: exec }
transport: { name: exec }

platforms:
- name: macos-latest
- name: windows-latest
38 changes: 38 additions & 0 deletions kitchen.global.yml
Original file line number Diff line number Diff line change
@@ -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
17 changes: 17 additions & 0 deletions renovate.json
Original file line number Diff line number Diff line change
@@ -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"]
}
]
}