mirror of
https://github.com/saltstack/salt-bootstrap.git
synced 2025-04-16 09:40:21 +00:00
Removed testing for OpenSUSE Tumbleweed and install contextvars for Fedora git
This commit is contained in:
parent
9848c3311e
commit
8c9e6621db
4 changed files with 20 additions and 30 deletions
15
.github/workflows/ci.yml
vendored
15
.github/workflows/ci.yml
vendored
|
@ -346,20 +346,6 @@ jobs:
|
||||||
instances: '["latest", "default"]'
|
instances: '["latest", "default"]'
|
||||||
|
|
||||||
|
|
||||||
opensuse-tumbleweed:
|
|
||||||
name: Opensuse Tumbleweed
|
|
||||||
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-tumbleweed
|
|
||||||
display-name: Opensuse Tumbleweed
|
|
||||||
timeout: 20
|
|
||||||
instances: '["git-master", "latest", "default"]'
|
|
||||||
|
|
||||||
|
|
||||||
oraclelinux-8:
|
oraclelinux-8:
|
||||||
name: Oracle Linux 8
|
name: Oracle Linux 8
|
||||||
if: github.event_name == 'push' || needs.collect-changed-files.outputs.run-tests == 'true'
|
if: github.event_name == 'push' || needs.collect-changed-files.outputs.run-tests == 'true'
|
||||||
|
@ -510,7 +496,6 @@ jobs:
|
||||||
- gentoo
|
- gentoo
|
||||||
- gentoo-systemd
|
- gentoo-systemd
|
||||||
- opensuse-15
|
- opensuse-15
|
||||||
- opensuse-tumbleweed
|
|
||||||
- oraclelinux-8
|
- oraclelinux-8
|
||||||
- oraclelinux-9
|
- oraclelinux-9
|
||||||
- photon-4
|
- photon-4
|
||||||
|
|
14
.github/workflows/templates/generate.py
vendored
14
.github/workflows/templates/generate.py
vendored
|
@ -7,6 +7,7 @@ import pathlib
|
||||||
os.chdir(os.path.abspath(os.path.dirname(__file__)))
|
os.chdir(os.path.abspath(os.path.dirname(__file__)))
|
||||||
|
|
||||||
## "amazon-2023",
|
## "amazon-2023",
|
||||||
|
## "opensuse-tumbleweed",
|
||||||
LINUX_DISTROS = [
|
LINUX_DISTROS = [
|
||||||
"almalinux-8",
|
"almalinux-8",
|
||||||
"almalinux-9",
|
"almalinux-9",
|
||||||
|
@ -20,7 +21,6 @@ LINUX_DISTROS = [
|
||||||
"gentoo",
|
"gentoo",
|
||||||
"gentoo-systemd",
|
"gentoo-systemd",
|
||||||
"opensuse-15",
|
"opensuse-15",
|
||||||
"opensuse-tumbleweed",
|
|
||||||
"oraclelinux-8",
|
"oraclelinux-8",
|
||||||
"oraclelinux-9",
|
"oraclelinux-9",
|
||||||
"photon-4",
|
"photon-4",
|
||||||
|
@ -43,6 +43,7 @@ OSX = [
|
||||||
|
|
||||||
|
|
||||||
## "amazon-2023",
|
## "amazon-2023",
|
||||||
|
## "opensuse-tumbleweed",
|
||||||
STABLE_DISTROS = [
|
STABLE_DISTROS = [
|
||||||
"almalinux-8",
|
"almalinux-8",
|
||||||
"almalinux-9",
|
"almalinux-9",
|
||||||
|
@ -54,7 +55,6 @@ STABLE_DISTROS = [
|
||||||
"fedora-39",
|
"fedora-39",
|
||||||
"fedora-40",
|
"fedora-40",
|
||||||
"opensuse-15",
|
"opensuse-15",
|
||||||
"opensuse-tumbleweed",
|
|
||||||
"oraclelinux-8",
|
"oraclelinux-8",
|
||||||
"oraclelinux-9",
|
"oraclelinux-9",
|
||||||
"photon-4",
|
"photon-4",
|
||||||
|
@ -99,6 +99,7 @@ ONEDIR_RC_DISTROS = [
|
||||||
"ubuntu-2404",
|
"ubuntu-2404",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
## "opensuse-tumbleweed",
|
||||||
BLACKLIST_3006 = [
|
BLACKLIST_3006 = [
|
||||||
"arch",
|
"arch",
|
||||||
"debian-12",
|
"debian-12",
|
||||||
|
@ -106,22 +107,22 @@ BLACKLIST_3006 = [
|
||||||
"gentoo",
|
"gentoo",
|
||||||
"gentoo-systemd",
|
"gentoo-systemd",
|
||||||
"opensuse-15",
|
"opensuse-15",
|
||||||
"opensuse-tumbleweed",
|
|
||||||
"ubuntu-2404",
|
"ubuntu-2404",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
## "opensuse-tumbleweed",
|
||||||
BLACKLIST_3007 = [
|
BLACKLIST_3007 = [
|
||||||
"arch",
|
"arch",
|
||||||
"fedora-39",
|
"fedora-39",
|
||||||
"gentoo",
|
"gentoo",
|
||||||
"gentoo-systemd",
|
"gentoo-systemd",
|
||||||
"opensuse-15",
|
"opensuse-15",
|
||||||
"opensuse-tumbleweed",
|
|
||||||
"photon-4",
|
"photon-4",
|
||||||
"photon-5",
|
"photon-5",
|
||||||
]
|
]
|
||||||
|
|
||||||
## "amazon-2023",
|
## "amazon-2023",
|
||||||
|
## "opensuse-tumbleweed",
|
||||||
BLACKLIST_GIT_3006 = [
|
BLACKLIST_GIT_3006 = [
|
||||||
"almalinux-9",
|
"almalinux-9",
|
||||||
"amazon-2",
|
"amazon-2",
|
||||||
|
@ -133,7 +134,6 @@ BLACKLIST_GIT_3006 = [
|
||||||
"gentoo",
|
"gentoo",
|
||||||
"gentoo-systemd",
|
"gentoo-systemd",
|
||||||
"opensuse-15",
|
"opensuse-15",
|
||||||
"opensuse-tumbleweed",
|
|
||||||
"oraclelinux-9",
|
"oraclelinux-9",
|
||||||
"photon-4",
|
"photon-4",
|
||||||
"photon-5",
|
"photon-5",
|
||||||
|
@ -144,6 +144,7 @@ BLACKLIST_GIT_3006 = [
|
||||||
]
|
]
|
||||||
|
|
||||||
## "amazon-2023",
|
## "amazon-2023",
|
||||||
|
## "opensuse-tumbleweed",
|
||||||
BLACKLIST_GIT_3007 = [
|
BLACKLIST_GIT_3007 = [
|
||||||
"almalinux-9",
|
"almalinux-9",
|
||||||
"amazon-2",
|
"amazon-2",
|
||||||
|
@ -156,7 +157,6 @@ BLACKLIST_GIT_3007 = [
|
||||||
"gentoo",
|
"gentoo",
|
||||||
"gentoo-systemd",
|
"gentoo-systemd",
|
||||||
"opensuse-15",
|
"opensuse-15",
|
||||||
"opensuse-tumbleweed",
|
|
||||||
"oraclelinux-9",
|
"oraclelinux-9",
|
||||||
"photon-4",
|
"photon-4",
|
||||||
"photon-5",
|
"photon-5",
|
||||||
|
@ -240,6 +240,7 @@ LATEST_PKG_BLACKLIST = [
|
||||||
]
|
]
|
||||||
|
|
||||||
## "amazon-2023": "Amazon 2023",
|
## "amazon-2023": "Amazon 2023",
|
||||||
|
## "opensuse-tumbleweed": "Opensuse Tumbleweed",
|
||||||
DISTRO_DISPLAY_NAMES = {
|
DISTRO_DISPLAY_NAMES = {
|
||||||
"almalinux-8": "AlmaLinux 8",
|
"almalinux-8": "AlmaLinux 8",
|
||||||
"almalinux-9": "AlmaLinux 9",
|
"almalinux-9": "AlmaLinux 9",
|
||||||
|
@ -253,7 +254,6 @@ DISTRO_DISPLAY_NAMES = {
|
||||||
"gentoo": "Gentoo",
|
"gentoo": "Gentoo",
|
||||||
"gentoo-systemd": "Gentoo (systemd)",
|
"gentoo-systemd": "Gentoo (systemd)",
|
||||||
"opensuse-15": "Opensuse 15",
|
"opensuse-15": "Opensuse 15",
|
||||||
"opensuse-tumbleweed": "Opensuse Tumbleweed",
|
|
||||||
"oraclelinux-8": "Oracle Linux 8",
|
"oraclelinux-8": "Oracle Linux 8",
|
||||||
"oraclelinux-9": "Oracle Linux 9",
|
"oraclelinux-9": "Oracle Linux 9",
|
||||||
"photon-4": "Photon OS 4",
|
"photon-4": "Photon OS 4",
|
||||||
|
|
|
@ -3843,6 +3843,10 @@ install_fedora_git_deps() {
|
||||||
CONFIG_SALT_FUNC="config_salt"
|
CONFIG_SALT_FUNC="config_salt"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
_fedora_dep="contextvars"
|
||||||
|
echodebug "Running '${_PY_EXE} -m pip install --upgrade ${_fedora_dep}'"
|
||||||
|
${_PY_EXE} -m pip install --upgrade "${_fedora_dep}"
|
||||||
|
|
||||||
return 0
|
return 0
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
17
kitchen.yml
17
kitchen.yml
|
@ -36,6 +36,15 @@ provisioner:
|
||||||
## - yum -y install --allowerasing procps-ng curl
|
## - yum -y install --allowerasing procps-ng curl
|
||||||
## - echo "PubkeyAcceptedAlgorithms +ssh-rsa" | tee -a /etc/ssh/sshd_config
|
## - echo "PubkeyAcceptedAlgorithms +ssh-rsa" | tee -a /etc/ssh/sshd_config
|
||||||
|
|
||||||
|
## - name: opensuse-tumbleweed
|
||||||
|
## driver:
|
||||||
|
## image: opensuse/tumbleweed:latest
|
||||||
|
## provision_command:
|
||||||
|
## - *opensuse_provision_command_01
|
||||||
|
## - *opensuse_provision_command_02
|
||||||
|
## - *opensuse_provision_command_03
|
||||||
|
## - echo "PubkeyAcceptedAlgorithms +ssh-rsa" | tee -a /etc/ssh/sshd_config
|
||||||
|
|
||||||
platforms:
|
platforms:
|
||||||
- name: almalinux-9
|
- name: almalinux-9
|
||||||
driver:
|
driver:
|
||||||
|
@ -104,14 +113,6 @@ platforms:
|
||||||
- &opensuse_provision_command_01 zypper --non-interactive install --auto-agree-with-licenses dbus-1
|
- &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_02 zypper --non-interactive install --auto-agree-with-licenses sudo openssh which curl systemd
|
||||||
- &opensuse_provision_command_03 systemctl enable sshd.service
|
- &opensuse_provision_command_03 systemctl enable sshd.service
|
||||||
- name: opensuse-tumbleweed
|
|
||||||
driver:
|
|
||||||
image: opensuse/tumbleweed:latest
|
|
||||||
provision_command:
|
|
||||||
- *opensuse_provision_command_01
|
|
||||||
- *opensuse_provision_command_02
|
|
||||||
- *opensuse_provision_command_03
|
|
||||||
- echo "PubkeyAcceptedAlgorithms +ssh-rsa" | tee -a /etc/ssh/sshd_config
|
|
||||||
- name: rockylinux-9
|
- name: rockylinux-9
|
||||||
driver:
|
driver:
|
||||||
platform: centosstream
|
platform: centosstream
|
||||||
|
|
Loading…
Add table
Reference in a new issue