Skip to content
Closed
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
25 changes: 20 additions & 5 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -419,16 +419,30 @@ jobs:
instances: '["git-master"]'


opensuse-15:
name: Opensuse 15
opensuse-15-4:
name: Opensuse 15.4
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: opensuse-15
display-name: Opensuse 15
distro-slug: opensuse-15-4
display-name: Opensuse 15.4
timeout: 20
instances: '["latest", "default"]'


opensuse-15-5:
name: Opensuse 15.5
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: opensuse-15-5
display-name: Opensuse 15.5
timeout: 20
instances: '["latest", "default"]'

Expand Down Expand Up @@ -588,7 +602,8 @@ jobs:
- fedora-38
- gentoo
- gentoo-systemd
- opensuse-15
- opensuse-15-4
- opensuse-15-5
- opensuse-tumbleweed
- oraclelinux-7
- oraclelinux-8
Expand Down
39 changes: 26 additions & 13 deletions .github/workflows/templates/generate.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,8 @@
"fedora-38",
"gentoo",
"gentoo-systemd",
"opensuse-15",
"opensuse-15-4",
"opensuse-15-5",
"opensuse-tumbleweed",
"oraclelinux-7",
"oraclelinux-8",
Expand Down Expand Up @@ -57,7 +58,8 @@
"debian-11",
"gentoo",
"gentoo-systemd",
"opensuse-15",
"opensuse-15-4",
"opensuse-15-5",
"opensuse-tumbleweed",
"oraclelinux-7",
"oraclelinux-8",
Expand All @@ -78,7 +80,8 @@
"fedora-36",
"fedora-37",
"fedora-38",
"opensuse-15",
"opensuse-15-4",
"opensuse-15-5",
"opensuse-tumbleweed",
"oraclelinux-7",
"oraclelinux-8",
Expand Down Expand Up @@ -141,7 +144,8 @@
"fedora-38",
"gentoo",
"gentoo-systemd",
"opensuse-15",
"opensuse-15-4",
"opensuse-15-5",
"opensuse-tumbleweed",
"photon-3",
"photon-4",
Expand All @@ -162,7 +166,8 @@
"fedora-38",
"gentoo",
"gentoo-systemd",
"opensuse-15",
"opensuse-15-4",
"opensuse-15-5",
"opensuse-tumbleweed",
"photon-3",
"photon-4",
Expand All @@ -182,7 +187,8 @@
"fedora-38",
"gentoo",
"gentoo-systemd",
"opensuse-15",
"opensuse-15-4",
"opensuse-15-5",
"opensuse-tumbleweed",
"photon-3",
"photon-4",
Expand All @@ -198,7 +204,8 @@
"fedora-38",
"gentoo",
"gentoo-systemd",
"opensuse-15",
"opensuse-15-4",
"opensuse-15-5",
"opensuse-tumbleweed",
"photon-3",
"photon-4",
Expand All @@ -217,7 +224,8 @@
"fedora-38",
"gentoo",
"gentoo-systemd",
"opensuse-15",
"opensuse-15-4",
"opensuse-15-5",
"opensuse-tumbleweed",
"ubuntu-2004",
"ubuntu-2110",
Expand All @@ -237,7 +245,8 @@
"fedora-38",
"gentoo",
"gentoo-systemd",
"opensuse-15",
"opensuse-15-4",
"opensuse-15-5",
"opensuse-tumbleweed",
"photon-3",
"photon-4",
Expand All @@ -250,7 +259,8 @@
"arch",
"gentoo",
"gentoo-systemd",
"opensuse-15",
"opensuse-15-4",
"opensuse-15-5",
"opensuse-tumbleweed",
]

Expand All @@ -266,7 +276,8 @@
"fedora-38",
"gentoo",
"gentoo-systemd",
"opensuse-15",
"opensuse-15-4",
"opensuse-15-5",
"opensuse-tumbleweed",
"photon-3",
"photon-4",
Expand Down Expand Up @@ -363,7 +374,8 @@
"centos-stream8",
"fedora-37",
"fedora-38",
"opensuse-15",
"opensuse-15-4",
"opensuse-15-5",
"oraclelinux-7",
"oraclelinux-8",
"rockylinux-8",
Expand All @@ -389,7 +401,8 @@
"fedora-38": "Fedora 38",
"gentoo": "Gentoo",
"gentoo-systemd": "Gentoo (systemd)",
"opensuse-15": "Opensuse 15",
"opensuse-15-4": "Opensuse 15.4",
"opensuse-15-5": "Opensuse 15.5",
"opensuse-tumbleweed": "Opensuse Tumbleweed",
"oraclelinux-7": "Oracle Linux 7",
"oraclelinux-8": "Oracle Linux 8",
Expand Down
57 changes: 40 additions & 17 deletions kitchen.yml
Original file line number Diff line number Diff line change
Expand Up @@ -105,13 +105,20 @@ platforms:
provision_command:
- systemctl enable sshd.service
- echo "PubkeyAcceptedAlgorithms +ssh-rsa" | tee -a /etc/ssh/sshd_config
- name: opensuse-15
- name: opensuse-15-4
driver:
image: opensuse/leap:15.4
provision_command:
- &opensuse_provision_command_01 zypper --non-interactive install --auto-agree-with-licenses dbus-1
- &opensuse_provision_command_02 zypper --non-interactive install --auto-agree-with-licenses sudo openssh which curl systemd
- &opensuse_provision_command_03 systemctl enable sshd.service
- name: opensuse-15-5
driver:
image: opensuse/leap:15.5
provision_command:
- &opensuse_provision_command_01 zypper --non-interactive install --auto-agree-with-licenses dbus-1
- &opensuse_provision_command_02 zypper --non-interactive install --auto-agree-with-licenses sudo openssh which curl systemd
- &opensuse_provision_command_03 systemctl enable sshd.service
- name: opensuse-tumbleweed
driver:
image: opensuse/tumbleweed:latest
Expand Down Expand Up @@ -173,7 +180,8 @@ suites:
salt_version: v3004
salt_bootstrap_options: -x python3 -MPfq git %s
excludes:
- opensuse-15
- opensuse-15-4
- opensuse-15-5
- opensuse-tumbleweed
- debian-11
- arch
Expand All @@ -187,7 +195,8 @@ suites:
salt_version: v3005
salt_bootstrap_options: -x python3 -MPfq git %s
excludes:
- opensuse-15
- opensuse-15-4
- opensuse-15-5
- opensuse-tumbleweed
- debian-11
- arch
Expand All @@ -201,7 +210,8 @@ suites:
salt_version: v3006
salt_bootstrap_options: -x python3 -MPfq git %s
excludes:
- opensuse-15
- opensuse-15-4
- opensuse-15-5
- opensuse-tumbleweed
- debian-11
- arch
Expand All @@ -215,7 +225,8 @@ suites:
salt_version: 3006.x
salt_bootstrap_options: -x python3 -MPfq git %s
excludes:
- opensuse-15
- opensuse-15-4
- opensuse-15-5
- opensuse-tumbleweed
- debian-11
- arch
Expand All @@ -229,7 +240,8 @@ suites:
salt_version: 3003
salt_bootstrap_options: -x python3 -MP old-stable 3003.0
excludes:
- opensuse-15
- opensuse-15-4
- opensuse-15-5
- opensuse-tumbleweed
- arch
- gentoo
Expand All @@ -238,7 +250,8 @@ suites:
- freebsd-123
- openbsd-6
excludes:
- opensuse-15
- opensuse-15-4
- opensuse-15-5
- opensuse-tumbleweed
- arch
- freebsd-131
Expand All @@ -249,7 +262,8 @@ suites:
salt_version: 3003
salt_bootstrap_options: -x python3 -MP old-stable %s
excludes:
- opensuse-15
- opensuse-15-4
- opensuse-15-5
- opensuse-tumbleweed
- arch
- freebsd-131
Expand All @@ -260,7 +274,8 @@ suites:
salt_version: 3004
salt_bootstrap_options: -x python3 -MP old-stable 3004.0
excludes:
- opensuse-15
- opensuse-15-4
- opensuse-15-5
- opensuse-tumbleweed
- arch
- gentoo
Expand All @@ -273,7 +288,8 @@ suites:
salt_version: 3004
salt_bootstrap_options: -x python3 -MP old-stable %s
excludes:
- opensuse-15
- opensuse-15-4
- opensuse-15-5
- opensuse-tumbleweed
- arch
- freebsd-131
Expand All @@ -284,7 +300,8 @@ suites:
salt_version: 3005
salt_bootstrap_options: -x python3 -MP old-stable %s
excludes:
- opensuse-15
- opensuse-15-4
- opensuse-15-5
- opensuse-tumbleweed
- arch
- freebsd-131
Expand All @@ -295,7 +312,8 @@ suites:
salt_version: 3005
salt_bootstrap_options: -x python3 -MP stable %s
excludes:
- opensuse-15
- opensuse-15-4
- opensuse-15-5
- opensuse-tumbleweed
- arch
- freebsd-131
Expand All @@ -306,7 +324,8 @@ suites:
salt_version: 3005.1
salt_bootstrap_options: -x python3 -MP stable %s
excludes:
- opensuse-15
- opensuse-15-4
- opensuse-15-5
- opensuse-tumbleweed
- arch
- freebsd-131
Expand All @@ -317,7 +336,8 @@ suites:
salt_version: 3006
salt_bootstrap_options: -x python3 -MP stable %s
excludes:
- opensuse-15
- opensuse-15-4
- opensuse-15-5
- opensuse-tumbleweed
- arch
- freebsd-131
Expand All @@ -328,7 +348,8 @@ suites:
salt_version: 3006.1
salt_bootstrap_options: -x python3 -MP stable %s
excludes:
- opensuse-15
- opensuse-15-4
- opensuse-15-5
- opensuse-tumbleweed
- arch
- freebsd-131
Expand Down Expand Up @@ -379,7 +400,8 @@ suites:
- freebsd-123
- gentoo
- openbsd-6
- opensuse-15
- opensuse-15-4
- opensuse-15-5
- opensuse-tumbleweed
- ubuntu-1804

Expand All @@ -393,7 +415,8 @@ suites:
- freebsd-123
- gentoo
- openbsd-6
- opensuse-15
- opensuse-15-4
- opensuse-15-5
- opensuse-tumbleweed
- ubuntu-1804

Expand Down