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

Merge develop branch for 2020.10.20 release

Browse source
This commit is contained in:
Pedro Algarvio 2020-10-21 10:25:25 +01:00
commit 2fb55a93fb
No known key found for this signature in database
GPG key ID: BB36BF6584A298FF
6 changed files with 40 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
.github/workflows/checksums.yml vendored
View file

@ -12,38 +12,42 @@ jobs:
steps:
- uses: actions/checkout@v2
if: github.repository == 'saltstack/salt-bootstrap'
with:
ref: stable
- name: Get bootstrap-salt.sh sha256sum
if: github.repository == 'saltstack/salt-bootstrap'
run: |
echo "SH=$(sha256sum bootstrap-salt.sh | awk '{ print $1 }')" >> $GITHUB_ENV
echo "PS1=$(sha256sum bootstrap-salt.ps1 | awk '{ print $1 }')" >> $GITHUB_ENV
echo "BS_VERSION=$(sh bootstrap-salt.sh -v | awk '{ print $4 }')" >> $GITHUB_ENV
- name: Set up Python 3.7
uses: actions/setup-python@v1
with:
python-version: 3.7
- name: Update Checksums
if: github.repository == 'saltstack/salt-bootstrap'
run: |
echo ${{ env.SH }} > bootstrap-salt.sh.sha256
echo ${{ env.PS1 }} > bootstrap-salt.ps1.sha256
git config --global user.name 'SaltStack GH Automation'
git config --global user.email 'actions@github.com'
git add *.sha256
git commit -am "Update sha256 checksums"
git push
git commit -am "Update sha256 checksums" && git push || true
- uses: actions/checkout@v2
if: github.repository == 'saltstack/salt-bootstrap'
with:
ref: develop
- name: Set up Python 3.7
if: github.repository == 'saltstack/salt-bootstrap'
uses: actions/setup-python@v1
with:
python-version: 3.7
- name: Update Latest Release on README
if: github.repository == 'saltstack/salt-bootstrap'
run: |
python3 .github/workflows/scripts/update-release-shasum.py ${{ env.BS_VERSION }} ${{ env.SH }}
git config --global user.name 'SaltStack GH Automation'
git config --global user.email 'actions@github.com'
git commit -am "Update README.rst with latest release sha256sum"
git push
git commit -am "Update README.rst with latest release sha256sum" && git push || true

36
.github/workflows/main.yml vendored
View file

@ -3267,7 +3267,7 @@ jobs:
py3-stable-2019-2-gentoo:
name: Gentoo v2019.2 Py3 Stable
runs-on: ubuntu-latest
timeout-minutes: 45
timeout-minutes: 50
needs: lint
@ -3313,7 +3313,7 @@ jobs:
py3-git-2019-2-gentoo:
name: Gentoo v2019.2 Py3 Git
runs-on: ubuntu-latest
timeout-minutes: 45
timeout-minutes: 50
needs: lint
@ -3359,7 +3359,7 @@ jobs:
py3-stable-3000-gentoo:
name: Gentoo v3000 Py3 Stable
runs-on: ubuntu-latest
timeout-minutes: 45
timeout-minutes: 50
needs: lint
@ -3405,7 +3405,7 @@ jobs:
py3-git-3000-gentoo:
name: Gentoo v3000 Py3 Git
runs-on: ubuntu-latest
timeout-minutes: 45
timeout-minutes: 50
needs: lint
@ -3451,7 +3451,7 @@ jobs:
py3-stable-3001-gentoo:
name: Gentoo v3001 Py3 Stable
runs-on: ubuntu-latest
timeout-minutes: 45
timeout-minutes: 50
needs: lint
@ -3497,7 +3497,7 @@ jobs:
py3-git-3001-gentoo:
name: Gentoo v3001 Py3 Git
runs-on: ubuntu-latest
timeout-minutes: 45
timeout-minutes: 50
needs: lint
@ -3543,7 +3543,7 @@ jobs:
py3-stable-3001-0-gentoo:
name: Gentoo v3001.0 Py3 Stable
runs-on: ubuntu-latest
timeout-minutes: 45
timeout-minutes: 50
needs: lint
@ -3589,7 +3589,7 @@ jobs:
py3-git-master-gentoo:
name: Gentoo Master Py3 Git
runs-on: ubuntu-latest
timeout-minutes: 45
timeout-minutes: 50
needs: lint
@ -3635,7 +3635,7 @@ jobs:
latest-gentoo:
name: Gentoo Latest packaged release
runs-on: ubuntu-latest
timeout-minutes: 45
timeout-minutes: 50
needs: lint
@ -3681,7 +3681,7 @@ jobs:
py3-stable-2019-2-gentoo-systemd:
name: Gentoo (systemd) v2019.2 Py3 Stable
runs-on: ubuntu-latest
timeout-minutes: 45
timeout-minutes: 50
needs: lint
@ -3727,7 +3727,7 @@ jobs:
py3-git-2019-2-gentoo-systemd:
name: Gentoo (systemd) v2019.2 Py3 Git
runs-on: ubuntu-latest
timeout-minutes: 45
timeout-minutes: 50
needs: lint
@ -3773,7 +3773,7 @@ jobs:
py3-stable-3000-gentoo-systemd:
name: Gentoo (systemd) v3000 Py3 Stable
runs-on: ubuntu-latest
timeout-minutes: 45
timeout-minutes: 50
needs: lint
@ -3819,7 +3819,7 @@ jobs:
py3-git-3000-gentoo-systemd:
name: Gentoo (systemd) v3000 Py3 Git
runs-on: ubuntu-latest
timeout-minutes: 45
timeout-minutes: 50
needs: lint
@ -3865,7 +3865,7 @@ jobs:
py3-stable-3001-gentoo-systemd:
name: Gentoo (systemd) v3001 Py3 Stable
runs-on: ubuntu-latest
timeout-minutes: 45
timeout-minutes: 50
needs: lint
@ -3911,7 +3911,7 @@ jobs:
py3-git-3001-gentoo-systemd:
name: Gentoo (systemd) v3001 Py3 Git
runs-on: ubuntu-latest
timeout-minutes: 45
timeout-minutes: 50
needs: lint
@ -3957,7 +3957,7 @@ jobs:
py3-stable-3001-0-gentoo-systemd:
name: Gentoo (systemd) v3001.0 Py3 Stable
runs-on: ubuntu-latest
timeout-minutes: 45
timeout-minutes: 50
needs: lint
@ -4003,7 +4003,7 @@ jobs:
py3-git-master-gentoo-systemd:
name: Gentoo (systemd) Master Py3 Git
runs-on: ubuntu-latest
timeout-minutes: 45
timeout-minutes: 50
needs: lint
@ -4049,7 +4049,7 @@ jobs:
latest-gentoo-systemd:
name: Gentoo (systemd) Latest packaged release
runs-on: ubuntu-latest
timeout-minutes: 45
timeout-minutes: 50
needs: lint

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

@ -126,8 +126,8 @@ DISTRO_DISPLAY_NAMES = {
TIMEOUT_DEFAULT = 20
TIMEOUT_OVERRIDES = {
'gentoo': 45,
'gentoo-systemd': 45,
'gentoo': 50,
'gentoo-systemd': 50,
}
def generate_test_jobs():

3
ChangeLog
View file

@ -1,5 +1,8 @@
Version TBD (In Progress on the Develop Branch):
Version 2020.10.20:
* Add support to allow bootstrapping Salt 3002 (s0undt3ch) #1506
Version 2020.10.19:
* Fix v3000+ with git install on FreeBSD (krionbsd) #1487
* Update README giving ONE example of WINDOWS bootstrapping. Default to python3 instead of

3
RELEASE.md
View file

@ -3,10 +3,9 @@
- See if there are any PRs worth squeezing into release.
- Go through the changes since last release, add them to changelog.
- Add any new authors to the AUTHORS file.
- If there's a new Salt release(major), update the script to add support for it.
- Bump version for release
- Open PR against develop with these changes.
- Once the above PR is merged, open a PR against master with the changes from develop
- Add a commit on that PR for updating the .sha256 files
- Once the PR against master is merged, update shasums on README on the develop branch
- Open a PR against salt with the new stable release.
- Open a PR against kitchen-salt with the new stable release.

6
bootstrap-salt.sh
View file

@ -23,7 +23,7 @@
#======================================================================================================================
set -o nounset # Treat unset variables as an error
__ScriptVersion="2020.10.19"
__ScriptVersion="2020.10.20"
__ScriptName="bootstrap-salt.sh"
__ScriptFullName="$0"
@ -604,7 +604,7 @@ elif [ "$ITYPE" = "stable" ]; then
if [ "$#" -eq 0 ];then
STABLE_REV="latest"
else
if [ "$(echo "$1" | grep -E '^(latest|1\.6|1\.7|2014\.1|2014\.7|2015\.5|2015\.8|2016\.3|2016\.11|2017\.7|2018\.3|2019\.2|3000|3001)$')" != "" ]; then
if [ "$(echo "$1" | grep -E '^(latest|1\.6|1\.7|2014\.1|2014\.7|2015\.5|2015\.8|2016\.3|2016\.11|2017\.7|2018\.3|2019\.2|3000|3001|3002)$')" != "" ]; then
STABLE_REV="$1"
shift
elif [ "$(echo "$1" | grep -E '^(2[0-9]*\.[0-9]*\.[0-9]*|[3-9][0-9]{3}(\.[0-9]*)?)$')" != "" ]; then
@ -615,7 +615,7 @@ elif [ "$ITYPE" = "stable" ]; then
fi
shift
else
echo "Unknown stable version: $1 (valid: 1.6, 1.7, 2014.1, 2014.7, 2015.5, 2015.8, 2016.3, 2016.11, 2017.7, 2018.3, 2019.2, 3000, 3001, latest, \$MAJOR.\$MINOR.\$PATCH until 2019.2, \$MAJOR or \$MAJOR.\$PATCH starting from 3000)"
echo "Unknown stable version: $1 (valid: 1.6, 1.7, 2014.1, 2014.7, 2015.5, 2015.8, 2016.3, 2016.11, 2017.7, 2018.3, 2019.2, 3000, 3001 3002, latest, \$MAJOR.\$MINOR.\$PATCH until 2019.2, \$MAJOR or \$MAJOR.\$PATCH starting from 3000)"
exit 1
fi
fi