From c5681cd7b75dc84ec66ca9f9bc0617a7e658f03c Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Mon, 19 Oct 2020 17:47:52 +0100 Subject: [PATCH 1/6] Only update checksums on the main repo --- .github/workflows/checksums.yml | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/.github/workflows/checksums.yml b/.github/workflows/checksums.yml index 6b01527..d8888a0 100644 --- a/.github/workflows/checksums.yml +++ b/.github/workflows/checksums.yml @@ -12,21 +12,19 @@ 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 @@ -37,10 +35,18 @@ jobs: git push - 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' From 11aa72c8ab3c0290899b9a4b6acd1eca30241c7d Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Tue, 20 Oct 2020 19:49:23 +0100 Subject: [PATCH 2/6] Add support to allow bootstrapping Salt 3002 --- bootstrap-salt.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh index f4d62d0..b09f743 100644 --- a/bootstrap-salt.sh +++ b/bootstrap-salt.sh @@ -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 From 4c7f3a00bbeb2d72b1dfbe801eb66dc09b7b2a43 Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Tue, 20 Oct 2020 19:52:12 +0100 Subject: [PATCH 3/6] Bump version for release and update ChangeLog --- ChangeLog | 3 +++ bootstrap-salt.sh | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index a8ab78c..33fc270 100644 --- a/ChangeLog +++ b/ChangeLog @@ -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 diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh index b09f743..a21b8bd 100644 --- a/bootstrap-salt.sh +++ b/bootstrap-salt.sh @@ -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" From 51c65ef6a808f8fa62960697a2f11000a601b9ed Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Tue, 20 Oct 2020 19:54:27 +0100 Subject: [PATCH 4/6] Update the release doc --- RELEASE.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/RELEASE.md b/RELEASE.md index 808d8f5..b182c1a 100644 --- a/RELEASE.md +++ b/RELEASE.md @@ -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. From 9d8e3d2273c84308836d6f71b36accdc501073ad Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Tue, 20 Oct 2020 19:57:27 +0100 Subject: [PATCH 5/6] Don't fail if there's nothing to commit and push --- .github/workflows/checksums.yml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/.github/workflows/checksums.yml b/.github/workflows/checksums.yml index d8888a0..36c2edb 100644 --- a/.github/workflows/checksums.yml +++ b/.github/workflows/checksums.yml @@ -31,8 +31,7 @@ jobs: 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' @@ -51,5 +50,4 @@ jobs: 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 From 7ab46575d187587400d80c480453e57c98414398 Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Tue, 20 Oct 2020 19:59:23 +0100 Subject: [PATCH 6/6] Increase gentoo timeouts --- .github/workflows/main.yml | 36 ++++++++++++------------- .github/workflows/templates/generate.py | 4 +-- 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index e69e3c1..a0fefb4 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -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 diff --git a/.github/workflows/templates/generate.py b/.github/workflows/templates/generate.py index 1e6fd22..422dbb3 100755 --- a/.github/workflows/templates/generate.py +++ b/.github/workflows/templates/generate.py @@ -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():