mirror of
https://github.com/saltstack/salt-bootstrap.git
synced 2025-04-16 17:50:22 +00:00
Merge branch 'adding_install_from_tiamat' of github.com:saltstack/salt-bootstrap into adding_install_from_tiamat
This commit is contained in:
Gareth J. Greenaway
commit
acc91bdab9
5 changed files with 267 additions and 3 deletions
230
.github/workflows/main.yml
vendored
230
.github/workflows/main.yml
vendored
|
|
@ -2209,6 +2209,98 @@ jobs:
|
|||
bundle exec kitchen destroy latest-fedora-35
|
||||
|
||||
|
||||
py3-git-master-fedora-36:
|
||||
name: Fedora 36 Master Py3 Git
|
||||
runs-on: ubuntu-latest
|
||||
timeout-minutes: 20
|
||||
|
||||
needs: lint
|
||||
|
||||
steps:
|
||||
- uses: actions/checkout@v1
|
||||
- name: Setup Ruby
|
||||
uses: actions/setup-ruby@v1
|
||||
with:
|
||||
ruby-version: 2.6.x
|
||||
|
||||
- name: Install Bundler
|
||||
run: |
|
||||
gem install bundler
|
||||
|
||||
- name: Setup Bundle
|
||||
run: |
|
||||
bundle install --with docker --without opennebula ec2 windows vagrant
|
||||
|
||||
- name: Set up Python 3.7
|
||||
uses: actions/setup-python@v1
|
||||
with:
|
||||
python-version: 3.7
|
||||
|
||||
- name: Install Python Dependencies
|
||||
run: |
|
||||
pip install -U pip
|
||||
pip install -r tests/requirements.txt
|
||||
|
||||
- name: Create Test Container
|
||||
run: |
|
||||
bundle exec kitchen create py3-git-master-fedora-36 || bundle exec kitchen create py3-git-master-fedora-36
|
||||
|
||||
- name: Test Bootstrap In Test Container
|
||||
run: |
|
||||
bundle exec kitchen verify py3-git-master-fedora-36
|
||||
|
||||
- name: Destroy Test Container
|
||||
if: always()
|
||||
run: |
|
||||
bundle exec kitchen destroy py3-git-master-fedora-36
|
||||
|
||||
|
||||
latest-fedora-36:
|
||||
name: Fedora 36 Latest packaged release
|
||||
runs-on: ubuntu-latest
|
||||
timeout-minutes: 20
|
||||
|
||||
needs: lint
|
||||
|
||||
steps:
|
||||
- uses: actions/checkout@v1
|
||||
- name: Setup Ruby
|
||||
uses: actions/setup-ruby@v1
|
||||
with:
|
||||
ruby-version: 2.6.x
|
||||
|
||||
- name: Install Bundler
|
||||
run: |
|
||||
gem install bundler
|
||||
|
||||
- name: Setup Bundle
|
||||
run: |
|
||||
bundle install --with docker --without opennebula ec2 windows vagrant
|
||||
|
||||
- name: Set up Python 3.7
|
||||
uses: actions/setup-python@v1
|
||||
with:
|
||||
python-version: 3.7
|
||||
|
||||
- name: Install Python Dependencies
|
||||
run: |
|
||||
pip install -U pip
|
||||
pip install -r tests/requirements.txt
|
||||
|
||||
- name: Create Test Container
|
||||
run: |
|
||||
bundle exec kitchen create latest-fedora-36 || bundle exec kitchen create latest-fedora-36
|
||||
|
||||
- name: Test Bootstrap In Test Container
|
||||
run: |
|
||||
bundle exec kitchen verify latest-fedora-36
|
||||
|
||||
- name: Destroy Test Container
|
||||
if: always()
|
||||
run: |
|
||||
bundle exec kitchen destroy latest-fedora-36
|
||||
|
||||
|
||||
py3-git-master-opensuse-15:
|
||||
name: Opensuse 15 Master Py3 Git
|
||||
runs-on: ubuntu-latest
|
||||
|
|
@ -4231,3 +4323,141 @@ jobs:
|
|||
if: always()
|
||||
run: |
|
||||
bundle exec kitchen destroy latest-ubuntu-2110
|
||||
|
||||
|
||||
py3-stable-3004-ubuntu-2204:
|
||||
name: Ubuntu 22.04 v3004 Py3 Stable
|
||||
runs-on: ubuntu-latest
|
||||
timeout-minutes: 20
|
||||
|
||||
needs: lint
|
||||
|
||||
steps:
|
||||
- uses: actions/checkout@v1
|
||||
- name: Setup Ruby
|
||||
uses: actions/setup-ruby@v1
|
||||
with:
|
||||
ruby-version: 2.6.x
|
||||
|
||||
- name: Install Bundler
|
||||
run: |
|
||||
gem install bundler
|
||||
|
||||
- name: Setup Bundle
|
||||
run: |
|
||||
bundle install --with docker --without opennebula ec2 windows vagrant
|
||||
|
||||
- name: Set up Python 3.7
|
||||
uses: actions/setup-python@v1
|
||||
with:
|
||||
python-version: 3.7
|
||||
|
||||
- name: Install Python Dependencies
|
||||
run: |
|
||||
pip install -U pip
|
||||
pip install -r tests/requirements.txt
|
||||
|
||||
- name: Create Test Container
|
||||
run: |
|
||||
bundle exec kitchen create py3-stable-3004-ubuntu-2204 || bundle exec kitchen create py3-stable-3004-ubuntu-2204
|
||||
|
||||
- name: Test Bootstrap In Test Container
|
||||
run: |
|
||||
bundle exec kitchen verify py3-stable-3004-ubuntu-2204
|
||||
|
||||
- name: Destroy Test Container
|
||||
if: always()
|
||||
run: |
|
||||
bundle exec kitchen destroy py3-stable-3004-ubuntu-2204
|
||||
|
||||
|
||||
py3-git-master-ubuntu-2204:
|
||||
name: Ubuntu 22.04 Master Py3 Git
|
||||
runs-on: ubuntu-latest
|
||||
timeout-minutes: 20
|
||||
|
||||
needs: lint
|
||||
|
||||
steps:
|
||||
- uses: actions/checkout@v1
|
||||
- name: Setup Ruby
|
||||
uses: actions/setup-ruby@v1
|
||||
with:
|
||||
ruby-version: 2.6.x
|
||||
|
||||
- name: Install Bundler
|
||||
run: |
|
||||
gem install bundler
|
||||
|
||||
- name: Setup Bundle
|
||||
run: |
|
||||
bundle install --with docker --without opennebula ec2 windows vagrant
|
||||
|
||||
- name: Set up Python 3.7
|
||||
uses: actions/setup-python@v1
|
||||
with:
|
||||
python-version: 3.7
|
||||
|
||||
- name: Install Python Dependencies
|
||||
run: |
|
||||
pip install -U pip
|
||||
pip install -r tests/requirements.txt
|
||||
|
||||
- name: Create Test Container
|
||||
run: |
|
||||
bundle exec kitchen create py3-git-master-ubuntu-2204 || bundle exec kitchen create py3-git-master-ubuntu-2204
|
||||
|
||||
- name: Test Bootstrap In Test Container
|
||||
run: |
|
||||
bundle exec kitchen verify py3-git-master-ubuntu-2204
|
||||
|
||||
- name: Destroy Test Container
|
||||
if: always()
|
||||
run: |
|
||||
bundle exec kitchen destroy py3-git-master-ubuntu-2204
|
||||
|
||||
|
||||
latest-ubuntu-2204:
|
||||
name: Ubuntu 22.04 Latest packaged release
|
||||
runs-on: ubuntu-latest
|
||||
timeout-minutes: 20
|
||||
|
||||
needs: lint
|
||||
|
||||
steps:
|
||||
- uses: actions/checkout@v1
|
||||
- name: Setup Ruby
|
||||
uses: actions/setup-ruby@v1
|
||||
with:
|
||||
ruby-version: 2.6.x
|
||||
|
||||
- name: Install Bundler
|
||||
run: |
|
||||
gem install bundler
|
||||
|
||||
- name: Setup Bundle
|
||||
run: |
|
||||
bundle install --with docker --without opennebula ec2 windows vagrant
|
||||
|
||||
- name: Set up Python 3.7
|
||||
uses: actions/setup-python@v1
|
||||
with:
|
||||
python-version: 3.7
|
||||
|
||||
- name: Install Python Dependencies
|
||||
run: |
|
||||
pip install -U pip
|
||||
pip install -r tests/requirements.txt
|
||||
|
||||
- name: Create Test Container
|
||||
run: |
|
||||
bundle exec kitchen create latest-ubuntu-2204 || bundle exec kitchen create latest-ubuntu-2204
|
||||
|
||||
- name: Test Bootstrap In Test Container
|
||||
run: |
|
||||
bundle exec kitchen verify latest-ubuntu-2204
|
||||
|
||||
- name: Destroy Test Container
|
||||
if: always()
|
||||
run: |
|
||||
bundle exec kitchen destroy latest-ubuntu-2204
|
||||
|
|
|
|||
17
.github/workflows/templates/generate.py
vendored
17
.github/workflows/templates/generate.py
vendored
|
|
@ -16,6 +16,7 @@ LINUX_DISTROS = [
|
|||
"debian-9",
|
||||
"fedora-34",
|
||||
"fedora-35",
|
||||
"fedora-36",
|
||||
"gentoo",
|
||||
"gentoo-systemd",
|
||||
"opensuse-15",
|
||||
|
|
@ -27,6 +28,7 @@ LINUX_DISTROS = [
|
|||
"ubuntu-1804",
|
||||
"ubuntu-2004",
|
||||
"ubuntu-2110",
|
||||
"ubuntu-2204",
|
||||
]
|
||||
OSX = WINDOWS = []
|
||||
|
||||
|
|
@ -41,6 +43,7 @@ STABLE_DISTROS = [
|
|||
"debian-9",
|
||||
"fedora-34",
|
||||
"fedora-35",
|
||||
"fedora-36",
|
||||
"gentoo",
|
||||
"gentoo-systemd",
|
||||
"opensuse-15",
|
||||
|
|
@ -51,6 +54,7 @@ STABLE_DISTROS = [
|
|||
"ubuntu-1804",
|
||||
"ubuntu-2004",
|
||||
"ubuntu-2110",
|
||||
"ubuntu-2204",
|
||||
]
|
||||
|
||||
BLACKLIST_3002 = [
|
||||
|
|
@ -60,11 +64,13 @@ BLACKLIST_3002 = [
|
|||
"debian-11",
|
||||
"fedora-34",
|
||||
"fedora-35",
|
||||
"fedora-36",
|
||||
"gentoo",
|
||||
"gentoo-systemd",
|
||||
"opensuse-15",
|
||||
"opensuse-tumbleweed",
|
||||
"rockylinux-8",
|
||||
"ubuntu-2204",
|
||||
]
|
||||
|
||||
BLACKLIST_GIT_3002 = [
|
||||
|
|
@ -76,6 +82,7 @@ BLACKLIST_GIT_3002 = [
|
|||
"debian-11",
|
||||
"fedora-34",
|
||||
"fedora-35",
|
||||
"fedora-36",
|
||||
"gentoo",
|
||||
"gentoo-systemd",
|
||||
"opensuse-15",
|
||||
|
|
@ -83,6 +90,7 @@ BLACKLIST_GIT_3002 = [
|
|||
"rockylinux-8",
|
||||
"ubuntu-2004",
|
||||
"ubuntu-2110",
|
||||
"ubuntu-2204",
|
||||
]
|
||||
|
||||
BLACKLIST_3003 = [
|
||||
|
|
@ -90,12 +98,14 @@ BLACKLIST_3003 = [
|
|||
"debian-11",
|
||||
"fedora-34",
|
||||
"fedora-35",
|
||||
"fedora-36",
|
||||
"gentoo",
|
||||
"gentoo-systemd",
|
||||
"opensuse-15",
|
||||
"opensuse-tumbleweed",
|
||||
"rockylinux-8",
|
||||
"ubuntu-1604",
|
||||
"ubuntu-2204",
|
||||
]
|
||||
|
||||
BLACKLIST_GIT_3003 = [
|
||||
|
|
@ -105,6 +115,7 @@ BLACKLIST_GIT_3003 = [
|
|||
"debian-11",
|
||||
"fedora-34",
|
||||
"fedora-35",
|
||||
"fedora-36",
|
||||
"gentoo",
|
||||
"gentoo-systemd",
|
||||
"opensuse-15",
|
||||
|
|
@ -113,12 +124,14 @@ BLACKLIST_GIT_3003 = [
|
|||
"ubuntu-1604",
|
||||
"ubuntu-2004",
|
||||
"ubuntu-2110",
|
||||
"ubuntu-2204",
|
||||
]
|
||||
|
||||
BLACKLIST_3004 = [
|
||||
"arch",
|
||||
"fedora-34",
|
||||
"fedora-35",
|
||||
"fedora-36",
|
||||
"gentoo",
|
||||
"gentoo-systemd",
|
||||
"opensuse-15",
|
||||
|
|
@ -133,6 +146,7 @@ BLACKLIST_GIT_3004 = [
|
|||
"debian-11",
|
||||
"fedora-34",
|
||||
"fedora-35",
|
||||
"fedora-36",
|
||||
"gentoo",
|
||||
"gentoo-systemd",
|
||||
"opensuse-15",
|
||||
|
|
@ -140,6 +154,7 @@ BLACKLIST_GIT_3004 = [
|
|||
"ubuntu-1604",
|
||||
"ubuntu-2004",
|
||||
"ubuntu-2110",
|
||||
"ubuntu-2204",
|
||||
]
|
||||
|
||||
SALT_BRANCHES = [
|
||||
|
|
@ -175,6 +190,7 @@ DISTRO_DISPLAY_NAMES = {
|
|||
"debian-9": "Debian 9",
|
||||
"fedora-34": "Fedora 34",
|
||||
"fedora-35": "Fedora 35",
|
||||
"fedora-36": "Fedora 36",
|
||||
"gentoo": "Gentoo",
|
||||
"gentoo-systemd": "Gentoo (systemd)",
|
||||
"opensuse-15": "Opensuse 15",
|
||||
|
|
@ -186,6 +202,7 @@ DISTRO_DISPLAY_NAMES = {
|
|||
"ubuntu-1804": "Ubuntu 18.04",
|
||||
"ubuntu-2004": "Ubuntu 20.04",
|
||||
"ubuntu-2110": "Ubuntu 21.10",
|
||||
"ubuntu-2204": "Ubuntu 22.04",
|
||||
}
|
||||
|
||||
TIMEOUT_DEFAULT = 20
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@ repos:
|
|||
- id: end-of-file-fixer # Makes sure files end in a newline and only a newline.
|
||||
|
||||
- repo: https://github.com/psf/black
|
||||
rev: 19.10b0
|
||||
rev: 22.3.0
|
||||
hooks:
|
||||
- id: black
|
||||
|
||||
|
|
|
|||
|
|
@ -1476,6 +1476,9 @@ __ubuntu_codename_translation() {
|
|||
"21")
|
||||
DISTRO_CODENAME="hirsute"
|
||||
;;
|
||||
"22")
|
||||
DISTRO_CODENAME="jammy"
|
||||
;;
|
||||
*)
|
||||
DISTRO_CODENAME="trusty"
|
||||
;;
|
||||
|
|
@ -2935,7 +2938,8 @@ __enable_universe_repository() {
|
|||
__install_saltstack_ubuntu_repository() {
|
||||
# Workaround for latest non-LTS Ubuntu
|
||||
if { [ "$DISTRO_MAJOR_VERSION" -eq 20 ] && [ "$DISTRO_MINOR_VERSION" -eq 10 ]; } || \
|
||||
[ "$DISTRO_MAJOR_VERSION" -eq 21 ]; then
|
||||
# remove 22 version when salt packages for 22.04 are available
|
||||
[ "$DISTRO_MAJOR_VERSION" -eq 21 ] || [ "$DISTRO_MAJOR_VERSION" -eq 22 ]; then
|
||||
echowarn "Non-LTS Ubuntu detected, but stable packages requested. Trying packages for previous LTS release. You may experience problems."
|
||||
UBUNTU_VERSION=20.04
|
||||
UBUNTU_CODENAME="focal"
|
||||
|
|
@ -3092,7 +3096,7 @@ install_ubuntu_stable_deps() {
|
|||
|
||||
if [ "${_UPGRADE_SYS}" -eq $BS_TRUE ]; then
|
||||
if [ "${_INSECURE_DL}" -eq $BS_TRUE ]; then
|
||||
if [ "$DISTRO_MAJOR_VERSION" -ge 20 ] || [ "$DISTRO_MAJOR_VERSION" -ge 21 ]; then
|
||||
if [ "$DISTRO_MAJOR_VERSION" -ge 20 ] || [ "$DISTRO_MAJOR_VERSION" -ge 21 ] || [ "$DISTRO_MAJOR_VERSION" -ge 22 ]; then
|
||||
__apt_get_install_noinput --allow-unauthenticated debian-archive-keyring && apt-get update || return 1
|
||||
else
|
||||
__apt_get_install_noinput --allow-unauthenticated debian-archive-keyring &&
|
||||
|
|
@ -4200,6 +4204,11 @@ install_fedora_git_post() {
|
|||
|
||||
__copyfile "${_SALT_GIT_CHECKOUT_DIR}/pkg/rpm/salt-${fname}.service" "/lib/systemd/system/salt-${fname}.service"
|
||||
|
||||
# Salt executables are located under `/usr/local/bin/` on Fedora 36+
|
||||
if [ "${DISTRO_VERSION}" -ge 36 ]; then
|
||||
sed -i -e 's:/usr/bin/:/usr/local/bin/:g' /lib/systemd/system/salt-*.service
|
||||
fi
|
||||
|
||||
# Skip salt-api since the service should be opt-in and not necessarily started on boot
|
||||
[ $fname = "api" ] && continue
|
||||
|
||||
|
|
|
|||
|
|
@ -65,6 +65,9 @@ platforms:
|
|||
- name: fedora-35
|
||||
driver:
|
||||
provision_command: *fedora_provision_command
|
||||
- name: fedora-36
|
||||
driver:
|
||||
provision_command: *fedora_provision_command
|
||||
- name: gentoo
|
||||
driver:
|
||||
image: gentoo/stage3:latest
|
||||
|
|
@ -97,6 +100,11 @@ platforms:
|
|||
- name: oraclelinux-8
|
||||
- name: oraclelinux-7
|
||||
- name: rockylinux-8
|
||||
- name: ubuntu-22.04
|
||||
driver:
|
||||
run_command: /lib/systemd/systemd
|
||||
provision_command:
|
||||
- echo "PubkeyAcceptedAlgorithms +ssh-rsa" | tee -a /etc/ssh/sshd_config
|
||||
- name: ubuntu-21.10
|
||||
driver:
|
||||
run_command: /lib/systemd/systemd
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue