From 3dd0ad3065d0b2e8e53d48796244619ff485134e Mon Sep 17 00:00:00 2001 From: "Gareth J. Greenaway" Date: Thu, 2 Nov 2023 14:14:42 -0700 Subject: [PATCH 1/8] Update the location for the configuration directory for salt-call in the Saltfile --- salt-quick-start.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/salt-quick-start.sh b/salt-quick-start.sh index 3e17ce056..8449abbf0 100755 --- a/salt-quick-start.sh +++ b/salt-quick-start.sh @@ -183,7 +183,7 @@ EOT cat <${_PATH}/Saltfile salt-call: local: True - config_dir: ${_PATH} + config_dir: ${_PATH}/etc/salt log_file: ${_PATH}/var/log/salt/minion cachedir: ${_PATH}/var/cache/salt file_root: ${_PATH}/srv/salt From 1ba50d57d44f37048acaa7e54d5f1831bdeb5983 Mon Sep 17 00:00:00 2001 From: Shane Lee Date: Tue, 7 Nov 2023 11:26:36 -0700 Subject: [PATCH 2/8] Update requirements --- requirements/release.txt | 54 ++++++++++++++++++++-------------------- 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/requirements/release.txt b/requirements/release.txt index 992ea034b..5fff10700 100644 --- a/requirements/release.txt +++ b/requirements/release.txt @@ -1,28 +1,28 @@ # -# This file is autogenerated by pip-compile with Python 3.9 +# This file is autogenerated by pip-compile with Python 3.10 # by the following command: # -# pip-compile requirements/release.in +# pip-compile '.\requirements\release.in' # -attrs==22.2.0 +attrs==23.1.0 # via python-tools-scripts -boto3==1.26.110 - # via -r requirements/release.in -botocore==1.29.110 +boto3==1.28.79 + # via -r .\requirements\release.in +botocore==1.31.79 # via # boto3 # s3transfer -certifi==2023.07.22 +certifi==2023.7.22 # via requests -cfgv==3.3.1 +cfgv==3.4.0 # via pre-commit -charset-normalizer==3.1.0 +charset-normalizer==3.3.2 # via requests -distlib==0.3.6 +distlib==0.3.7 # via virtualenv -filelock==3.11.0 +filelock==3.13.1 # via virtualenv -identify==2.5.22 +identify==2.5.31 # via pre-commit idna==3.4 # via requests @@ -30,39 +30,39 @@ jmespath==1.0.1 # via # boto3 # botocore -markdown-it-py==2.2.0 +markdown-it-py==3.0.0 # via rich mdurl==0.1.2 # via markdown-it-py -nodeenv==1.7.0 +nodeenv==1.8.0 # via pre-commit -platformdirs==3.2.0 +platformdirs==3.11.0 # via virtualenv -pre-commit==3.2.2 - # via -r requirements/release.in -pygments==2.15.0 +pre-commit==3.5.0 + # via -r .\requirements\release.in +pygments==2.16.1 # via rich python-dateutil==2.8.2 # via botocore -python-tools-scripts==0.12.0 - # via -r requirements/release.in -pyyaml==6.0 +python-tools-scripts==0.18.1 + # via -r .\requirements\release.in +pyyaml==6.0.1 # via pre-commit -requests==2.28.2 +requests==2.31.0 # via python-tools-scripts -rich==13.3.3 +rich==13.6.0 # via python-tools-scripts -s3transfer==0.6.0 +s3transfer==0.7.0 # via boto3 six==1.16.0 # via python-dateutil -typing-extensions==4.5.0 +typing-extensions==4.8.0 # via python-tools-scripts -urllib3==1.26.15 +urllib3==2.0.7 # via # botocore # requests -virtualenv==20.21.0 +virtualenv==20.24.6 # via pre-commit # The following packages are considered to be unsafe in a requirements file: From 2b3080c737f40ba66ded7cd9f93607300615bfa5 Mon Sep 17 00:00:00 2001 From: Salt Project Packaging Date: Tue, 7 Nov 2023 18:35:16 +0000 Subject: [PATCH 3/8] Update develop branch for the v2023.11.07 release --- CHANGELOG.md | 16 ++++++++++++++++ bootstrap-salt.sh | 2 +- 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d9115691d..1e4b226ff 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,19 @@ +# v2023.11.07 + +## What's Changed + +- cleanup old information in the README.rst file by @garethgreenaway in https://github.com/saltstack/salt-bootstrap/pull/1955 +- Moving quick start scripts to bootstrap repo. by @garethgreenaway in https://github.com/saltstack/salt-bootstrap/pull/1960 +- Suppress progress bar by @twangboy in https://github.com/saltstack/salt-bootstrap/pull/1964 +- Fix global variable by @twangboy in https://github.com/saltstack/salt-bootstrap/pull/1965 +- Debian 12 arm64 by @joelpmichael in https://github.com/saltstack/salt-bootstrap/pull/1962 +- Mirror Linux output, display root_dir by @twangboy in https://github.com/saltstack/salt-bootstrap/pull/1967 +- Add asterisks to the output by @twangboy in https://github.com/saltstack/salt-bootstrap/pull/1968 +- Fixes to salt-quick-start.sh by @garethgreenaway in https://github.com/saltstack/salt-bootstrap/pull/1973 +- Update requirements by @twangboy in https://github.com/saltstack/salt-bootstrap/pull/1974 + +**Full Changelog**: https://github.com/saltstack/salt-bootstrap/compare/v2023.08.03...v2023.11.07 + # v2023.08.03 ## What's Changed diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh index 422e9395f..d4c701fcc 100755 --- a/bootstrap-salt.sh +++ b/bootstrap-salt.sh @@ -23,7 +23,7 @@ #====================================================================================================================== set -o nounset # Treat unset variables as an error -__ScriptVersion="2023.08.03" +__ScriptVersion="2023.11.07" __ScriptName="bootstrap-salt.sh" __ScriptFullName="$0" From a01c7205de0bcecf89725ab174cb73be5b92132b Mon Sep 17 00:00:00 2001 From: Salt Project Packaging Date: Tue, 7 Nov 2023 18:38:07 +0000 Subject: [PATCH 4/8] Update README.rst with 2023.11.07 release sha256sum --- README.rst | 1 + 1 file changed, 1 insertion(+) diff --git a/README.rst b/README.rst index 66d07dc6d..9a3b67d5b 100644 --- a/README.rst +++ b/README.rst @@ -32,6 +32,7 @@ sum** of the downloaded ``bootstrap-salt.sh`` file. The SHA256 sum of the ``bootstrap-salt.sh`` file, per release, is: +- 2023.11.07: ``91f8a3bfb8b14476f7793c7f20cec7bfc638c10c073786f9a8904a858a929784`` - 2023.08.03: ``963e559bdb85adecfbbec2c3b81190392bc59b24992e4491e919cd748eeafcb8`` - 2023.07.25: ``eaaaadaed40fe2e791d59a9e48f24449428a35ca61782d9139f1272c05524323`` - 2023.06.28: ``f45f5da8abee27ef385131f5cfa9382d3a15863d0a05688a0404d2f057b27776`` From fe3783432ef5070f30a1babf01e9a05462a4c99f Mon Sep 17 00:00:00 2001 From: Felippe Burk Date: Thu, 16 Nov 2023 12:37:17 -0700 Subject: [PATCH 5/8] checking out stable branch on update-s3-bucket job --- .github/workflows/release.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index fa9c12653..604363e71 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -304,6 +304,10 @@ jobs: steps: - uses: actions/checkout@v3 + with: + ref: stable + repository: ${{ github.repository }} + ssh-key: ${{ secrets.SALT_BOOTSTRAP_RELEASE_KEY }} - name: Get Salt Project GitHub Actions Bot Environment run: | From f5783bec2abf940e82dcf8477d732bbdbd565df1 Mon Sep 17 00:00:00 2001 From: Salt Project Packaging Date: Thu, 16 Nov 2023 19:51:23 +0000 Subject: [PATCH 6/8] Update develop branch for the v2023.11.16 release --- CHANGELOG.md | 8 ++++++++ bootstrap-salt.sh | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1e4b226ff..090531c1c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,11 @@ +# v2023.11.16 + +## What's Changed + +- checking out stable branch on update-s3-bucket job by @felippeb in https://github.com/saltstack/salt-bootstrap/pull/1977 + +**Full Changelog**: https://github.com/saltstack/salt-bootstrap/compare/v2023.11.07...v2023.11.16 + # v2023.11.07 ## What's Changed diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh index d4c701fcc..44b7235b6 100755 --- a/bootstrap-salt.sh +++ b/bootstrap-salt.sh @@ -23,7 +23,7 @@ #====================================================================================================================== set -o nounset # Treat unset variables as an error -__ScriptVersion="2023.11.07" +__ScriptVersion="2023.11.16" __ScriptName="bootstrap-salt.sh" __ScriptFullName="$0" From c32e0b2040dfad2cbe2037bb5b42f5e14fce3f9d Mon Sep 17 00:00:00 2001 From: Salt Project Packaging Date: Thu, 16 Nov 2023 19:54:36 +0000 Subject: [PATCH 7/8] Update README.rst with 2023.11.16 release sha256sum --- README.rst | 1 + 1 file changed, 1 insertion(+) diff --git a/README.rst b/README.rst index 9a3b67d5b..3345164a9 100644 --- a/README.rst +++ b/README.rst @@ -32,6 +32,7 @@ sum** of the downloaded ``bootstrap-salt.sh`` file. The SHA256 sum of the ``bootstrap-salt.sh`` file, per release, is: +- 2023.11.16: ``3757ed82161113fed4c711fd7332e922265eeeb54e6e4f657a08ea82d57cc3a2`` - 2023.11.07: ``91f8a3bfb8b14476f7793c7f20cec7bfc638c10c073786f9a8904a858a929784`` - 2023.08.03: ``963e559bdb85adecfbbec2c3b81190392bc59b24992e4491e919cd748eeafcb8`` - 2023.07.25: ``eaaaadaed40fe2e791d59a9e48f24449428a35ca61782d9139f1272c05524323`` From cb148ad4ad9b6abd72e7a7139601c0b5002af169 Mon Sep 17 00:00:00 2001 From: Shane Lee Date: Tue, 2 Jan 2024 14:26:40 -0700 Subject: [PATCH 8/8] Add arm support for Debian 10 --- bootstrap-salt.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh index 44b7235b6..e415e2753 100755 --- a/bootstrap-salt.sh +++ b/bootstrap-salt.sh @@ -1522,9 +1522,9 @@ __check_dpkg_architecture() { if [ "$_CUSTOM_REPO_URL" != "null" ]; then warn_msg="Support for arm64 is experimental, make sure the custom repository used has the expected structure and contents." else - # Saltstack official repository has arm64 metadata beginning with Debian 11, + # Saltstack official repository has arm64 metadata beginning with Debian 10, # use amd64 repositories on arm64 for anything older, since all pkgs are arch-independent - if [ "$DISTRO_NAME_L" = "debian" ] && [ "$DISTRO_MAJOR_VERSION" -lt 11 ]; then + if [ "$DISTRO_NAME_L" = "debian" ] && [ "$DISTRO_MAJOR_VERSION" -lt 10 ]; then __REPO_ARCH="amd64" else __REPO_ARCH="arm64"