saltstack/salt-bootstrap
1
0
Fork 0
mirror of https://github.com/saltstack/salt-bootstrap.git synced 2025-04-16 09:40:21 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Cleaned up code and removed Amazon 2023 for now, till it's container curl issue is resolved

Browse source
This commit is contained in:
David Murphy 2024-07-11 09:39:46 -06:00 • committed by Daniel Wozniak
parent 0cc372f66b
commit a5124f90e5
4 changed files with 52 additions and 594 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

63
.github/workflows/ci.yml vendored
View file

@ -134,7 +134,7 @@ jobs:
with: with:
distro-slug: macos-12 distro-slug: macos-12
display-name: macOS 12 display-name: macOS 12
timeout: 40 timeout: 20
runs-on: macos-12 runs-on: macos-12
instances: '["stable-3006", "stable-3006-8", "stable-3007", "stable-3007-1", "latest"]' instances: '["stable-3006", "stable-3006-8", "stable-3007", "stable-3007-1", "latest"]'
@ -149,7 +149,7 @@ jobs:
with: with:
distro-slug: macos-13 distro-slug: macos-13
display-name: macOS 13 display-name: macOS 13
timeout: 40 timeout: 20
runs-on: macos-13 runs-on: macos-13
instances: '["stable-3006", "stable-3006-8", "stable-3007", "stable-3007-1", "latest"]' instances: '["stable-3006", "stable-3006-8", "stable-3007", "stable-3007-1", "latest"]'
@ -165,7 +165,7 @@ jobs:
with: with:
distro-slug: windows-2019 distro-slug: windows-2019
display-name: Windows 2019 display-name: Windows 2019
timeout: 40 timeout: 20
runs-on: windows-2019 runs-on: windows-2019
instances: '["stable-3006", "stable-3006-8", "stable-3007", "stable-3007-1", "latest"]' instances: '["stable-3006", "stable-3006-8", "stable-3007", "stable-3007-1", "latest"]'
@ -180,7 +180,7 @@ jobs:
with: with:
distro-slug: windows-2022 distro-slug: windows-2022
display-name: Windows 2022 display-name: Windows 2022
timeout: 40 timeout: 20
runs-on: windows-2022 runs-on: windows-2022
instances: '["stable-3006", "stable-3006-8", "stable-3007", "stable-3007-1", "latest"]' instances: '["stable-3006", "stable-3006-8", "stable-3007", "stable-3007-1", "latest"]'
@ -196,7 +196,7 @@ jobs:
with: with:
distro-slug: almalinux-8 distro-slug: almalinux-8
display-name: AlmaLinux 8 display-name: AlmaLinux 8
timeout: 40 timeout: 20
instances: '["stable-3006", "onedir-3006", "stable-3006-8", "stable-3007", "onedir-3007", "stable-3007-1", "latest", "default"]' instances: '["stable-3006", "onedir-3006", "stable-3006-8", "stable-3007", "onedir-3007", "stable-3007-1", "latest", "default"]'
@ -210,7 +210,7 @@ jobs:
with: with:
distro-slug: almalinux-9 distro-slug: almalinux-9
display-name: AlmaLinux 9 display-name: AlmaLinux 9
timeout: 40 timeout: 20
instances: '["stable-3006", "onedir-3006", "stable-3006-8", "stable-3007", "onedir-3007", "stable-3007-1", "git-master", "latest", "default"]' instances: '["stable-3006", "onedir-3006", "stable-3006-8", "stable-3007", "onedir-3007", "stable-3007-1", "git-master", "latest", "default"]'
@ -224,24 +224,10 @@ jobs:
with: with:
distro-slug: amazon-2 distro-slug: amazon-2
display-name: Amazon 2 display-name: Amazon 2
timeout: 40 timeout: 20
instances: '["stable-3006", "onedir-3006", "stable-3006-8", "stable-3007", "onedir-3007", "stable-3007-1", "latest", "default"]' instances: '["stable-3006", "onedir-3006", "stable-3006-8", "stable-3007", "onedir-3007", "stable-3007-1", "latest", "default"]'
amazon-2023:
name: Amazon 2023
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: amazon-2023
display-name: Amazon 2023
timeout: 40
instances: '["stable-3006", "onedir-3006", "stable-3006-8", "stable-3007", "onedir-3007", "stable-3007-1", "git-master", "latest", "default"]'
arch: arch:
name: Arch name: Arch
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'
@ -252,7 +238,7 @@ jobs:
with: with:
distro-slug: arch distro-slug: arch
display-name: Arch display-name: Arch
timeout: 40 timeout: 20
instances: '["git-master", "latest", "default"]' instances: '["git-master", "latest", "default"]'
@ -266,7 +252,7 @@ jobs:
with: with:
distro-slug: centos-stream9 distro-slug: centos-stream9
display-name: CentOS Stream 9 display-name: CentOS Stream 9
timeout: 40 timeout: 20
instances: '["stable-3006", "onedir-3006", "stable-3006-8", "stable-3007", "onedir-3007", "stable-3007-1", "git-master", "latest", "default"]' instances: '["stable-3006", "onedir-3006", "stable-3006-8", "stable-3007", "onedir-3007", "stable-3007-1", "git-master", "latest", "default"]'
@ -280,7 +266,7 @@ jobs:
with: with:
distro-slug: debian-11 distro-slug: debian-11
display-name: Debian 11 display-name: Debian 11
timeout: 40 timeout: 20
instances: '["stable-3006", "onedir-3006", "stable-3006-8", "stable-3007", "onedir-3007", "stable-3007-1", "git-master", "latest", "default"]' instances: '["stable-3006", "onedir-3006", "stable-3006-8", "stable-3007", "onedir-3007", "stable-3007-1", "git-master", "latest", "default"]'
@ -294,7 +280,7 @@ jobs:
with: with:
distro-slug: debian-12 distro-slug: debian-12
display-name: Debian 12 display-name: Debian 12
timeout: 40 timeout: 20
instances: '["stable-3007", "onedir-3007", "stable-3007-1", "git-master", "latest", "default"]' instances: '["stable-3007", "onedir-3007", "stable-3007-1", "git-master", "latest", "default"]'
@ -308,7 +294,7 @@ jobs:
with: with:
distro-slug: fedora-39 distro-slug: fedora-39
display-name: Fedora 39 display-name: Fedora 39
timeout: 40 timeout: 20
instances: '["stable-3006", "onedir-3006", "stable-3006-8", "latest", "default"]' instances: '["stable-3006", "onedir-3006", "stable-3006-8", "latest", "default"]'
@ -322,7 +308,7 @@ jobs:
with: with:
distro-slug: fedora-40 distro-slug: fedora-40
display-name: Fedora 40 display-name: Fedora 40
timeout: 40 timeout: 20
instances: '["stable-3007", "onedir-3007", "stable-3007-1", "git-master", "latest", "default"]' instances: '["stable-3007", "onedir-3007", "stable-3007-1", "git-master", "latest", "default"]'
@ -364,7 +350,7 @@ jobs:
with: with:
distro-slug: opensuse-15 distro-slug: opensuse-15
display-name: Opensuse 15 display-name: Opensuse 15
timeout: 40 timeout: 20
instances: '["latest", "default"]' instances: '["latest", "default"]'
@ -378,7 +364,7 @@ jobs:
with: with:
distro-slug: opensuse-tumbleweed distro-slug: opensuse-tumbleweed
display-name: Opensuse Tumbleweed display-name: Opensuse Tumbleweed
timeout: 40 timeout: 20
instances: '["git-master", "latest", "default"]' instances: '["git-master", "latest", "default"]'
@ -392,7 +378,7 @@ jobs:
with: with:
distro-slug: oraclelinux-8 distro-slug: oraclelinux-8
display-name: Oracle Linux 8 display-name: Oracle Linux 8
timeout: 40 timeout: 20
instances: '["stable-3006", "onedir-3006", "stable-3006-8", "stable-3007", "onedir-3007", "stable-3007-1", "latest", "default"]' instances: '["stable-3006", "onedir-3006", "stable-3006-8", "stable-3007", "onedir-3007", "stable-3007-1", "latest", "default"]'
@ -406,7 +392,7 @@ jobs:
with: with:
distro-slug: oraclelinux-9 distro-slug: oraclelinux-9
display-name: Oracle Linux 9 display-name: Oracle Linux 9
timeout: 40 timeout: 20
instances: '["stable-3006", "onedir-3006", "stable-3006-8", "stable-3007", "onedir-3007", "stable-3007-1", "git-master", "latest", "default"]' instances: '["stable-3006", "onedir-3006", "stable-3006-8", "stable-3007", "onedir-3007", "stable-3007-1", "git-master", "latest", "default"]'
@ -420,7 +406,7 @@ jobs:
with: with:
distro-slug: photon-4 distro-slug: photon-4
display-name: Photon OS 4 display-name: Photon OS 4
timeout: 40 timeout: 20
instances: '["stable-3006", "onedir-3006", "stable-3006-8", "latest", "default"]' instances: '["stable-3006", "onedir-3006", "stable-3006-8", "latest", "default"]'
@ -434,7 +420,7 @@ jobs:
with: with:
distro-slug: photon-5 distro-slug: photon-5
display-name: Photon OS 5 display-name: Photon OS 5
timeout: 40 timeout: 20
instances: '["stable-3006", "onedir-3006", "stable-3006-8", "latest", "default"]' instances: '["stable-3006", "onedir-3006", "stable-3006-8", "latest", "default"]'
@ -448,7 +434,7 @@ jobs:
with: with:
distro-slug: rockylinux-8 distro-slug: rockylinux-8
display-name: Rocky Linux 8 display-name: Rocky Linux 8
timeout: 40 timeout: 20
instances: '["stable-3006", "onedir-3006", "stable-3006-8", "stable-3007", "onedir-3007", "stable-3007-1", "latest", "default"]' instances: '["stable-3006", "onedir-3006", "stable-3006-8", "stable-3007", "onedir-3007", "stable-3007-1", "latest", "default"]'
@ -462,7 +448,7 @@ jobs:
with: with:
distro-slug: rockylinux-9 distro-slug: rockylinux-9
display-name: Rocky Linux 9 display-name: Rocky Linux 9
timeout: 40 timeout: 20
instances: '["stable-3006", "onedir-3006", "stable-3006-8", "stable-3007", "onedir-3007", "stable-3007-1", "git-master", "latest", "default"]' instances: '["stable-3006", "onedir-3006", "stable-3006-8", "stable-3007", "onedir-3007", "stable-3007-1", "git-master", "latest", "default"]'
@ -476,7 +462,7 @@ jobs:
with: with:
distro-slug: ubuntu-2004 distro-slug: ubuntu-2004
display-name: Ubuntu 20.04 display-name: Ubuntu 20.04
timeout: 40 timeout: 20
instances: '["stable-3006", "onedir-3006", "stable-3006-8", "stable-3007", "onedir-3007", "stable-3007-1", "git-master", "latest", "default"]' instances: '["stable-3006", "onedir-3006", "stable-3006-8", "stable-3007", "onedir-3007", "stable-3007-1", "git-master", "latest", "default"]'
@ -490,7 +476,7 @@ jobs:
with: with:
distro-slug: ubuntu-2204 distro-slug: ubuntu-2204
display-name: Ubuntu 22.04 display-name: Ubuntu 22.04
timeout: 40 timeout: 20
instances: '["stable-3006", "onedir-3006", "stable-3006-8", "stable-3007", "onedir-3007", "stable-3007-1", "git-master", "latest", "default"]' instances: '["stable-3006", "onedir-3006", "stable-3006-8", "stable-3007", "onedir-3007", "stable-3007-1", "git-master", "latest", "default"]'
@ -504,7 +490,7 @@ jobs:
with: with:
distro-slug: ubuntu-2404 distro-slug: ubuntu-2404
display-name: Ubuntu 24.04 display-name: Ubuntu 24.04
timeout: 40 timeout: 20
instances: '["stable-3007", "onedir-3007", "stable-3007-1", "git-master", "latest", "default"]' instances: '["stable-3007", "onedir-3007", "stable-3007-1", "git-master", "latest", "default"]'
@ -523,7 +509,6 @@ jobs:
- almalinux-8 - almalinux-8
- almalinux-9 - almalinux-9
- amazon-2 - amazon-2
- amazon-2023
- arch - arch
- centos-stream9 - centos-stream9
- debian-11 - debian-11

21
.github/workflows/templates/generate.py vendored
View file

@ -6,12 +6,11 @@ import pathlib
os.chdir(os.path.abspath(os.path.dirname(__file__))) os.chdir(os.path.abspath(os.path.dirname(__file__)))
## DGM "centos-stream8", ## "amazon-2023",
LINUX_DISTROS = [ LINUX_DISTROS = [
"almalinux-8", "almalinux-8",
"almalinux-9", "almalinux-9",
"amazon-2", "amazon-2",
"amazon-2023",
"arch", "arch",
"centos-stream9", "centos-stream9",
"debian-11", "debian-11",
@ -43,12 +42,11 @@ OSX = [
] ]
## DGM "centos-stream8", ## "amazon-2023",
STABLE_DISTROS = [ STABLE_DISTROS = [
"almalinux-8", "almalinux-8",
"almalinux-9", "almalinux-9",
"amazon-2", "amazon-2",
"amazon-2023",
"arch", "arch",
"centos-stream9", "centos-stream9",
"debian-11", "debian-11",
@ -68,12 +66,11 @@ STABLE_DISTROS = [
"ubuntu-2404", "ubuntu-2404",
] ]
## DGM "centos-stream8", ## "amazon-2023",
ONEDIR_DISTROS = [ ONEDIR_DISTROS = [
"almalinux-8", "almalinux-8",
"almalinux-9", "almalinux-9",
"amazon-2", "amazon-2",
"amazon-2023",
"centos-stream9", "centos-stream9",
"debian-11", "debian-11",
"debian-12", "debian-12",
@ -93,7 +90,6 @@ ONEDIR_DISTROS = [
ONEDIR_RC_DISTROS = [ ONEDIR_RC_DISTROS = [
"almalinux-9", "almalinux-9",
"amazon-2", "amazon-2",
"amazon-2023",
"centos-stream9", "centos-stream9",
"debian-12", "debian-12",
"oraclelinux-9", "oraclelinux-9",
@ -125,10 +121,10 @@ BLACKLIST_3007 = [
"photon-5", "photon-5",
] ]
## "amazon-2023",
BLACKLIST_GIT_3006 = [ BLACKLIST_GIT_3006 = [
"almalinux-9", "almalinux-9",
"amazon-2", "amazon-2",
"amazon-2023",
"arch", "arch",
"centos-stream9", "centos-stream9",
"debian-11", "debian-11",
@ -147,10 +143,10 @@ BLACKLIST_GIT_3006 = [
"ubuntu-2404", "ubuntu-2404",
] ]
## "amazon-2023",
BLACKLIST_GIT_3007 = [ BLACKLIST_GIT_3007 = [
"almalinux-9", "almalinux-9",
"amazon-2", "amazon-2",
"amazon-2023",
"arch", "arch",
"centos-stream9", "centos-stream9",
"debian-11", "debian-11",
@ -230,7 +226,6 @@ GIT_VERSION_BLACKLIST = [
# SetuptoolsDeprecationWarning: setup.py install is deprecated. # SetuptoolsDeprecationWarning: setup.py install is deprecated.
# Use build and pip and other standards-based tools. # Use build and pip and other standards-based tools.
# #
## DGM "centos-stream8",
GIT_DISTRO_BLACKLIST = [ GIT_DISTRO_BLACKLIST = [
"almalinux-8", "almalinux-8",
"fedora-39", "fedora-39",
@ -244,12 +239,11 @@ LATEST_PKG_BLACKLIST = [
"gentoo-systemd", "gentoo-systemd",
] ]
## DGM "centos-stream8": "CentOS Stream 8", ## "amazon-2023": "Amazon 2023",
DISTRO_DISPLAY_NAMES = { DISTRO_DISPLAY_NAMES = {
"almalinux-8": "AlmaLinux 8", "almalinux-8": "AlmaLinux 8",
"almalinux-9": "AlmaLinux 9", "almalinux-9": "AlmaLinux 9",
"amazon-2": "Amazon 2", "amazon-2": "Amazon 2",
"amazon-2023": "Amazon 2023",
"arch": "Arch", "arch": "Arch",
"centos-stream9": "CentOS Stream 9", "centos-stream9": "CentOS Stream 9",
"debian-11": "Debian 11", "debian-11": "Debian 11",
@ -275,8 +269,7 @@ DISTRO_DISPLAY_NAMES = {
"windows-2022": "Windows 2022", "windows-2022": "Windows 2022",
} }
## DGM TIMEOUT_DEFAULT = 20 TIMEOUT_DEFAULT = 20
TIMEOUT_DEFAULT = 40
TIMEOUT_OVERRIDES = { TIMEOUT_OVERRIDES = {
"gentoo": 90, "gentoo": 90,
"gentoo-systemd": 90, "gentoo-systemd": 90,

535
bootstrap-salt.sh
View file

File diff suppressed because it is too large Load diff

27
kitchen.yml
View file

@ -28,13 +28,20 @@ provisioner:
mv /tmp/auto-accept-keys.conf /etc/salt/master.d/auto-accept-keys.conf mv /tmp/auto-accept-keys.conf /etc/salt/master.d/auto-accept-keys.conf
sh -c 't=$(shuf -i 1-15 -n 1); echo Sleeping $t seconds; sleep $t' sh -c 't=$(shuf -i 1-15 -n 1); echo Sleeping $t seconds; sleep $t'
## - name: amazon-2023
## driver:
## image: amazonlinux:2023
## provision_command:
## - yum -y install --allowerasing procps-ng curl
## - echo "PubkeyAcceptedAlgorithms +ssh-rsa" | tee -a /etc/ssh/sshd_config
platforms: platforms:
- name: almalinux-9 - name: almalinux-9
driver: driver:
provision_command: provision_command:
- dnf -y install crypto-policies-scripts procps-ng - dnf -y install crypto-policies-scripts procps-ng
- update-crypto-policies --set DEFAULT:SHA1 - update-crypto-policies --set DEFAULT:SHA1
### DGM - update-crypto-policies --set DEFAULT:SHA256
- echo "PubkeyAcceptedAlgorithms +ssh-rsa" | tee -a /etc/ssh/sshd_config - echo "PubkeyAcceptedAlgorithms +ssh-rsa" | tee -a /etc/ssh/sshd_config
- name: almalinux-8 - name: almalinux-8
- name: amazon-2 - name: amazon-2
@ -43,15 +50,6 @@ platforms:
platform: rhel platform: rhel
provision_command: provision_command:
- yum -y install procps-ng - yum -y install procps-ng
- name: amazon-2023
driver:
image: amazonlinux:2023
## DGM platform: fedora
## DGM platform: rhel
provision_command:
## DGM - yum -y install procps-ng
- yum -y install --allowerasing procps-ng curl
- echo "PubkeyAcceptedAlgorithms +ssh-rsa" | tee -a /etc/ssh/sshd_config
- name: arch - name: arch
driver: driver:
image: archlinux/archlinux image: archlinux/archlinux
@ -66,11 +64,7 @@ platforms:
provision_command: provision_command:
- dnf -y install crypto-policies-scripts procps-ng - dnf -y install crypto-policies-scripts procps-ng
- update-crypto-policies --set DEFAULT:SHA1 - update-crypto-policies --set DEFAULT:SHA1
### DGM - update-crypto-policies --set DEFAULT:SHA256
- echo "PubkeyAcceptedAlgorithms +ssh-rsa" | tee -a /etc/ssh/sshd_config - echo "PubkeyAcceptedAlgorithms +ssh-rsa" | tee -a /etc/ssh/sshd_config
## DGM - name: centos-stream8
## DGM driver:
## DGM image: quay.io/centos/centos:stream8
- name: debian-11 - name: debian-11
driver: driver:
image: debian:bullseye image: debian:bullseye
@ -125,18 +119,13 @@ platforms:
provision_command: provision_command:
- dnf -y install crypto-policies-scripts procps-ng - dnf -y install crypto-policies-scripts procps-ng
- update-crypto-policies --set DEFAULT:SHA1 - update-crypto-policies --set DEFAULT:SHA1
### DGM - yum -y install crypto-policies-scripts procps-ng
### DGM - update-crypto-policies --set DEFAULT:SHA256
- echo "PubkeyAcceptedAlgorithms +ssh-rsa" | tee -a /etc/ssh/sshd_config - echo "PubkeyAcceptedAlgorithms +ssh-rsa" | tee -a /etc/ssh/sshd_config
- name: oraclelinux-9 - name: oraclelinux-9
driver: driver:
## DGM platform: centosstream
run_command: /usr/lib/systemd/systemd run_command: /usr/lib/systemd/systemd
provision_command: provision_command:
- dnf -y install crypto-policies-scripts procps-ng - dnf -y install crypto-policies-scripts procps-ng
- update-crypto-policies --set DEFAULT:SHA1 - update-crypto-policies --set DEFAULT:SHA1
### DGM - yum -y install crypto-policies-scripts procps-ng
### DGM - update-crypto-policies --set DEFAULT:SHA256
- echo "PubkeyAcceptedAlgorithms +ssh-rsa" | tee -a /etc/ssh/sshd_config - echo "PubkeyAcceptedAlgorithms +ssh-rsa" | tee -a /etc/ssh/sshd_config
- name: rockylinux-8 - name: rockylinux-8
- name: oraclelinux-8 - name: oraclelinux-8