mirror of
https://github.com/saltstack/salt-bootstrap.git
synced 2025-04-16 09:40:21 +00:00
Merge develop into stable for v2024.09.24 release
This commit is contained in:
Salt Project Packaging
commit
6f4ed89aa4
14 changed files with 141 additions and 84 deletions
36
.github/workflows/ci.yml
vendored
36
.github/workflows/ci.yml
vendored
|
|
@ -49,8 +49,8 @@ jobs:
|
|||
if: always()
|
||||
uses: actions/upload-artifact@v4
|
||||
with:
|
||||
name: exitstatus
|
||||
path: exitstatus
|
||||
name: exitstatus-${{ github.job }}
|
||||
path: exitstatus/
|
||||
|
||||
generate-actions-workflow:
|
||||
name: Generate The Actions Workflow
|
||||
|
|
@ -62,7 +62,7 @@ jobs:
|
|||
- uses: actions/checkout@v4
|
||||
|
||||
- name: Set up Python 3.10
|
||||
uses: actions/setup-python@v4
|
||||
uses: actions/setup-python@v5
|
||||
with:
|
||||
python-version: "3.10"
|
||||
|
||||
|
|
@ -86,8 +86,8 @@ jobs:
|
|||
if: always()
|
||||
uses: actions/upload-artifact@v4
|
||||
with:
|
||||
name: exitstatus
|
||||
path: exitstatus
|
||||
name: exitstatus-${{ github.job }}
|
||||
path: exitstatus/
|
||||
|
||||
lint:
|
||||
name: Lint
|
||||
|
|
@ -111,8 +111,8 @@ jobs:
|
|||
if: always()
|
||||
uses: actions/upload-artifact@v4
|
||||
with:
|
||||
name: exitstatus
|
||||
path: exitstatus
|
||||
name: exitstatus-${{ github.job }}
|
||||
path: exitstatus/
|
||||
|
||||
|
||||
|
||||
|
|
@ -346,20 +346,6 @@ jobs:
|
|||
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:
|
||||
name: Oracle Linux 8
|
||||
if: github.event_name == 'push' || needs.collect-changed-files.outputs.run-tests == 'true'
|
||||
|
|
@ -510,7 +496,6 @@ jobs:
|
|||
- gentoo
|
||||
- gentoo-systemd
|
||||
- opensuse-15
|
||||
- opensuse-tumbleweed
|
||||
- oraclelinux-8
|
||||
- oraclelinux-9
|
||||
- photon-4
|
||||
|
|
@ -527,14 +512,15 @@ jobs:
|
|||
if: always()
|
||||
uses: actions/download-artifact@v4
|
||||
with:
|
||||
name: exitstatus
|
||||
path: exitstatus
|
||||
path: exitstatus/
|
||||
pattern: exitstatus-*
|
||||
merge-multiple: true
|
||||
|
||||
- name: Delete Exit Status Artifacts
|
||||
if: always()
|
||||
uses: geekyeggo/delete-artifact@v5
|
||||
with:
|
||||
name: exitstatus
|
||||
pattern: exitstatus-*
|
||||
failOnError: false
|
||||
|
||||
- name: Set Pipeline Exit Status
|
||||
|
|
|
|||
2
.github/workflows/nightly.yml
vendored
2
.github/workflows/nightly.yml
vendored
|
|
@ -54,7 +54,7 @@ jobs:
|
|||
environment: release
|
||||
|
||||
steps:
|
||||
- uses: actions/checkout@v3
|
||||
- uses: actions/checkout@v4
|
||||
|
||||
- name: Get Salt Project GitHub Actions Bot Environment
|
||||
run: |
|
||||
|
|
|
|||
22
.github/workflows/release.yml
vendored
22
.github/workflows/release.yml
vendored
|
|
@ -63,7 +63,7 @@ jobs:
|
|||
outputs:
|
||||
release-version: ${{ steps.update-repo.outputs.release-version }}
|
||||
steps:
|
||||
- uses: actions/checkout@v3
|
||||
- uses: actions/checkout@v4
|
||||
with:
|
||||
ref: develop
|
||||
repository: ${{ github.repository }}
|
||||
|
|
@ -139,12 +139,13 @@ jobs:
|
|||
repository: ${{ github.repository }}
|
||||
|
||||
- name: Upload Release Details
|
||||
uses: actions/upload-artifact@v3
|
||||
uses: actions/upload-artifact@v4
|
||||
with:
|
||||
name: release-details
|
||||
path: |
|
||||
.cut_release_version
|
||||
.cut_release_changes
|
||||
include-hidden-files: true
|
||||
|
||||
merge-develop-into-stable:
|
||||
name: Merge develop into stable
|
||||
|
|
@ -158,7 +159,7 @@ jobs:
|
|||
permissions:
|
||||
contents: write # To be able to publish the release
|
||||
steps:
|
||||
- uses: actions/checkout@v3
|
||||
- uses: actions/checkout@v4
|
||||
with:
|
||||
ref: stable
|
||||
repository: ${{ github.repository }}
|
||||
|
|
@ -205,7 +206,7 @@ jobs:
|
|||
git config --global commit.gpgsign true
|
||||
|
||||
- name: Download Release Details
|
||||
uses: actions/download-artifact@v3
|
||||
uses: actions/download-artifact@v4
|
||||
with:
|
||||
name: release-details
|
||||
|
||||
|
|
@ -254,13 +255,14 @@ jobs:
|
|||
permissions:
|
||||
contents: write # To be able to publish the release
|
||||
steps:
|
||||
- uses: actions/checkout@v3
|
||||
- uses: actions/checkout@v4
|
||||
with:
|
||||
ref: stable
|
||||
repository: ${{ github.repository }}
|
||||
ssh-key: ${{ secrets.SALT_BOOTSTRAP_RELEASE_KEY }}
|
||||
|
||||
- name: Download Release Details
|
||||
uses: actions/download-artifact@v3
|
||||
uses: actions/download-artifact@v4
|
||||
with:
|
||||
name: release-details
|
||||
|
||||
|
|
@ -287,7 +289,7 @@ jobs:
|
|||
LICENSE
|
||||
|
||||
- name: Delete Release Details Artifact
|
||||
uses: geekyeggo/delete-artifact@v2
|
||||
uses: geekyeggo/delete-artifact@v5
|
||||
with:
|
||||
name: release-details
|
||||
failOnError: false
|
||||
|
|
@ -303,7 +305,7 @@ jobs:
|
|||
environment: release
|
||||
|
||||
steps:
|
||||
- uses: actions/checkout@v3
|
||||
- uses: actions/checkout@v4
|
||||
with:
|
||||
ref: stable
|
||||
repository: ${{ github.repository }}
|
||||
|
|
@ -367,7 +369,7 @@ jobs:
|
|||
pull-requests: write # For action peter-evans/create-pull-request
|
||||
|
||||
steps:
|
||||
- uses: actions/checkout@v3
|
||||
- uses: actions/checkout@v4
|
||||
with:
|
||||
ref: stable
|
||||
repository: ${{ github.repository }}
|
||||
|
|
@ -378,7 +380,7 @@ jobs:
|
|||
echo "SH=$(sha256sum bootstrap-salt.sh | awk '{ print $1 }')" >> "$GITHUB_ENV"
|
||||
echo "BS_VERSION=$(sh bootstrap-salt.sh -v | awk '{ print $4 }')" >> "$GITHUB_ENV"
|
||||
|
||||
- uses: actions/checkout@v3
|
||||
- uses: actions/checkout@v4
|
||||
with:
|
||||
ref: develop
|
||||
repository: ${{ github.repository }}
|
||||
|
|
|
|||
7
.github/workflows/templates/ci-tail.yml
vendored
7
.github/workflows/templates/ci-tail.yml
vendored
|
|
@ -13,14 +13,15 @@
|
|||
if: always()
|
||||
uses: actions/download-artifact@v4
|
||||
with:
|
||||
name: exitstatus
|
||||
path: exitstatus
|
||||
path: exitstatus/
|
||||
pattern: exitstatus-*
|
||||
merge-multiple: true
|
||||
|
||||
- name: Delete Exit Status Artifacts
|
||||
if: always()
|
||||
uses: geekyeggo/delete-artifact@v5
|
||||
with:
|
||||
name: exitstatus
|
||||
pattern: exitstatus-*
|
||||
failOnError: false
|
||||
|
||||
- name: Set Pipeline Exit Status
|
||||
|
|
|
|||
14
.github/workflows/templates/ci.yml
vendored
14
.github/workflows/templates/ci.yml
vendored
|
|
@ -49,8 +49,8 @@ jobs:
|
|||
if: always()
|
||||
uses: actions/upload-artifact@v4
|
||||
with:
|
||||
name: exitstatus
|
||||
path: exitstatus
|
||||
name: exitstatus-${{ github.job }}
|
||||
path: exitstatus/
|
||||
|
||||
generate-actions-workflow:
|
||||
name: Generate The Actions Workflow
|
||||
|
|
@ -62,7 +62,7 @@ jobs:
|
|||
- uses: actions/checkout@v4
|
||||
|
||||
- name: Set up Python 3.10
|
||||
uses: actions/setup-python@v4
|
||||
uses: actions/setup-python@v5
|
||||
with:
|
||||
python-version: "3.10"
|
||||
|
||||
|
|
@ -86,8 +86,8 @@ jobs:
|
|||
if: always()
|
||||
uses: actions/upload-artifact@v4
|
||||
with:
|
||||
name: exitstatus
|
||||
path: exitstatus
|
||||
name: exitstatus-${{ github.job }}
|
||||
path: exitstatus/
|
||||
|
||||
lint:
|
||||
name: Lint
|
||||
|
|
@ -111,5 +111,5 @@ jobs:
|
|||
if: always()
|
||||
uses: actions/upload-artifact@v4
|
||||
with:
|
||||
name: exitstatus
|
||||
path: exitstatus
|
||||
name: exitstatus-${{ github.job }}
|
||||
path: exitstatus/
|
||||
|
|
|
|||
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__)))
|
||||
|
||||
## "amazon-2023",
|
||||
## "opensuse-tumbleweed",
|
||||
LINUX_DISTROS = [
|
||||
"almalinux-8",
|
||||
"almalinux-9",
|
||||
|
|
@ -20,7 +21,6 @@ LINUX_DISTROS = [
|
|||
"gentoo",
|
||||
"gentoo-systemd",
|
||||
"opensuse-15",
|
||||
"opensuse-tumbleweed",
|
||||
"oraclelinux-8",
|
||||
"oraclelinux-9",
|
||||
"photon-4",
|
||||
|
|
@ -43,6 +43,7 @@ OSX = [
|
|||
|
||||
|
||||
## "amazon-2023",
|
||||
## "opensuse-tumbleweed",
|
||||
STABLE_DISTROS = [
|
||||
"almalinux-8",
|
||||
"almalinux-9",
|
||||
|
|
@ -54,7 +55,6 @@ STABLE_DISTROS = [
|
|||
"fedora-39",
|
||||
"fedora-40",
|
||||
"opensuse-15",
|
||||
"opensuse-tumbleweed",
|
||||
"oraclelinux-8",
|
||||
"oraclelinux-9",
|
||||
"photon-4",
|
||||
|
|
@ -99,6 +99,7 @@ ONEDIR_RC_DISTROS = [
|
|||
"ubuntu-2404",
|
||||
]
|
||||
|
||||
## "opensuse-tumbleweed",
|
||||
BLACKLIST_3006 = [
|
||||
"arch",
|
||||
"debian-12",
|
||||
|
|
@ -106,22 +107,22 @@ BLACKLIST_3006 = [
|
|||
"gentoo",
|
||||
"gentoo-systemd",
|
||||
"opensuse-15",
|
||||
"opensuse-tumbleweed",
|
||||
"ubuntu-2404",
|
||||
]
|
||||
|
||||
## "opensuse-tumbleweed",
|
||||
BLACKLIST_3007 = [
|
||||
"arch",
|
||||
"fedora-39",
|
||||
"gentoo",
|
||||
"gentoo-systemd",
|
||||
"opensuse-15",
|
||||
"opensuse-tumbleweed",
|
||||
"photon-4",
|
||||
"photon-5",
|
||||
]
|
||||
|
||||
## "amazon-2023",
|
||||
## "opensuse-tumbleweed",
|
||||
BLACKLIST_GIT_3006 = [
|
||||
"almalinux-9",
|
||||
"amazon-2",
|
||||
|
|
@ -133,7 +134,6 @@ BLACKLIST_GIT_3006 = [
|
|||
"gentoo",
|
||||
"gentoo-systemd",
|
||||
"opensuse-15",
|
||||
"opensuse-tumbleweed",
|
||||
"oraclelinux-9",
|
||||
"photon-4",
|
||||
"photon-5",
|
||||
|
|
@ -144,6 +144,7 @@ BLACKLIST_GIT_3006 = [
|
|||
]
|
||||
|
||||
## "amazon-2023",
|
||||
## "opensuse-tumbleweed",
|
||||
BLACKLIST_GIT_3007 = [
|
||||
"almalinux-9",
|
||||
"amazon-2",
|
||||
|
|
@ -156,7 +157,6 @@ BLACKLIST_GIT_3007 = [
|
|||
"gentoo",
|
||||
"gentoo-systemd",
|
||||
"opensuse-15",
|
||||
"opensuse-tumbleweed",
|
||||
"oraclelinux-9",
|
||||
"photon-4",
|
||||
"photon-5",
|
||||
|
|
@ -240,6 +240,7 @@ LATEST_PKG_BLACKLIST = [
|
|||
]
|
||||
|
||||
## "amazon-2023": "Amazon 2023",
|
||||
## "opensuse-tumbleweed": "Opensuse Tumbleweed",
|
||||
DISTRO_DISPLAY_NAMES = {
|
||||
"almalinux-8": "AlmaLinux 8",
|
||||
"almalinux-9": "AlmaLinux 9",
|
||||
|
|
@ -253,7 +254,6 @@ DISTRO_DISPLAY_NAMES = {
|
|||
"gentoo": "Gentoo",
|
||||
"gentoo-systemd": "Gentoo (systemd)",
|
||||
"opensuse-15": "Opensuse 15",
|
||||
"opensuse-tumbleweed": "Opensuse Tumbleweed",
|
||||
"oraclelinux-8": "Oracle Linux 8",
|
||||
"oraclelinux-9": "Oracle Linux 9",
|
||||
"photon-4": "Photon OS 4",
|
||||
|
|
|
|||
8
.github/workflows/test-linux.yml
vendored
8
.github/workflows/test-linux.yml
vendored
|
|
@ -45,7 +45,7 @@ jobs:
|
|||
bundler-cache: true
|
||||
|
||||
- name: Set up Python 3.10
|
||||
uses: actions/setup-python@v4
|
||||
uses: actions/setup-python@v5
|
||||
with:
|
||||
python-version: "3.10"
|
||||
|
||||
|
|
@ -79,7 +79,7 @@ jobs:
|
|||
|
||||
- name: Upload Exit Status
|
||||
if: always()
|
||||
uses: actions/upload-artifact@v3
|
||||
uses: actions/upload-artifact@v4
|
||||
with:
|
||||
name: exitstatus
|
||||
path: exitstatus
|
||||
name: exitstatus-${{ github.job }}-${{ matrix.instance }}-${{ inputs.distro-slug }}
|
||||
path: exitstatus/
|
||||
|
|
|
|||
8
.github/workflows/test-macos.yml
vendored
8
.github/workflows/test-macos.yml
vendored
|
|
@ -52,7 +52,7 @@ jobs:
|
|||
bundler-cache: true
|
||||
|
||||
- name: Set up Python 3.10
|
||||
uses: actions/setup-python@v4
|
||||
uses: actions/setup-python@v5
|
||||
with:
|
||||
python-version: "3.10"
|
||||
|
||||
|
|
@ -86,7 +86,7 @@ jobs:
|
|||
|
||||
- name: Upload Exit Status
|
||||
if: always()
|
||||
uses: actions/upload-artifact@v3
|
||||
uses: actions/upload-artifact@v4
|
||||
with:
|
||||
name: exitstatus
|
||||
path: exitstatus
|
||||
name: exitstatus-${{ github.job }}-${{ matrix.instance }}-${{ inputs.distro-slug }}
|
||||
path: exitstatus/
|
||||
|
|
|
|||
10
.github/workflows/test-windows.yml
vendored
10
.github/workflows/test-windows.yml
vendored
|
|
@ -45,7 +45,7 @@ jobs:
|
|||
instance: ${{ fromJSON(inputs.instances) }}
|
||||
|
||||
steps:
|
||||
- uses: actions/checkout@v3
|
||||
- uses: actions/checkout@v4
|
||||
|
||||
- name: Setup Ruby
|
||||
uses: ruby/setup-ruby@v1
|
||||
|
|
@ -81,7 +81,7 @@ jobs:
|
|||
env
|
||||
|
||||
- name: Set up Python 3.10
|
||||
uses: actions/setup-python@v4
|
||||
uses: actions/setup-python@v5
|
||||
with:
|
||||
python-version: "3.10"
|
||||
|
||||
|
|
@ -115,7 +115,7 @@ jobs:
|
|||
|
||||
- name: Upload Exit Status
|
||||
if: always()
|
||||
uses: actions/upload-artifact@v3
|
||||
uses: actions/upload-artifact@v4
|
||||
with:
|
||||
name: exitstatus
|
||||
path: exitstatus
|
||||
name: exitstatus-${{ github.job }}-${{ matrix.instance }}-${{ inputs.distro-slug }}
|
||||
path: exitstatus/
|
||||
|
|
|
|||
33
CHANGELOG.md
33
CHANGELOG.md
|
|
@ -1,3 +1,36 @@
|
|||
# v2024.09.24
|
||||
|
||||
## What's Changed
|
||||
|
||||
- Add KDE neon to list of Ubuntu derivates (again) by @digitalkram in https://github.com/saltstack/salt-bootstrap/pull/2016
|
||||
- Debugging build failures on Arch, Fedora and Tumbleweed by @dmurphy18 in https://github.com/saltstack/salt-bootstrap/pull/2018
|
||||
- Reset \_PIP_INSTALL_ARGS to empty for Alpine, similar to Ubuntu and Debian by @dmurphy18 in https://github.com/saltstack/salt-bootstrap/pull/2019
|
||||
- Updated deprecated versions for actions for upload, download, checkout for release by @dmurphy18 in https://github.com/saltstack/salt-bootstrap/pull/2020
|
||||
- Further action updates by @dmurphy18 in https://github.com/saltstack/salt-bootstrap/pull/2021
|
||||
|
||||
**Full Changelog**: https://github.com/saltstack/salt-bootstrap/compare/v2024.07.23...v2024.09.24
|
||||
|
||||
# v2024.09.23
|
||||
|
||||
## What's Changed
|
||||
|
||||
- Add KDE neon to list of Ubuntu derivates (again) by @digitalkram in https://github.com/saltstack/salt-bootstrap/pull/2016
|
||||
- Debugging build failures on Arch, Fedora and Tumbleweed by @dmurphy18 in https://github.com/saltstack/salt-bootstrap/pull/2018
|
||||
- Reset \_PIP_INSTALL_ARGS to empty for Alpine, similar to Ubuntu and Debian by @dmurphy18 in https://github.com/saltstack/salt-bootstrap/pull/2019
|
||||
- Updated deprecated versions for actions for upload, download, checkout for release by @dmurphy18 in https://github.com/saltstack/salt-bootstrap/pull/2020
|
||||
|
||||
**Full Changelog**: https://github.com/saltstack/salt-bootstrap/compare/v2024.07.23...v2024.09.23
|
||||
|
||||
# v2024.09.23
|
||||
|
||||
## What's Changed
|
||||
|
||||
- Add KDE neon to list of Ubuntu derivates (again) by @digitalkram in https://github.com/saltstack/salt-bootstrap/pull/2016
|
||||
- Debugging build failures on Arch, Fedora and Tumbleweed by @dmurphy18 in https://github.com/saltstack/salt-bootstrap/pull/2018
|
||||
- Reset \_PIP_INSTALL_ARGS to empty for Alpine, similar to Ubuntu and Debian by @dmurphy18 in https://github.com/saltstack/salt-bootstrap/pull/2019
|
||||
|
||||
**Full Changelog**: https://github.com/saltstack/salt-bootstrap/compare/v2024.07.23...v2024.09.23
|
||||
|
||||
# v2024.07.23
|
||||
|
||||
## What's Changed
|
||||
|
|
|
|||
|
|
@ -37,6 +37,7 @@ sum** of the downloaded ``bootstrap-salt.sh`` file.
|
|||
|
||||
The SHA256 sum of the ``bootstrap-salt.sh`` file, per release, is:
|
||||
|
||||
- 2024.07.23: ``7212b6b497b5c3d2bf15bfe5301625ec7bc1bf3e2949cd47d8e2073614935bf8``
|
||||
- 2024.07.18: ``92a74e7ff8a9032a7713c2b3955991d66aaca08a4eb9494ce3dd66b5044f6bc3``
|
||||
- 2024.07.16: ``4f76d1549c71d696a605f97645d8633b6269c4d9ae54b1fbdfedca1dcf893e7a``
|
||||
- 2024.07.12: ``526f4a5383db308081a120e26988679238ca6add4bf7a82120cbe71d57ab826e``
|
||||
|
|
|
|||
|
|
@ -110,7 +110,7 @@ if ($help) {
|
|||
exit 0
|
||||
}
|
||||
|
||||
$__ScriptVersion = "2024.07.23"
|
||||
$__ScriptVersion = "2024.09.24"
|
||||
$ScriptName = $myInvocation.MyCommand.Name
|
||||
|
||||
# We'll check for the Version next, because it also has no requirements
|
||||
|
|
|
|||
|
|
@ -26,7 +26,7 @@
|
|||
#======================================================================================================================
|
||||
set -o nounset # Treat unset variables as an error
|
||||
|
||||
__ScriptVersion="2024.07.23"
|
||||
__ScriptVersion="2024.09.24"
|
||||
__ScriptName="bootstrap-salt.sh"
|
||||
|
||||
__ScriptFullName="$0"
|
||||
|
|
@ -272,7 +272,8 @@ _ONEDIR_DIR="salt"
|
|||
_ONEDIR_NIGHTLY_DIR="salt-dev/${_ONEDIR_DIR}"
|
||||
_PY_EXE="python3"
|
||||
_MINIMUM_PIP_VERSION="9.0.1"
|
||||
_MINIMUM_SETUPTOOLS_VERSION="9.1"
|
||||
_MINIMUM_SETUPTOOLS_VERSION="65.6.3"
|
||||
_MAXIMUM_SETUPTOOLS_VERSION="69.0"
|
||||
_PIP_INSTALL_ARGS="--prefix=/usr"
|
||||
_PIP_DOWNLOAD_ARGS=""
|
||||
_QUICK_START="$BS_FALSE"
|
||||
|
|
@ -1279,7 +1280,7 @@ __gather_system_info() {
|
|||
#----------------------------------------------------------------------------------------------------------------------
|
||||
# shellcheck disable=SC2034
|
||||
__ubuntu_derivatives_translation() {
|
||||
UBUNTU_DERIVATIVES="(trisquel|linuxmint|elementary_os|pop)"
|
||||
UBUNTU_DERIVATIVES="(trisquel|linuxmint|elementary_os|pop|neon)"
|
||||
# Mappings
|
||||
trisquel_10_ubuntu_base="20.04"
|
||||
trisquel_11_ubuntu_base="22.04"
|
||||
|
|
@ -1852,7 +1853,7 @@ if [ "$ITYPE" = "git" ]; then
|
|||
echowarn "git based installations will always install salt"
|
||||
echowarn "and its dependencies using pip which will be upgraded to"
|
||||
echowarn "at least v${_MINIMUM_PIP_VERSION}, and, in case the setuptools version is also"
|
||||
echowarn "too old, it will be upgraded to at least v${_MINIMUM_SETUPTOOLS_VERSION}"
|
||||
echowarn "too old, it will be upgraded to at least v${_MINIMUM_SETUPTOOLS_VERSION} and less than v${_MAXIMUM_SETUPTOOLS_VERSION}"
|
||||
echo
|
||||
echowarn "You have 10 seconds to cancel and stop the bootstrap process..."
|
||||
echo
|
||||
|
|
@ -2101,10 +2102,15 @@ __git_clone_and_checkout() {
|
|||
if [ "$(git clone 2>&1 | grep 'single-branch')" != "" ]; then
|
||||
# The "--single-branch" option is supported, attempt shallow cloning
|
||||
echoinfo "Attempting to shallow clone $GIT_REV from Salt's repository ${_SALT_REPO_URL}"
|
||||
if git clone --depth 1 --branch "$GIT_REV" "$_SALT_REPO_URL" "$__SALT_CHECKOUT_REPONAME"; then
|
||||
## Shallow cloning is resulting in the wrong version of Salt, even with a depth of 5
|
||||
## getting 3007.0+0na.246d066 when it should be 3007.1+410.g246d066457, disabling for now
|
||||
## if git clone --depth 1 --branch "$GIT_REV" "$_SALT_REPO_URL" "$__SALT_CHECKOUT_REPONAME"; then
|
||||
echodebug "git command, git clone --branch $GIT_REV $_SALT_REPO_URL $__SALT_CHECKOUT_REPONAME"
|
||||
if git clone --branch "$GIT_REV" "$_SALT_REPO_URL" "$__SALT_CHECKOUT_REPONAME"; then
|
||||
# shellcheck disable=SC2164
|
||||
cd "${_SALT_GIT_CHECKOUT_DIR}"
|
||||
__SHALLOW_CLONE=$BS_TRUE
|
||||
echoinfo "shallow path (disabled shallow) git cloned $GIT_REV, version $(python3 salt/version.py)"
|
||||
else
|
||||
# Shallow clone above failed(missing upstream tags???), let's resume the old behaviour.
|
||||
echowarn "Failed to shallow clone."
|
||||
|
|
@ -2118,10 +2124,13 @@ __git_clone_and_checkout() {
|
|||
fi
|
||||
|
||||
if [ "$__SHALLOW_CLONE" -eq $BS_FALSE ]; then
|
||||
echodebug "shallow clone false, BS_FALSE $BS_FALSE, git clone $_SALT_REPO_URL $__SALT_CHECKOUT_REPONAME"
|
||||
git clone "$_SALT_REPO_URL" "$__SALT_CHECKOUT_REPONAME" || return 1
|
||||
# shellcheck disable=SC2164
|
||||
cd "${_SALT_GIT_CHECKOUT_DIR}"
|
||||
|
||||
echoinfo "git cloned $GIT_REV, version $(python3 salt/version.py)"
|
||||
|
||||
if ! echo "$_SALT_REPO_URL" | grep -q -F -w "${_SALTSTACK_REPO_URL#*://}"; then
|
||||
# We need to add the saltstack repository as a remote and fetch tags for proper versioning
|
||||
echoinfo "Adding SaltStack's Salt repository as a remote"
|
||||
|
|
@ -2677,7 +2686,7 @@ EOM
|
|||
echodebug "Installed pip version: $(${_pip_cmd} --version)"
|
||||
fi
|
||||
|
||||
_setuptools_dep="setuptools>=${_MINIMUM_SETUPTOOLS_VERSION}"
|
||||
_setuptools_dep="setuptools>=${_MINIMUM_SETUPTOOLS_VERSION},<${_MAXIMUM_SETUPTOOLS_VERSION}"
|
||||
if [ "$_PY_MAJOR_VERSION" -ne 3 ]; then
|
||||
echoerror "Python version is no longer supported, only Python 3"
|
||||
return 1
|
||||
|
|
@ -2694,10 +2703,12 @@ EOM
|
|||
echodebug "Running '${_pip_cmd} install ${_USE_BREAK_SYSTEM_PACKAGES} --upgrade ${_PIP_INSTALL_ARGS} wheel ${_setuptools_dep}"
|
||||
${_pip_cmd} install ${_USE_BREAK_SYSTEM_PACKAGES} --upgrade ${_PIP_INSTALL_ARGS} wheel "${_setuptools_dep}"
|
||||
|
||||
echoinfo "Installing salt using ${_py_exe}"
|
||||
echoinfo "Installing salt using ${_py_exe}, $(${_py_exe} --version)"
|
||||
cd "${_SALT_GIT_CHECKOUT_DIR}" || return 1
|
||||
|
||||
mkdir /tmp/git/deps
|
||||
mkdir -p /tmp/git/deps
|
||||
echodebug "Created directory /tmp/git/deps"
|
||||
echodebug "Installing Salt dependencies for Salt version $(python3 salt/version.py)"
|
||||
|
||||
if [ ${DISTRO_NAME_L} = "ubuntu" ] && [ "$DISTRO_MAJOR_VERSION" -eq 22 ]; then
|
||||
echodebug "Ubuntu 22.04 has problem with base.txt requirements file, not parsing sys_platform == 'win32', upgrading from default pip works"
|
||||
|
|
@ -2728,8 +2739,18 @@ EOM
|
|||
|
||||
echoinfo "Installing Built Salt Wheel"
|
||||
${_pip_cmd} uninstall --yes ${_USE_BREAK_SYSTEM_PACKAGES} salt 2>/dev/null || true
|
||||
|
||||
# Hack for getting current Arch working with git-master
|
||||
if [ "${DISTRO_NAME}" = "Arch Linux" ]; then
|
||||
_arch_dep="cryptography==42.0.7" # debug matching current Arch version of python-cryptography
|
||||
echodebug "Running '${_pip_cmd} install --force-reinstall --break-system-packages ${_arch_dep}'"
|
||||
${_pip_cmd} install --force-reinstall --break-system-packages "${_arch_dep}"
|
||||
fi
|
||||
|
||||
echodebug "Running '${_pip_cmd} install ${_USE_BREAK_SYSTEM_PACKAGES} --no-deps --force-reinstall ${_PIP_INSTALL_ARGS} /tmp/git/deps/salt*.whl'"
|
||||
|
||||
echodebug "Running ${_pip_cmd} install ${_USE_BREAK_SYSTEM_PACKAGES} --no-deps --force-reinstall ${_PIP_INSTALL_ARGS} --global-option=--salt-config-dir=$_SALT_ETC_DIR --salt-cache-dir=${_SALT_CACHE_DIR} ${SETUP_PY_INSTALL_ARGS} /tmp/git/deps/salt*.whl"
|
||||
|
||||
${_pip_cmd} install ${_USE_BREAK_SYSTEM_PACKAGES} --no-deps --force-reinstall \
|
||||
${_PIP_INSTALL_ARGS} \
|
||||
--global-option="--salt-config-dir=$_SALT_ETC_DIR --salt-cache-dir=${_SALT_CACHE_DIR} ${SETUP_PY_INSTALL_ARGS}" \
|
||||
|
|
@ -3831,6 +3852,10 @@ install_fedora_git_deps() {
|
|||
CONFIG_SALT_FUNC="config_salt"
|
||||
fi
|
||||
|
||||
_fedora_dep="contextvars"
|
||||
echodebug "Running '${_PY_EXE} -m pip install --upgrade ${_fedora_dep}'"
|
||||
${_PY_EXE} -m pip install --upgrade "${_fedora_dep}"
|
||||
|
||||
return 0
|
||||
}
|
||||
|
||||
|
|
@ -5135,6 +5160,7 @@ install_cloud_linux_check_services() {
|
|||
# Alpine Linux Install Functions
|
||||
#
|
||||
install_alpine_linux_stable_deps() {
|
||||
_PIP_INSTALL_ARGS=""
|
||||
if ! grep -q '^[^#].\+alpine/.\+/community' /etc/apk/repositories; then
|
||||
# Add community repository entry based on the "main" repo URL
|
||||
__REPO=$(grep '^[^#].\+alpine/.\+/main\>' /etc/apk/repositories)
|
||||
|
|
@ -5153,6 +5179,7 @@ install_alpine_linux_stable_deps() {
|
|||
}
|
||||
|
||||
install_alpine_linux_git_deps() {
|
||||
_PIP_INSTALL_ARGS=""
|
||||
install_alpine_linux_stable_deps || return 1
|
||||
|
||||
if ! __check_command_exists git; then
|
||||
|
|
@ -5168,6 +5195,7 @@ install_alpine_linux_git_deps() {
|
|||
|
||||
install_alpine_linux_stable() {
|
||||
__PACKAGES="salt"
|
||||
_PIP_INSTALL_ARGS=""
|
||||
|
||||
if [ "$_INSTALL_CLOUD" -eq $BS_TRUE ];then
|
||||
__PACKAGES="${__PACKAGES} salt-cloud"
|
||||
|
|
@ -5192,11 +5220,13 @@ install_alpine_linux_stable() {
|
|||
}
|
||||
|
||||
install_alpine_linux_git() {
|
||||
_PIP_INSTALL_ARGS=""
|
||||
__install_salt_from_repo "${_PY_EXE}" || return 1
|
||||
return 0
|
||||
}
|
||||
|
||||
install_alpine_linux_post() {
|
||||
_PIP_INSTALL_ARGS=""
|
||||
for fname in api master minion syndic; do
|
||||
# Skip if not meant to be installed
|
||||
[ $fname = "api" ] && \
|
||||
|
|
@ -5226,6 +5256,7 @@ install_alpine_linux_post() {
|
|||
}
|
||||
|
||||
install_alpine_linux_restart_daemons() {
|
||||
_PIP_INSTALL_ARGS=""
|
||||
[ "${_START_DAEMONS}" -eq $BS_FALSE ] && return
|
||||
|
||||
for fname in api master minion syndic; do
|
||||
|
|
@ -5244,6 +5275,7 @@ install_alpine_linux_restart_daemons() {
|
|||
}
|
||||
|
||||
install_alpine_linux_check_services() {
|
||||
_PIP_INSTALL_ARGS=""
|
||||
for fname in api master minion syndic; do
|
||||
# Skip salt-api since the service should be opt-in and not necessarily started on boot
|
||||
[ $fname = "api" ] && continue
|
||||
|
|
@ -5260,6 +5292,7 @@ install_alpine_linux_check_services() {
|
|||
}
|
||||
|
||||
daemons_running_alpine_linux() {
|
||||
_PIP_INSTALL_ARGS=""
|
||||
[ "${_START_DAEMONS}" -eq $BS_FALSE ] && return
|
||||
|
||||
FAILED_DAEMONS=0
|
||||
|
|
@ -6023,7 +6056,7 @@ install_photon_git_deps() {
|
|||
|
||||
if [ "${DISTRO_MAJOR_VERSION}" -gt 3 ]; then
|
||||
# Need newer version of setuptools on Photon
|
||||
_setuptools_dep="setuptools>=${_MINIMUM_SETUPTOOLS_VERSION}"
|
||||
_setuptools_dep="setuptools>=${_MINIMUM_SETUPTOOLS_VERSION},<${_MAXIMUM_SETUPTOOLS_VERSION}"
|
||||
echodebug "Running '${_PY_EXE} -m pip install --upgrade ${_setuptools_dep}'"
|
||||
${_PY_EXE} -m pip install --upgrade "${_setuptools_dep}"
|
||||
fi
|
||||
|
|
|
|||
17
kitchen.yml
17
kitchen.yml
|
|
@ -36,6 +36,15 @@ provisioner:
|
|||
## - yum -y install --allowerasing procps-ng curl
|
||||
## - 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:
|
||||
- name: almalinux-9
|
||||
driver:
|
||||
|
|
@ -104,14 +113,6 @@ platforms:
|
|||
- &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
|
||||
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
|
||||
driver:
|
||||
platform: centosstream
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue