mirror of
https://github.com/saltstack/salt-bootstrap.git
synced 2025-04-16 09:40:21 +00:00
seperate branch for adding and testing rockylinux:9, swapping out the kitchen-docker Github until PR is merged.
This commit is contained in:
parent
be5c6cb39e
commit
98f30a8a56
4 changed files with 34 additions and 3 deletions
17
.github/workflows/ci.yml
vendored
17
.github/workflows/ci.yml
vendored
|
@ -333,7 +333,7 @@ jobs:
|
|||
distro-slug: centos-stream9
|
||||
display-name: CentOS Stream 9
|
||||
timeout: 20
|
||||
instances: '["git-3005", "onedir-3005", "git-master", "onedir-nightly"]'
|
||||
instances: '["git-3005", "onedir-3005", "git-master", "latest", "onedir-nightly"]'
|
||||
|
||||
|
||||
debian-10:
|
||||
|
@ -518,6 +518,20 @@ jobs:
|
|||
instances: '["stable-3004", "git-3004", "stable-3005", "git-3005", "onedir-3005", "git-master", "latest", "onedir-nightly"]'
|
||||
|
||||
|
||||
rockylinux-9:
|
||||
name: Rocky Linux 9
|
||||
if: github.event_name == 'push' || needs.collect-changed-files.outputs.run-tests == 'true'
|
||||
uses: ./.github/workflows/test-linux.yml
|
||||
needs:
|
||||
- lint
|
||||
- generate-actions-workflow
|
||||
with:
|
||||
distro-slug: rockylinux-9
|
||||
display-name: Rocky Linux 9
|
||||
timeout: 20
|
||||
instances: '["git-3005", "onedir-3005", "git-master", "onedir-nightly"]'
|
||||
|
||||
|
||||
ubuntu-1804:
|
||||
name: Ubuntu 18.04
|
||||
if: github.event_name == 'push' || needs.collect-changed-files.outputs.run-tests == 'true'
|
||||
|
@ -596,6 +610,7 @@ jobs:
|
|||
- oraclelinux-7
|
||||
- oraclelinux-8
|
||||
- rockylinux-8
|
||||
- rockylinux-9
|
||||
- ubuntu-1804
|
||||
- ubuntu-2004
|
||||
- ubuntu-2204
|
||||
|
|
10
.github/workflows/templates/generate.py
vendored
10
.github/workflows/templates/generate.py
vendored
|
@ -28,6 +28,7 @@ LINUX_DISTROS = [
|
|||
"oraclelinux-7",
|
||||
"oraclelinux-8",
|
||||
"rockylinux-8",
|
||||
"rockylinux-9",
|
||||
"ubuntu-1804",
|
||||
"ubuntu-2004",
|
||||
"ubuntu-2204",
|
||||
|
@ -84,6 +85,7 @@ ONEDIR_DISTROS = [
|
|||
"oraclelinux-7",
|
||||
"oraclelinux-8",
|
||||
"rockylinux-8",
|
||||
"rockylinux-9",
|
||||
"ubuntu-1804",
|
||||
"ubuntu-2004",
|
||||
"ubuntu-2204",
|
||||
|
@ -103,6 +105,7 @@ BLACKLIST_3003 = [
|
|||
"opensuse-15",
|
||||
"opensuse-tumbleweed",
|
||||
"rockylinux-8",
|
||||
"rockylinux-9",
|
||||
"ubuntu-2204",
|
||||
]
|
||||
|
||||
|
@ -122,6 +125,7 @@ BLACKLIST_GIT_3003 = [
|
|||
"opensuse-15",
|
||||
"opensuse-tumbleweed",
|
||||
"rockylinux-8",
|
||||
"rockylinux-9",
|
||||
"ubuntu-2004",
|
||||
"ubuntu-2110",
|
||||
"ubuntu-2204",
|
||||
|
@ -139,6 +143,7 @@ BLACKLIST_3004 = [
|
|||
"gentoo-systemd",
|
||||
"opensuse-15",
|
||||
"opensuse-tumbleweed",
|
||||
"rockylinux-9",
|
||||
]
|
||||
|
||||
BLACKLIST_3005 = [
|
||||
|
@ -171,6 +176,7 @@ BLACKLIST_GIT_3004 = [
|
|||
"ubuntu-2004",
|
||||
"ubuntu-2110",
|
||||
"ubuntu-2204",
|
||||
"rockylinux-9",
|
||||
]
|
||||
|
||||
BLACKLIST_GIT_3005 = [
|
||||
|
@ -239,7 +245,8 @@ GIT_DISTRO_BLACKLIST = [
|
|||
|
||||
LATEST_PKG_BLACKLIST = [
|
||||
"almalinux-9",
|
||||
"centos-stream9",
|
||||
"centos-stream-9",
|
||||
"rockylinux-9",
|
||||
]
|
||||
|
||||
DISTRO_DISPLAY_NAMES = {
|
||||
|
@ -263,6 +270,7 @@ DISTRO_DISPLAY_NAMES = {
|
|||
"oraclelinux-7": "Oracle Linux 7",
|
||||
"oraclelinux-8": "Oracle Linux 8",
|
||||
"rockylinux-8": "Rocky Linux 8",
|
||||
"rockylinux-9": "Rocky Linux 9",
|
||||
"ubuntu-1804": "Ubuntu 18.04",
|
||||
"ubuntu-2004": "Ubuntu 20.04",
|
||||
"ubuntu-2204": "Ubuntu 22.04",
|
||||
|
|
2
Gemfile
2
Gemfile
|
@ -4,7 +4,7 @@ source "https://rubygems.org"
|
|||
|
||||
gem 'test-kitchen', '>= 3.2.2'
|
||||
gem 'kitchen-salt', '>= 0.7.2'
|
||||
gem 'kitchen-docker', :git => 'https://github.com/test-kitchen/kitchen-docker.git', :branch => 'main'
|
||||
gem 'kitchen-docker', :git => 'https://github.com/garethgreenaway/kitchen-docker.git', :branch => 'add_rockylinux_platform_section'
|
||||
|
||||
group :vagrant do
|
||||
gem 'kitchen-vagrant'
|
||||
|
|
|
@ -114,6 +114,14 @@ platforms:
|
|||
- *opensuse_provision_command_02
|
||||
- *opensuse_provision_command_03
|
||||
- echo "PubkeyAcceptedAlgorithms +ssh-rsa" | tee -a /etc/ssh/sshd_config
|
||||
- name: rockylinux-9
|
||||
driver:
|
||||
run_command: /usr/lib/systemd/systemd
|
||||
provision_command:
|
||||
- dnf -y install crypto-policies-scripts procps-ng
|
||||
- update-crypto-policies --set DEFAULT:SHA1
|
||||
- echo "PubkeyAcceptedAlgorithms +ssh-rsa" | tee -a /etc/ssh/sshd_config
|
||||
- name: rockylinux-8
|
||||
- name: oraclelinux-8
|
||||
- name: oraclelinux-7
|
||||
- name: rockylinux-8
|
||||
|
|
Loading…
Add table
Reference in a new issue