From ad4cb2d040dcba6e73879e65eb29ae57745f6104 Mon Sep 17 00:00:00 2001 From: pjcreath Date: Tue, 20 Sep 2022 19:32:59 +0000 Subject: [PATCH 001/104] Add support for the -R flag on macOS. --- bootstrap-salt.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh index 6eed0f7..21999b3 100755 --- a/bootstrap-salt.sh +++ b/bootstrap-salt.sh @@ -388,7 +388,7 @@ __usage() { points to a repository that mirrors Salt packages located at repo.saltproject.io. The option passed with -R replaces the "repo.saltproject.io". If -R is passed, -r is also set. Currently only - works on CentOS/RHEL and Debian based distributions. + works on CentOS/RHEL and Debian based distributions and macOS. -s Sleep time used when waiting for daemons to start, restart and when checking for the services running. Default: ${__DEFAULT_SLEEP} -S Also install salt-syndic @@ -8230,7 +8230,7 @@ __macosx_get_packagesite() { fi PKG="salt-${STABLE_REV}-${__PY_VERSION_REPO}-${DARWIN_ARCH}.pkg" - SALTPKGCONFURL="https://repo.saltproject.io/osx/${PKG}" + SALTPKGCONFURL="https://${_REPO_URL}/osx/${PKG}" } # Using a separate conf step to head for idempotent install... From e5fca869980b0993f389866ec3da477a6eaa17d4 Mon Sep 17 00:00:00 2001 From: "github-actions[bot] on behalf of @s0undt3ch" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 4 Oct 2022 17:32:54 +0000 Subject: [PATCH 002/104] Update README.rst with 2022.10.04 release sha256sum --- README.rst | 1 + 1 file changed, 1 insertion(+) diff --git a/README.rst b/README.rst index 590f3ad..aa798dd 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: +- 2022.10.04: ``d0686c2daeed18bb726e58eef75a69afe9ee56a1a23b2c32cd4e87d6005638e2`` - 2022.08.13: ``af922699c1a2bb3b89b6dac04397389999df1b3416b8d0b5c93766412f14c95c`` - 2022.08.12: ``b46f018bbf02f45c6096ab96e9261a9adb3a78ff65092c3976f32ffde909afcb`` - 2022.05.19: ``e92e1df6930285cf23eda188bee3cfa3dd6c577b4fb7aa91b29213ad820199b1`` From 2d6a1decc8f83e6718876aaf8c4bd947e8ee92fb Mon Sep 17 00:00:00 2001 From: "Gary T. Giesen" Date: Mon, 31 Oct 2022 15:14:25 -0400 Subject: [PATCH 003/104] Fix missing functions for post-installation on EL clones --- bootstrap-salt.sh | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh index f6f714b..7ee2df7 100755 --- a/bootstrap-salt.sh +++ b/bootstrap-salt.sh @@ -5345,6 +5345,11 @@ install_oracle_linux_git_post() { return 0 } +install_oracle_linux_onedir_post() { + install_centos_onedir_post || return 1 + return 0 +} + install_oracle_linux_testing_post() { install_centos_testing_post || return 1 return 0 @@ -5418,6 +5423,11 @@ install_almalinux_git_post() { return 0 } +install_almalinux_onedir_post() { + install_centos_onedir_post || return 1 + return 0 +} + install_almalinux_testing_post() { install_centos_testing_post || return 1 return 0 @@ -5491,6 +5501,11 @@ install_rocky_linux_git_post() { return 0 } +install_rocky_linux_onedir_post() { + install_centos_onedir_post || return 1 + return 0 +} + install_rocky_linux_testing_post() { install_centos_testing_post || return 1 return 0 @@ -5564,6 +5579,11 @@ install_scientific_linux_git_post() { return 0 } +install_scientific_linux_onedir_post() { + install_centos_onedir_post || return 1 + return 0 +} + install_scientific_linux_testing_post() { install_centos_testing_post || return 1 return 0 From 2562523fd23cc7adcb091dc70147222b39cbcac2 Mon Sep 17 00:00:00 2001 From: "Gareth J. Greenaway" Date: Thu, 3 Nov 2022 17:26:54 -0700 Subject: [PATCH 004/104] update openbsd to 7, seems like 6 (6.9) is no longer available. --- kitchen.bsd.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/kitchen.bsd.yml b/kitchen.bsd.yml index cd36e71..3a88a1b 100644 --- a/kitchen.bsd.yml +++ b/kitchen.bsd.yml @@ -33,9 +33,9 @@ platforms: - name: freebsd-123 driver: box: bento/freebsd-12.3 - - name: openbsd-6 + - name: openbsd-7 driver: - box: generic/openbsd6 + box: generic/openbsd7 ssh: shell: /bin/ksh synced_folders: [] From 5be3b6a62ed3f0ae2b1c690838d876a9cfd347e6 Mon Sep 17 00:00:00 2001 From: "Gareth J. Greenaway" Date: Thu, 3 Nov 2022 21:50:20 -0700 Subject: [PATCH 005/104] update templates for openbsd-7 --- .github/workflows/ci.yml | 10 +++++----- .github/workflows/templates/generate.py | 6 +++--- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 750f6ee..dbc12c5 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -145,16 +145,16 @@ jobs: instances: '["git-master", "latest"]' - openbsd-6: - name: OpenBSD 6 + openbsd-7: + name: OpenBSD 7 if: github.event_name == 'push' || needs.collect-changed-files.outputs.run-tests == 'true' uses: ./.github/workflows/test-bsd.yml needs: - lint - generate-actions-workflow with: - distro-slug: openbsd-6 - display-name: OpenBSD 6 + distro-slug: openbsd-7 + display-name: OpenBSD 7 timeout: 20 runs-on: macos-10.15 instances: '["latest"]' @@ -528,7 +528,7 @@ jobs: - generate-actions-workflow - freebsd-131 - freebsd-123 - - openbsd-6 + - openbsd-7 - macos-1015 - macos-11 - macos-12 diff --git a/.github/workflows/templates/generate.py b/.github/workflows/templates/generate.py index ab000e6..c64b28b 100755 --- a/.github/workflows/templates/generate.py +++ b/.github/workflows/templates/generate.py @@ -42,7 +42,7 @@ OSX = [ BSD = [ "freebsd-131", "freebsd-123", - "openbsd-6", + "openbsd-7", ] STABLE_DISTROS = [ @@ -168,7 +168,7 @@ DISTRO_DISPLAY_NAMES = { "macos-12": "macOS 12", "freebsd-131": "FreeBSD 13.1", "freebsd-123": "FreeBSD 12.3", - "openbsd-6": "OpenBSD 6", + "openbsd-7": "OpenBSD 7", "windows-2019": "Windows 2019", "windows-2022": "Windows 2022", } @@ -223,7 +223,7 @@ def generate_test_jobs(): instances.append(salt_version) continue - if distro == "openbsd-6": + if distro == "openbsd-7": # Only test latest on OpenBSD 6 continue From d34ebbc94b101225d7bd9babf9a15c6d2a029a2b Mon Sep 17 00:00:00 2001 From: "Gareth J. Greenaway" Date: Wed, 2 Nov 2022 09:24:50 -0700 Subject: [PATCH 006/104] account for adding the .0 back into the release versions starting in 3006. --- bootstrap-salt.sh | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh index 7ee2df7..90444b1 100755 --- a/bootstrap-salt.sh +++ b/bootstrap-salt.sh @@ -639,11 +639,14 @@ elif [ "$ITYPE" = "onedir" ]; then if [ "$(echo "$1" | grep -E '^(latest|3005)$')" != "" ]; then ONEDIR_REV="$1" shift - elif [ "$(echo "$1" | grep -E '^([3-9][0-9]{3}(\.[0-9]*)?)')" != "" ]; then - # Handle the 3xxx.0 version as 3xxx archive (pin to minor) and strip the fake ".0" suffix - ONEDIR_REV=$(echo "$1" | sed -E 's/^([3-9][0-9]{3})\.0$/\1/') + elif [ "$(echo "$1" | grep -E '^(3005(\.[0-9]*)?)')" != "" ]; then + # Handle the 3005.0 version as 3005 archive (pin to minor) and strip the fake ".0" suffix + ONEDIR_REV=$(echo "$1" | sed -E 's/^(3005)\.0$/\1/') ONEDIR_REV="minor/$ONEDIR_REV" shift + elif [ "$(echo "$1" | grep -E '^([3-9][0-9]{3}(\.[0-9]*)?)')" != "" ]; then + ONEDIR_REV="minor/$1" + shift else echo "Unknown stable version: $1 (valid: 3005, latest.)" exit 1 From c24f492f8cea8e1b46a26f0eec583268c2911755 Mon Sep 17 00:00:00 2001 From: "Gareth J. Greenaway" Date: Fri, 4 Nov 2022 10:34:16 -0700 Subject: [PATCH 007/104] Update the URL for kitchen-docker to include the new branch. --- Gemfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile b/Gemfile index 373342b..a70a9da 100644 --- a/Gemfile +++ b/Gemfile @@ -4,7 +4,7 @@ source "https://rubygems.org" gem 'test-kitchen', '>= 3.2.2' gem 'kitchen-salt', '>= 0.7.2' -gem 'kitchen-docker', git: 'https://github.com/test-kitchen/kitchen-docker.git' +gem 'kitchen-docker', :git => 'https://github.com/test-kitchen/kitchen-docker.git', :branch => 'main' group :vagrant do gem 'kitchen-vagrant' From dd2a95a17c28de5773498d4923978b3e40bf50c6 Mon Sep 17 00:00:00 2001 From: "Gareth J. Greenaway" Date: Mon, 7 Nov 2022 15:36:45 -0800 Subject: [PATCH 008/104] Adding default vagrant credentials to openbsd to get past initial SSH key setup. --- Gemfile | 2 +- kitchen.bsd.yml | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/Gemfile b/Gemfile index 373342b..a70a9da 100644 --- a/Gemfile +++ b/Gemfile @@ -4,7 +4,7 @@ source "https://rubygems.org" gem 'test-kitchen', '>= 3.2.2' gem 'kitchen-salt', '>= 0.7.2' -gem 'kitchen-docker', git: 'https://github.com/test-kitchen/kitchen-docker.git' +gem 'kitchen-docker', :git => 'https://github.com/test-kitchen/kitchen-docker.git', :branch => 'main' group :vagrant do gem 'kitchen-vagrant' diff --git a/kitchen.bsd.yml b/kitchen.bsd.yml index 3a88a1b..64bc83a 100644 --- a/kitchen.bsd.yml +++ b/kitchen.bsd.yml @@ -39,6 +39,10 @@ platforms: ssh: shell: /bin/ksh synced_folders: [] + transport: + name: ssh + username: vagrant + password: vagrant provisioner: init_environment: | echo 'auto_accept: true' > /tmp/auto-accept-keys.conf From 4686d55c5ae1ec28af3dd70fce9d2d1fedc35321 Mon Sep 17 00:00:00 2001 From: "Gareth J. Greenaway" Date: Thu, 3 Nov 2022 10:59:34 -0700 Subject: [PATCH 009/104] Adding tests for installing onedir packages --- kitchen.yml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/kitchen.yml b/kitchen.yml index d449f8d..98195db 100644 --- a/kitchen.yml +++ b/kitchen.yml @@ -196,6 +196,22 @@ suites: salt_version: latest salt_bootstrap_options: -MP stable %s + - name: onedir latest + provisioner: + salt_version: latest + salt_bootstrap_options: -MP onedir %s + + - name: onedir_3005 + provisioner: + salt_version: 3005 + salt_bootstrap_options: -MP onedir %s + + - name: onedir_3005.1 + provisioner: + salt_version: 3005.1 + salt_bootstrap_options: -MP onedir %s + + verifier: name: shell remote_exec: false From 081b81d2e3898544dd4d5c642ab14322773d2865 Mon Sep 17 00:00:00 2001 From: "Gareth J. Greenaway" Date: Thu, 3 Nov 2022 11:32:55 -0700 Subject: [PATCH 010/104] Adding 3005 and onedir to various bits --- .github/workflows/ci.yml | 50 ++++++++++++------------- .github/workflows/templates/generate.py | 34 ++++++++++++++++- kitchen.yml | 10 +---- 3 files changed, 59 insertions(+), 35 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index dbc12c5..e4c5b32 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -173,7 +173,7 @@ jobs: display-name: macOS 10.15 timeout: 20 runs-on: macos-10.15 - instances: '["stable-3003", "stable-3004", "latest"]' + instances: '["stable-3003", "stable-3004", "stable-3005", "latest"]' macos-11: @@ -188,7 +188,7 @@ jobs: display-name: macOS 11 timeout: 20 runs-on: macos-11 - instances: '["stable-3003", "stable-3004", "latest"]' + instances: '["stable-3003", "stable-3004", "stable-3005", "latest"]' macos-12: @@ -203,7 +203,7 @@ jobs: display-name: macOS 12 timeout: 20 runs-on: macos-12 - instances: '["stable-3003", "stable-3004", "latest"]' + instances: '["stable-3003", "stable-3004", "stable-3005", "latest"]' @@ -219,7 +219,7 @@ jobs: display-name: Windows 2019 timeout: 20 runs-on: windows-2019 - instances: '["stable-3003", "stable-3004", "latest"]' + instances: '["stable-3003", "stable-3004", "stable-3005", "latest"]' windows-2022: @@ -234,7 +234,7 @@ jobs: display-name: Windows 2022 timeout: 20 runs-on: windows-2022 - instances: '["stable-3003", "stable-3004", "latest"]' + instances: '["stable-3003", "stable-3004", "stable-3005", "latest"]' @@ -249,7 +249,7 @@ jobs: distro-slug: almalinux-8 display-name: AlmaLinux 8 timeout: 20 - instances: '["stable-3003", "git-3003", "stable-3004", "git-3004", "git-master", "latest"]' + instances: '["stable-3003", "git-3003", "onedir-3003", "stable-3004", "git-3004", "onedir-3004", "stable-3005", "git-3005", "onedir-3005", "git-master", "onedir-master", "latest"]' amazon-2: @@ -263,7 +263,7 @@ jobs: distro-slug: amazon-2 display-name: Amazon 2 timeout: 20 - instances: '["stable-3003", "stable-3004", "git-master", "latest"]' + instances: '["stable-3003", "onedir-3003", "stable-3004", "onedir-3004", "stable-3005", "onedir-3005", "git-master", "onedir-master", "latest"]' arch: @@ -277,7 +277,7 @@ jobs: distro-slug: arch display-name: Arch timeout: 20 - instances: '["git-master", "latest"]' + instances: '["git-master", "onedir-master", "latest"]' centos-7: @@ -291,7 +291,7 @@ jobs: distro-slug: centos-7 display-name: CentOS 7 timeout: 20 - instances: '["stable-3003", "git-3003", "stable-3004", "git-3004", "git-master", "latest"]' + instances: '["stable-3003", "git-3003", "onedir-3003", "stable-3004", "git-3004", "onedir-3004", "stable-3005", "git-3005", "onedir-3005", "git-master", "onedir-master", "latest"]' centos-stream8: @@ -305,7 +305,7 @@ jobs: distro-slug: centos-stream8 display-name: CentOS Stream 8 timeout: 20 - instances: '["stable-3003", "git-3003", "stable-3004", "git-3004", "git-master", "latest"]' + instances: '["stable-3003", "git-3003", "onedir-3003", "stable-3004", "git-3004", "onedir-3004", "stable-3005", "git-3005", "onedir-3005", "git-master", "onedir-master", "latest"]' debian-10: @@ -319,7 +319,7 @@ jobs: distro-slug: debian-10 display-name: Debian 10 timeout: 20 - instances: '["stable-3003", "stable-3004", "git-master", "latest"]' + instances: '["stable-3003", "onedir-3003", "stable-3004", "onedir-3004", "stable-3005", "onedir-3005", "git-master", "onedir-master", "latest"]' debian-11: @@ -333,7 +333,7 @@ jobs: distro-slug: debian-11 display-name: Debian 11 timeout: 20 - instances: '["stable-3004", "git-master", "latest"]' + instances: '["stable-3004", "onedir-3004", "stable-3005", "onedir-3005", "git-master", "onedir-master", "latest"]' debian-9: @@ -347,7 +347,7 @@ jobs: distro-slug: debian-9 display-name: Debian 9 timeout: 20 - instances: '["stable-3003", "git-3003", "stable-3004", "git-3004", "git-master", "latest"]' + instances: '["stable-3003", "git-3003", "onedir-3003", "stable-3004", "git-3004", "onedir-3004", "stable-3005", "git-3005", "onedir-3005", "git-master", "onedir-master", "latest"]' fedora-35: @@ -361,7 +361,7 @@ jobs: distro-slug: fedora-35 display-name: Fedora 35 timeout: 20 - instances: '["git-master", "latest"]' + instances: '["git-master", "onedir-master", "latest"]' fedora-36: @@ -375,7 +375,7 @@ jobs: distro-slug: fedora-36 display-name: Fedora 36 timeout: 20 - instances: '["git-master", "latest"]' + instances: '["git-master", "onedir-master", "latest"]' gentoo: @@ -389,7 +389,7 @@ jobs: distro-slug: gentoo display-name: Gentoo timeout: 90 - instances: '["git-master", "latest"]' + instances: '["git-master", "onedir-master", "latest"]' gentoo-systemd: @@ -403,7 +403,7 @@ jobs: distro-slug: gentoo-systemd display-name: Gentoo (systemd) timeout: 90 - instances: '["git-master", "latest"]' + instances: '["git-master", "onedir-master", "latest"]' opensuse-15: @@ -417,7 +417,7 @@ jobs: distro-slug: opensuse-15 display-name: Opensuse 15 timeout: 20 - instances: '["git-master", "latest"]' + instances: '["git-master", "onedir-master", "latest"]' opensuse-tumbleweed: @@ -431,7 +431,7 @@ jobs: distro-slug: opensuse-tumbleweed display-name: Opensuse Tumbleweed timeout: 20 - instances: '["git-master", "latest"]' + instances: '["git-master", "onedir-master", "latest"]' oraclelinux-7: @@ -445,7 +445,7 @@ jobs: distro-slug: oraclelinux-7 display-name: Oracle Linux 7 timeout: 20 - instances: '["stable-3003", "git-3003", "stable-3004", "git-3004", "git-master", "latest"]' + instances: '["stable-3003", "git-3003", "onedir-3003", "stable-3004", "git-3004", "onedir-3004", "stable-3005", "git-3005", "onedir-3005", "git-master", "onedir-master", "latest"]' oraclelinux-8: @@ -459,7 +459,7 @@ jobs: distro-slug: oraclelinux-8 display-name: Oracle Linux 8 timeout: 20 - instances: '["stable-3003", "git-3003", "stable-3004", "git-3004", "git-master", "latest"]' + instances: '["stable-3003", "git-3003", "onedir-3003", "stable-3004", "git-3004", "onedir-3004", "stable-3005", "git-3005", "onedir-3005", "git-master", "onedir-master", "latest"]' rockylinux-8: @@ -473,7 +473,7 @@ jobs: distro-slug: rockylinux-8 display-name: Rocky Linux 8 timeout: 20 - instances: '["stable-3004", "git-3004", "git-master", "latest"]' + instances: '["stable-3004", "git-3004", "onedir-3004", "stable-3005", "git-3005", "onedir-3005", "git-master", "onedir-master", "latest"]' ubuntu-1804: @@ -487,7 +487,7 @@ jobs: distro-slug: ubuntu-1804 display-name: Ubuntu 18.04 timeout: 20 - instances: '["stable-3003", "git-3003", "stable-3004", "git-3004", "git-master", "latest"]' + instances: '["stable-3003", "git-3003", "onedir-3003", "stable-3004", "git-3004", "onedir-3004", "stable-3005", "git-3005", "onedir-3005", "git-master", "onedir-master", "latest"]' ubuntu-2004: @@ -501,7 +501,7 @@ jobs: distro-slug: ubuntu-2004 display-name: Ubuntu 20.04 timeout: 20 - instances: '["stable-3003", "stable-3004", "git-master", "latest"]' + instances: '["stable-3003", "onedir-3003", "stable-3004", "onedir-3004", "stable-3005", "onedir-3005", "git-master", "onedir-master", "latest"]' ubuntu-2204: @@ -515,7 +515,7 @@ jobs: distro-slug: ubuntu-2204 display-name: Ubuntu 22.04 timeout: 20 - instances: '["stable-3004", "git-master", "latest"]' + instances: '["stable-3004", "onedir-3004", "stable-3005", "onedir-3005", "git-master", "onedir-master", "latest"]' set-pipeline-exit-status: diff --git a/.github/workflows/templates/generate.py b/.github/workflows/templates/generate.py index c64b28b..aecff70 100755 --- a/.github/workflows/templates/generate.py +++ b/.github/workflows/templates/generate.py @@ -108,6 +108,16 @@ BLACKLIST_3004 = [ "opensuse-tumbleweed", ] +BLACKLIST_3005 = [ + "arch", + "fedora-35", + "fedora-36", + "gentoo", + "gentoo-systemd", + "opensuse-15", + "opensuse-tumbleweed", +] + BLACKLIST_GIT_3004 = [ "amazon-2", "arch", @@ -124,9 +134,26 @@ BLACKLIST_GIT_3004 = [ "ubuntu-2204", ] +BLACKLIST_GIT_3005 = [ + "amazon-2", + "arch", + "debian-10", + "debian-11", + "fedora-35", + "fedora-36", + "gentoo", + "gentoo-systemd", + "opensuse-15", + "opensuse-tumbleweed", + "ubuntu-2004", + "ubuntu-2110", + "ubuntu-2204", +] + SALT_VERSIONS = [ "3003", "3004", + "3005", "master", "latest", ] @@ -134,6 +161,7 @@ SALT_VERSIONS = [ VERSION_DISPLAY_NAMES = { "3003": "v3003", "3004": "v3004", + "3005": "v3005", "master": "Master", "latest": "Latest", } @@ -381,7 +409,7 @@ def generate_test_jobs(): instances.append(salt_version) continue - for bootstrap_type in ("stable", "git"): + for bootstrap_type in ("stable", "git", "onedir"): if bootstrap_type == "stable": if salt_version == "master": # For the master branch there's no stable build @@ -399,11 +427,13 @@ def generate_test_jobs(): BLACKLIST = { "3003": BLACKLIST_3003, "3004": BLACKLIST_3004, + "3005": BLACKLIST_3005, } if bootstrap_type == "git": BLACKLIST = { "3003": BLACKLIST_GIT_3003, "3004": BLACKLIST_GIT_3004, + "3005": BLACKLIST_GIT_3005, } # .0 versions are a virtual version for pinning to the first @@ -413,7 +443,7 @@ def generate_test_jobs(): continue if ( - salt_version in ("3003", "3004") + salt_version in ("3003", "3004", "3005") and distro in BLACKLIST[salt_version] ): continue diff --git a/kitchen.yml b/kitchen.yml index 98195db..bec515b 100644 --- a/kitchen.yml +++ b/kitchen.yml @@ -196,22 +196,16 @@ suites: salt_version: latest salt_bootstrap_options: -MP stable %s - - name: onedir latest + - name: onedir-latest provisioner: salt_version: latest salt_bootstrap_options: -MP onedir %s - - name: onedir_3005 + - name: onedir-3005 provisioner: salt_version: 3005 salt_bootstrap_options: -MP onedir %s - - name: onedir_3005.1 - provisioner: - salt_version: 3005.1 - salt_bootstrap_options: -MP onedir %s - - verifier: name: shell remote_exec: false From 6a613d0dea1efbae6882ec8d02f016b31d60596d Mon Sep 17 00:00:00 2001 From: "Gareth J. Greenaway" Date: Thu, 3 Nov 2022 12:11:32 -0700 Subject: [PATCH 011/104] Only add onedir for supported versions. --- .github/workflows/ci.yml | 40 ++++++++++++------------- .github/workflows/templates/generate.py | 9 ++++++ 2 files changed, 29 insertions(+), 20 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e4c5b32..c346bbd 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -249,7 +249,7 @@ jobs: distro-slug: almalinux-8 display-name: AlmaLinux 8 timeout: 20 - instances: '["stable-3003", "git-3003", "onedir-3003", "stable-3004", "git-3004", "onedir-3004", "stable-3005", "git-3005", "onedir-3005", "git-master", "onedir-master", "latest"]' + instances: '["stable-3003", "git-3003", "stable-3004", "git-3004", "stable-3005", "git-3005", "onedir-3005", "git-master", "latest"]' amazon-2: @@ -263,7 +263,7 @@ jobs: distro-slug: amazon-2 display-name: Amazon 2 timeout: 20 - instances: '["stable-3003", "onedir-3003", "stable-3004", "onedir-3004", "stable-3005", "onedir-3005", "git-master", "onedir-master", "latest"]' + instances: '["stable-3003", "stable-3004", "stable-3005", "onedir-3005", "git-master", "latest"]' arch: @@ -277,7 +277,7 @@ jobs: distro-slug: arch display-name: Arch timeout: 20 - instances: '["git-master", "onedir-master", "latest"]' + instances: '["git-master", "latest"]' centos-7: @@ -291,7 +291,7 @@ jobs: distro-slug: centos-7 display-name: CentOS 7 timeout: 20 - instances: '["stable-3003", "git-3003", "onedir-3003", "stable-3004", "git-3004", "onedir-3004", "stable-3005", "git-3005", "onedir-3005", "git-master", "onedir-master", "latest"]' + instances: '["stable-3003", "git-3003", "stable-3004", "git-3004", "stable-3005", "git-3005", "onedir-3005", "git-master", "latest"]' centos-stream8: @@ -305,7 +305,7 @@ jobs: distro-slug: centos-stream8 display-name: CentOS Stream 8 timeout: 20 - instances: '["stable-3003", "git-3003", "onedir-3003", "stable-3004", "git-3004", "onedir-3004", "stable-3005", "git-3005", "onedir-3005", "git-master", "onedir-master", "latest"]' + instances: '["stable-3003", "git-3003", "stable-3004", "git-3004", "stable-3005", "git-3005", "onedir-3005", "git-master", "latest"]' debian-10: @@ -319,7 +319,7 @@ jobs: distro-slug: debian-10 display-name: Debian 10 timeout: 20 - instances: '["stable-3003", "onedir-3003", "stable-3004", "onedir-3004", "stable-3005", "onedir-3005", "git-master", "onedir-master", "latest"]' + instances: '["stable-3003", "stable-3004", "stable-3005", "onedir-3005", "git-master", "latest"]' debian-11: @@ -333,7 +333,7 @@ jobs: distro-slug: debian-11 display-name: Debian 11 timeout: 20 - instances: '["stable-3004", "onedir-3004", "stable-3005", "onedir-3005", "git-master", "onedir-master", "latest"]' + instances: '["stable-3004", "stable-3005", "onedir-3005", "git-master", "latest"]' debian-9: @@ -347,7 +347,7 @@ jobs: distro-slug: debian-9 display-name: Debian 9 timeout: 20 - instances: '["stable-3003", "git-3003", "onedir-3003", "stable-3004", "git-3004", "onedir-3004", "stable-3005", "git-3005", "onedir-3005", "git-master", "onedir-master", "latest"]' + instances: '["stable-3003", "git-3003", "stable-3004", "git-3004", "stable-3005", "git-3005", "onedir-3005", "git-master", "latest"]' fedora-35: @@ -361,7 +361,7 @@ jobs: distro-slug: fedora-35 display-name: Fedora 35 timeout: 20 - instances: '["git-master", "onedir-master", "latest"]' + instances: '["git-master", "latest"]' fedora-36: @@ -375,7 +375,7 @@ jobs: distro-slug: fedora-36 display-name: Fedora 36 timeout: 20 - instances: '["git-master", "onedir-master", "latest"]' + instances: '["git-master", "latest"]' gentoo: @@ -389,7 +389,7 @@ jobs: distro-slug: gentoo display-name: Gentoo timeout: 90 - instances: '["git-master", "onedir-master", "latest"]' + instances: '["git-master", "latest"]' gentoo-systemd: @@ -403,7 +403,7 @@ jobs: distro-slug: gentoo-systemd display-name: Gentoo (systemd) timeout: 90 - instances: '["git-master", "onedir-master", "latest"]' + instances: '["git-master", "latest"]' opensuse-15: @@ -417,7 +417,7 @@ jobs: distro-slug: opensuse-15 display-name: Opensuse 15 timeout: 20 - instances: '["git-master", "onedir-master", "latest"]' + instances: '["git-master", "latest"]' opensuse-tumbleweed: @@ -431,7 +431,7 @@ jobs: distro-slug: opensuse-tumbleweed display-name: Opensuse Tumbleweed timeout: 20 - instances: '["git-master", "onedir-master", "latest"]' + instances: '["git-master", "latest"]' oraclelinux-7: @@ -445,7 +445,7 @@ jobs: distro-slug: oraclelinux-7 display-name: Oracle Linux 7 timeout: 20 - instances: '["stable-3003", "git-3003", "onedir-3003", "stable-3004", "git-3004", "onedir-3004", "stable-3005", "git-3005", "onedir-3005", "git-master", "onedir-master", "latest"]' + instances: '["stable-3003", "git-3003", "stable-3004", "git-3004", "stable-3005", "git-3005", "onedir-3005", "git-master", "latest"]' oraclelinux-8: @@ -459,7 +459,7 @@ jobs: distro-slug: oraclelinux-8 display-name: Oracle Linux 8 timeout: 20 - instances: '["stable-3003", "git-3003", "onedir-3003", "stable-3004", "git-3004", "onedir-3004", "stable-3005", "git-3005", "onedir-3005", "git-master", "onedir-master", "latest"]' + instances: '["stable-3003", "git-3003", "stable-3004", "git-3004", "stable-3005", "git-3005", "onedir-3005", "git-master", "latest"]' rockylinux-8: @@ -473,7 +473,7 @@ jobs: distro-slug: rockylinux-8 display-name: Rocky Linux 8 timeout: 20 - instances: '["stable-3004", "git-3004", "onedir-3004", "stable-3005", "git-3005", "onedir-3005", "git-master", "onedir-master", "latest"]' + instances: '["stable-3004", "git-3004", "stable-3005", "git-3005", "onedir-3005", "git-master", "latest"]' ubuntu-1804: @@ -487,7 +487,7 @@ jobs: distro-slug: ubuntu-1804 display-name: Ubuntu 18.04 timeout: 20 - instances: '["stable-3003", "git-3003", "onedir-3003", "stable-3004", "git-3004", "onedir-3004", "stable-3005", "git-3005", "onedir-3005", "git-master", "onedir-master", "latest"]' + instances: '["stable-3003", "git-3003", "stable-3004", "git-3004", "stable-3005", "git-3005", "onedir-3005", "git-master", "latest"]' ubuntu-2004: @@ -501,7 +501,7 @@ jobs: distro-slug: ubuntu-2004 display-name: Ubuntu 20.04 timeout: 20 - instances: '["stable-3003", "onedir-3003", "stable-3004", "onedir-3004", "stable-3005", "onedir-3005", "git-master", "onedir-master", "latest"]' + instances: '["stable-3003", "stable-3004", "stable-3005", "onedir-3005", "git-master", "latest"]' ubuntu-2204: @@ -515,7 +515,7 @@ jobs: distro-slug: ubuntu-2204 display-name: Ubuntu 22.04 timeout: 20 - instances: '["stable-3004", "onedir-3004", "stable-3005", "onedir-3005", "git-master", "onedir-master", "latest"]' + instances: '["stable-3004", "stable-3005", "onedir-3005", "git-master", "latest"]' set-pipeline-exit-status: diff --git a/.github/workflows/templates/generate.py b/.github/workflows/templates/generate.py index aecff70..17f5cff 100755 --- a/.github/workflows/templates/generate.py +++ b/.github/workflows/templates/generate.py @@ -158,6 +158,11 @@ SALT_VERSIONS = [ "latest", ] +ONEDIR_SALT_VERSIONS = [ + "3005", + "latest", +] + VERSION_DISPLAY_NAMES = { "3003": "v3003", "3004": "v3004", @@ -410,6 +415,10 @@ def generate_test_jobs(): continue for bootstrap_type in ("stable", "git", "onedir"): + if bootstrap_type == "onedir": + if salt_version not in ONEDIR_SALT_VERSIONS: + continue + if bootstrap_type == "stable": if salt_version == "master": # For the master branch there's no stable build From 38b5f3d042974745f9ed8e4972962734abb06189 Mon Sep 17 00:00:00 2001 From: "Gareth J. Greenaway" Date: Thu, 3 Nov 2022 13:06:07 -0700 Subject: [PATCH 012/104] removing debian 9 --- .github/workflows/ci.yml | 15 --------------- .github/workflows/templates/generate.py | 3 --- 2 files changed, 18 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c346bbd..57a4068 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -336,20 +336,6 @@ jobs: instances: '["stable-3004", "stable-3005", "onedir-3005", "git-master", "latest"]' - debian-9: - name: Debian 9 - 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: debian-9 - display-name: Debian 9 - timeout: 20 - instances: '["stable-3003", "git-3003", "stable-3004", "git-3004", "stable-3005", "git-3005", "onedir-3005", "git-master", "latest"]' - - fedora-35: name: Fedora 35 if: github.event_name == 'push' || needs.collect-changed-files.outputs.run-tests == 'true' @@ -541,7 +527,6 @@ jobs: - centos-stream8 - debian-10 - debian-11 - - debian-9 - fedora-35 - fedora-36 - gentoo diff --git a/.github/workflows/templates/generate.py b/.github/workflows/templates/generate.py index 17f5cff..4180700 100755 --- a/.github/workflows/templates/generate.py +++ b/.github/workflows/templates/generate.py @@ -15,7 +15,6 @@ LINUX_DISTROS = [ "centos-stream8", "debian-10", "debian-11", - "debian-9", "fedora-35", "fedora-36", "gentoo", @@ -53,7 +52,6 @@ STABLE_DISTROS = [ "centos-stream8", "debian-10", "debian-11", - "debian-9", "fedora-35", "fedora-36", "gentoo", @@ -183,7 +181,6 @@ DISTRO_DISPLAY_NAMES = { "centos-stream8": "CentOS Stream 8", "debian-10": "Debian 10", "debian-11": "Debian 11", - "debian-9": "Debian 9", "fedora-35": "Fedora 35", "fedora-36": "Fedora 36", "gentoo": "Gentoo", From f209b55ff03d6a33887f88b66056bc37f4b5361e Mon Sep 17 00:00:00 2001 From: "Gareth J. Greenaway" Date: Thu, 3 Nov 2022 14:02:18 -0700 Subject: [PATCH 013/104] adding 3005 kitchen instances. --- kitchen.yml | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/kitchen.yml b/kitchen.yml index bec515b..acff15f 100644 --- a/kitchen.yml +++ b/kitchen.yml @@ -131,6 +131,20 @@ suites: - freebsd-131 - freebsd-123 - openbsd-6 + - name: git-3005 + provisioner: + salt_version: 3005 + salt_bootstrap_options: -x python3 -MPfq git %s + excludes: + - opensuse-15 + - opensuse-tumbleweed + - debian-11 + - arch + - gentoo + - gentoo-systemd + - freebsd-131 + - freebsd-123 + - openbsd-6 - name: stable-3003-0 provisioner: salt_version: 3003 @@ -186,6 +200,17 @@ suites: - freebsd-131 - freebsd-123 - openbsd-6 + - name: stable-3005 + provisioner: + salt_version: 3005 + salt_bootstrap_options: -x python3 -MP stable %s + excludes: + - opensuse-15 + - opensuse-tumbleweed + - arch + - freebsd-131 + - freebsd-123 + - openbsd-6 - name: git-master provisioner: salt_version: master From dda81fa2422e689eced0f37fd2cee3c35c02b4c3 Mon Sep 17 00:00:00 2001 From: "Gareth J. Greenaway" Date: Thu, 3 Nov 2022 16:37:12 -0700 Subject: [PATCH 014/104] Adding stable 3005 instanes to MacOS and Windows. --- kitchen.macos.yml | 3 +++ kitchen.windows.yml | 3 +++ 2 files changed, 6 insertions(+) diff --git a/kitchen.macos.yml b/kitchen.macos.yml index 845bace..3504f2e 100644 --- a/kitchen.macos.yml +++ b/kitchen.macos.yml @@ -25,6 +25,9 @@ suites: - name: stable-3004 provisioner: salt_version: 3004.1 + - name: stable-3005 + provisioner: + salt_version: 3005.1 - name: latest provisioner: salt_version: latest diff --git a/kitchen.windows.yml b/kitchen.windows.yml index e54b7f6..f68f4b1 100644 --- a/kitchen.windows.yml +++ b/kitchen.windows.yml @@ -23,6 +23,9 @@ suites: - name: stable-3004 provisioner: salt_version: 3004.1-1 + - name: stable-3005 + provisioner: + salt_version: 3005.1-1 - name: latest provisioner: salt_version: latest From 3199872ab1bcf6b713392025613193be22146294 Mon Sep 17 00:00:00 2001 From: "Gareth J. Greenaway" Date: Tue, 22 Nov 2022 10:10:11 -0800 Subject: [PATCH 015/104] trying to limit the number of parallel jobs --- .github/workflows/test-linux.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/test-linux.yml b/.github/workflows/test-linux.yml index 3949aff..3928f2f 100644 --- a/.github/workflows/test-linux.yml +++ b/.github/workflows/test-linux.yml @@ -29,6 +29,7 @@ jobs: runs-on: ubuntu-latest timeout-minutes: ${{ inputs.timeout }} strategy: + max-parallel: 2 fail-fast: false matrix: instance: ${{ fromJSON(inputs.instances) }} From e07a30ec9f6be903d7093d3ccc5ce6c1cc998616 Mon Sep 17 00:00:00 2001 From: "Gareth J. Greenaway" Date: Tue, 29 Nov 2022 16:07:24 -0800 Subject: [PATCH 016/104] Adding upterm to debug --- .github/workflows/test-linux.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/workflows/test-linux.yml b/.github/workflows/test-linux.yml index 3928f2f..a2c8906 100644 --- a/.github/workflows/test-linux.yml +++ b/.github/workflows/test-linux.yml @@ -37,6 +37,12 @@ jobs: steps: - uses: actions/checkout@v3 + - name: Setup upterm session + uses: lhotari/action-upterm@v1 + with: + limit-access-to-actor: true + limit-access-to-users: garethgreenaway + - name: Setup Ruby uses: ruby/setup-ruby@v1 with: From 8185dbda1e955d6169e0dc9182fba40c26515381 Mon Sep 17 00:00:00 2001 From: "Gareth J. Greenaway" Date: Tue, 29 Nov 2022 17:16:58 -0800 Subject: [PATCH 017/104] swapping upterm for tmate --- .github/workflows/test-linux.yml | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/.github/workflows/test-linux.yml b/.github/workflows/test-linux.yml index a2c8906..0375c19 100644 --- a/.github/workflows/test-linux.yml +++ b/.github/workflows/test-linux.yml @@ -37,11 +37,9 @@ jobs: steps: - uses: actions/checkout@v3 - - name: Setup upterm session - uses: lhotari/action-upterm@v1 - with: - limit-access-to-actor: true - limit-access-to-users: garethgreenaway + - name: Setup tmate session + uses: mxschmitt/action-tmate@v3 + timeout-minutes: 15 - name: Setup Ruby uses: ruby/setup-ruby@v1 From 8d902281ab590e0bb261595c957d9cb128f24bf1 Mon Sep 17 00:00:00 2001 From: "Gareth J. Greenaway" Date: Wed, 30 Nov 2022 09:48:02 -0800 Subject: [PATCH 018/104] moving tmate step down. --- .github/workflows/test-linux.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/test-linux.yml b/.github/workflows/test-linux.yml index 0375c19..8971f08 100644 --- a/.github/workflows/test-linux.yml +++ b/.github/workflows/test-linux.yml @@ -37,10 +37,6 @@ jobs: steps: - uses: actions/checkout@v3 - - name: Setup tmate session - uses: mxschmitt/action-tmate@v3 - timeout-minutes: 15 - - name: Setup Ruby uses: ruby/setup-ruby@v1 with: @@ -57,6 +53,10 @@ jobs: python3 -m pip install -U pip python3 -m pip install -r tests/requirements.txt + - name: Setup tmate session + uses: mxschmitt/action-tmate@v3 + timeout-minutes: 15 + - name: Create Test Instance run: | bundle exec kitchen create ${{ matrix.instance }}-${{ inputs.distro-slug }} || \ From 97d6ae9bb998b60cbf17adcc59bd7ce238a901f6 Mon Sep 17 00:00:00 2001 From: "Gareth J. Greenaway" Date: Wed, 30 Nov 2022 15:27:56 -0800 Subject: [PATCH 019/104] Adding conditional for tmate step so it only (hopefully) runs for onedir-3005-amazon-2 --- .github/workflows/test-linux.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/test-linux.yml b/.github/workflows/test-linux.yml index 8971f08..2641048 100644 --- a/.github/workflows/test-linux.yml +++ b/.github/workflows/test-linux.yml @@ -54,6 +54,7 @@ jobs: python3 -m pip install -r tests/requirements.txt - name: Setup tmate session + if: ${{ matrix.instance }}-${{ inputs.distro-slug }} == "onedir-3005-amazon-2" uses: mxschmitt/action-tmate@v3 timeout-minutes: 15 From b67b707b6fd62300bbebd7057d51139fee9f7a32 Mon Sep 17 00:00:00 2001 From: "Gareth J. Greenaway" Date: Wed, 30 Nov 2022 15:50:24 -0800 Subject: [PATCH 020/104] adjusting if statement. --- .github/workflows/test-linux.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/test-linux.yml b/.github/workflows/test-linux.yml index 2641048..03ae8d2 100644 --- a/.github/workflows/test-linux.yml +++ b/.github/workflows/test-linux.yml @@ -54,7 +54,8 @@ jobs: python3 -m pip install -r tests/requirements.txt - name: Setup tmate session - if: ${{ matrix.instance }}-${{ inputs.distro-slug }} == "onedir-3005-amazon-2" + if: | + matrix.instance == "onedir-3005" && inputs.distro-slug == "amazon-2" uses: mxschmitt/action-tmate@v3 timeout-minutes: 15 From 14976f90c816185144a1f319ad8b5a6c9f71dc04 Mon Sep 17 00:00:00 2001 From: "Gareth J. Greenaway" Date: Thu, 1 Dec 2022 09:41:18 -0800 Subject: [PATCH 021/104] just run tmate on onedir jobs --- .github/workflows/test-linux.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/test-linux.yml b/.github/workflows/test-linux.yml index 03ae8d2..2e157cf 100644 --- a/.github/workflows/test-linux.yml +++ b/.github/workflows/test-linux.yml @@ -54,8 +54,7 @@ jobs: python3 -m pip install -r tests/requirements.txt - name: Setup tmate session - if: | - matrix.instance == "onedir-3005" && inputs.distro-slug == "amazon-2" + if: matrix.instance == "onedir-3005" uses: mxschmitt/action-tmate@v3 timeout-minutes: 15 From 07712b78555aa241500849c7dc6c678e0195c29d Mon Sep 17 00:00:00 2001 From: "Gareth J. Greenaway" Date: Thu, 1 Dec 2022 09:49:55 -0800 Subject: [PATCH 022/104] single quotes not double quotes. --- .github/workflows/test-linux.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test-linux.yml b/.github/workflows/test-linux.yml index 2e157cf..2654f9c 100644 --- a/.github/workflows/test-linux.yml +++ b/.github/workflows/test-linux.yml @@ -54,7 +54,7 @@ jobs: python3 -m pip install -r tests/requirements.txt - name: Setup tmate session - if: matrix.instance == "onedir-3005" + if: matrix.instance == 'onedir-3005' uses: mxschmitt/action-tmate@v3 timeout-minutes: 15 From f7aa4172711ac4396add4d27e8e6ee3cea3b406d Mon Sep 17 00:00:00 2001 From: "Gareth J. Greenaway" Date: Fri, 2 Dec 2022 10:53:24 -0800 Subject: [PATCH 023/104] test forcing the docker tests to run on ubuntu 20.04. --- .github/workflows/test-linux.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test-linux.yml b/.github/workflows/test-linux.yml index 2654f9c..19ecc8e 100644 --- a/.github/workflows/test-linux.yml +++ b/.github/workflows/test-linux.yml @@ -26,7 +26,7 @@ on: jobs: Test: name: ${{ matrix.instance }} - runs-on: ubuntu-latest + runs-on: ubuntu-2004 timeout-minutes: ${{ inputs.timeout }} strategy: max-parallel: 2 From 6781b2550474e6bb010f32b655d011a53dbca3d7 Mon Sep 17 00:00:00 2001 From: "Gareth J. Greenaway" Date: Fri, 2 Dec 2022 10:56:35 -0800 Subject: [PATCH 024/104] removing tmate. --- .github/workflows/test-linux.yml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/.github/workflows/test-linux.yml b/.github/workflows/test-linux.yml index 19ecc8e..557289d 100644 --- a/.github/workflows/test-linux.yml +++ b/.github/workflows/test-linux.yml @@ -53,11 +53,6 @@ jobs: python3 -m pip install -U pip python3 -m pip install -r tests/requirements.txt - - name: Setup tmate session - if: matrix.instance == 'onedir-3005' - uses: mxschmitt/action-tmate@v3 - timeout-minutes: 15 - - name: Create Test Instance run: | bundle exec kitchen create ${{ matrix.instance }}-${{ inputs.distro-slug }} || \ From db9d0e5f05e769bdba32c629d02fecd2893a597d Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Sun, 4 Dec 2022 00:31:23 +0000 Subject: [PATCH 025/104] Fix runner label. --- .github/workflows/test-linux.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test-linux.yml b/.github/workflows/test-linux.yml index 557289d..c1eb4ad 100644 --- a/.github/workflows/test-linux.yml +++ b/.github/workflows/test-linux.yml @@ -26,7 +26,7 @@ on: jobs: Test: name: ${{ matrix.instance }} - runs-on: ubuntu-2004 + runs-on: ubuntu-20.04 timeout-minutes: ${{ inputs.timeout }} strategy: max-parallel: 2 From e458a9c4759db04e3927bb926cafc8b1fa3eadc9 Mon Sep 17 00:00:00 2001 From: "Gareth J. Greenaway" Date: Mon, 5 Dec 2022 12:48:23 -0800 Subject: [PATCH 026/104] Do not change the systemd files for Fedora 36+ --- bootstrap-salt.sh | 6 +++--- kitchen.yml | 2 ++ 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh index 90444b1..9248803 100755 --- a/bootstrap-salt.sh +++ b/bootstrap-salt.sh @@ -4315,9 +4315,9 @@ 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 + #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 diff --git a/kitchen.yml b/kitchen.yml index acff15f..e4f422c 100644 --- a/kitchen.yml +++ b/kitchen.yml @@ -72,6 +72,7 @@ platforms: provision_command: - rc-update add sshd default - echo "PubkeyAcceptedAlgorithms +ssh-rsa" | tee -a /etc/ssh/sshd_config + - touch /etc/sudoers.d/root - name: gentoo-systemd driver: image: gentoo/stage3:systemd @@ -79,6 +80,7 @@ platforms: provision_command: - systemctl enable sshd.service - echo "PubkeyAcceptedAlgorithms +ssh-rsa" | tee -a /etc/ssh/sshd_config + - touch /etc/sudoers.d/root - name: opensuse-15 driver: image: opensuse/leap:15.4 From e4e12f1f84d6942c51abbae66c332836d3f4f93c Mon Sep 17 00:00:00 2001 From: "Gareth J. Greenaway" Date: Mon, 5 Dec 2022 16:41:02 -0800 Subject: [PATCH 027/104] disable gentoo tests --- kitchen.yml | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/kitchen.yml b/kitchen.yml index e4f422c..66e1577 100644 --- a/kitchen.yml +++ b/kitchen.yml @@ -72,7 +72,7 @@ platforms: provision_command: - rc-update add sshd default - echo "PubkeyAcceptedAlgorithms +ssh-rsa" | tee -a /etc/ssh/sshd_config - - touch /etc/sudoers.d/root + - mkdir /etc/sudoers.d - name: gentoo-systemd driver: image: gentoo/stage3:systemd @@ -80,7 +80,7 @@ platforms: provision_command: - systemctl enable sshd.service - echo "PubkeyAcceptedAlgorithms +ssh-rsa" | tee -a /etc/ssh/sshd_config - - touch /etc/sudoers.d/root + - mkdir /etc/sudoers.d - name: opensuse-15 driver: image: opensuse/leap:15.4 @@ -217,11 +217,17 @@ suites: provisioner: salt_version: master salt_bootstrap_options: -x python3 -MPfq -D git %s + excludes: + - gentoo + - gentoo-systemd - name: latest provisioner: salt_version: latest salt_bootstrap_options: -MP stable %s + excludes: + - gentoo + - gentoo-systemd - name: onedir-latest provisioner: From b5ec569df20dc4d21ead5deb2c8cd9acd7366b0e Mon Sep 17 00:00:00 2001 From: "Gareth J. Greenaway" Date: Mon, 5 Dec 2022 18:45:19 -0800 Subject: [PATCH 028/104] testing change to kitcken-docker for Gentoo hosts. --- Gemfile | 3 ++- kitchen.yml | 8 -------- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/Gemfile b/Gemfile index a70a9da..624713f 100644 --- a/Gemfile +++ b/Gemfile @@ -4,7 +4,8 @@ source "https://rubygems.org" gem 'test-kitchen', '>= 3.2.2' gem 'kitchen-salt', '>= 0.7.2' -gem 'kitchen-docker', :git => 'https://github.com/test-kitchen/kitchen-docker.git', :branch => 'main' +# gem 'kitchen-docker', :git => 'https://github.com/test-kitchen/kitchen-docker.git', :branch => 'main' +gem 'kitchen-docker', :git => 'https://github.com/garethgreenaway/kitchen-docker.git', :branch => 'sudoers_fix' group :vagrant do gem 'kitchen-vagrant' diff --git a/kitchen.yml b/kitchen.yml index 66e1577..acff15f 100644 --- a/kitchen.yml +++ b/kitchen.yml @@ -72,7 +72,6 @@ platforms: provision_command: - rc-update add sshd default - echo "PubkeyAcceptedAlgorithms +ssh-rsa" | tee -a /etc/ssh/sshd_config - - mkdir /etc/sudoers.d - name: gentoo-systemd driver: image: gentoo/stage3:systemd @@ -80,7 +79,6 @@ platforms: provision_command: - systemctl enable sshd.service - echo "PubkeyAcceptedAlgorithms +ssh-rsa" | tee -a /etc/ssh/sshd_config - - mkdir /etc/sudoers.d - name: opensuse-15 driver: image: opensuse/leap:15.4 @@ -217,17 +215,11 @@ suites: provisioner: salt_version: master salt_bootstrap_options: -x python3 -MPfq -D git %s - excludes: - - gentoo - - gentoo-systemd - name: latest provisioner: salt_version: latest salt_bootstrap_options: -MP stable %s - excludes: - - gentoo - - gentoo-systemd - name: onedir-latest provisioner: From 043068bba3992be0c4a87b6b3190e6494e6bb615 Mon Sep 17 00:00:00 2001 From: "Gareth J. Greenaway" Date: Mon, 5 Dec 2022 20:51:06 -0800 Subject: [PATCH 029/104] revert back to official repo, fix merged in. --- Gemfile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Gemfile b/Gemfile index 624713f..a70a9da 100644 --- a/Gemfile +++ b/Gemfile @@ -4,8 +4,7 @@ source "https://rubygems.org" gem 'test-kitchen', '>= 3.2.2' gem 'kitchen-salt', '>= 0.7.2' -# gem 'kitchen-docker', :git => 'https://github.com/test-kitchen/kitchen-docker.git', :branch => 'main' -gem 'kitchen-docker', :git => 'https://github.com/garethgreenaway/kitchen-docker.git', :branch => 'sudoers_fix' +gem 'kitchen-docker', :git => 'https://github.com/test-kitchen/kitchen-docker.git', :branch => 'main' group :vagrant do gem 'kitchen-vagrant' From 861dfd082b93d5a4261f69de8ed7f1a44b344ada Mon Sep 17 00:00:00 2001 From: "Gareth J. Greenaway" Date: Tue, 29 Nov 2022 11:28:50 -0800 Subject: [PATCH 030/104] Removing EPEL, which is no longer needed. --- bootstrap-salt.sh | 26 -------------------------- 1 file changed, 26 deletions(-) diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh index 9248803..fec3c17 100755 --- a/bootstrap-salt.sh +++ b/bootstrap-salt.sh @@ -4374,30 +4374,6 @@ install_fedora_check_services() { # # CentOS Install Functions # -__install_epel_repository() { - if [ ${_EPEL_REPOS_INSTALLED} -eq $BS_TRUE ]; then - return 0 - fi - - # Check if epel repo is already enabled and flag it accordingly - if yum repolist | grep -q "^[!]\\?${_EPEL_REPO}/"; then - _EPEL_REPOS_INSTALLED=$BS_TRUE - return 0 - fi - - # Download latest 'epel-next-release' package for the distro version directly - epel_next_repo_url="${HTTP_VAL}://dl.fedoraproject.org/pub/epel/epel-next-release-latest-${DISTRO_MAJOR_VERSION}.noarch.rpm" - - # Download latest 'epel-release' package for the distro version directly - epel_repo_url="${HTTP_VAL}://dl.fedoraproject.org/pub/epel/epel-release-latest-${DISTRO_MAJOR_VERSION}.noarch.rpm" - - yum -y install "${epel_next_repo_url}" "${epel_repo_url}" - - _EPEL_REPOS_INSTALLED=$BS_TRUE - - return 0 -} - __install_saltstack_rhel_repository() { if [ "$ITYPE" = "stable" ]; then repo_rev="$STABLE_REV" @@ -4520,7 +4496,6 @@ install_centos_stable_deps() { fi if [ "$_DISABLE_REPOS" -eq "$BS_FALSE" ]; then - __install_epel_repository || return 1 __install_saltstack_rhel_repository || return 1 fi @@ -4824,7 +4799,6 @@ install_centos_onedir_deps() { fi if [ "$_DISABLE_REPOS" -eq "$BS_FALSE" ]; then - __install_epel_repository || return 1 __install_saltstack_rhel_onedir_repository || return 1 fi From fa45a784b8dd3dbc477d0db647d977a6aa2a2fff Mon Sep 17 00:00:00 2001 From: "Gareth J. Greenaway" Date: Tue, 6 Dec 2022 08:44:39 -0800 Subject: [PATCH 031/104] removing more EPEL references. Ensuring procps is installed on Red Hat based hosts. --- bootstrap-salt.sh | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh index fec3c17..f3db4ac 100755 --- a/bootstrap-salt.sh +++ b/bootstrap-salt.sh @@ -2099,20 +2099,13 @@ __rpm_import_gpg() { #---------------------------------------------------------------------------------------------------------------------- __yum_install_noinput() { - ENABLE_EPEL_CMD="" - # Skip Amazon Linux for the first round, since EPEL is no longer required. - # See issue #724 - if [ $_DISABLE_REPOS -eq $BS_FALSE ] && [ "$DISTRO_NAME_L" != "amazon_linux_ami" ]; then - ENABLE_EPEL_CMD="--enablerepo=${_EPEL_REPO}" - fi - if [ "$DISTRO_NAME_L" = "oracle_linux" ]; then # We need to install one package at a time because --enablerepo=X disables ALL OTHER REPOS!!!! for package in "${@}"; do - yum -y install "${package}" || yum -y install "${package}" ${ENABLE_EPEL_CMD} || return $? + yum -y install "${package}" || yum -y install "${package}" || return $? done else - yum -y install "${@}" ${ENABLE_EPEL_CMD} || return $? + yum -y install "${@}" || return $? fi } # ---------- end of function __yum_install_noinput ---------- @@ -4537,6 +4530,8 @@ install_centos_stable_deps() { fi fi + __PACKAGES="${__PACKAGES} procps" + # shellcheck disable=SC2086 __yum_install_noinput ${__PACKAGES} || return 1 From be6b928ac8f14bf4ecc0026f035310673294a752 Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Mon, 5 Dec 2022 08:06:03 +0000 Subject: [PATCH 032/104] feat(bootstrap-salt): add common `onedir nightly` adjustments --- bootstrap-salt.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh index 2f4bb6f..f079348 100755 --- a/bootstrap-salt.sh +++ b/bootstrap-salt.sh @@ -269,6 +269,7 @@ _CUSTOM_MINION_CONFIG="null" _QUIET_GIT_INSTALLATION=$BS_FALSE _REPO_URL="repo.saltproject.io" _ONEDIR_DIR="salt" +_ONEDIR_NIGHTLY_DIR="salt-dev/${_ONEDIR_DIR}" _PY_EXE="python3" _INSTALL_PY="$BS_FALSE" _TORNADO_MAX_PY3_VERSION="5.0" @@ -636,7 +637,7 @@ elif [ "$ITYPE" = "onedir" ]; then if [ "$#" -eq 0 ];then ONEDIR_REV="latest" else - if [ "$(echo "$1" | grep -E '^(latest|3005)$')" != "" ]; then + if [ "$(echo "$1" | grep -E '^(nightly|latest|3005)$')" != "" ]; then ONEDIR_REV="$1" shift elif [ "$(echo "$1" | grep -E '^(3005(\.[0-9]*)?)')" != "" ]; then @@ -648,7 +649,7 @@ elif [ "$ITYPE" = "onedir" ]; then ONEDIR_REV="minor/$1" shift else - echo "Unknown stable version: $1 (valid: 3005, latest.)" + echo "Unknown stable version: $1 (valid: 3005, latest, nightly.)" exit 1 fi fi From f9c561adb0bb77e0b29c668236a97ec93597bb92 Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Mon, 5 Dec 2022 08:06:47 +0000 Subject: [PATCH 033/104] feat(bootstrap-salt): add Debian-specific `onedir nightly` --- bootstrap-salt.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh index f079348..81a77a5 100755 --- a/bootstrap-salt.sh +++ b/bootstrap-salt.sh @@ -3577,6 +3577,9 @@ __install_saltstack_debian_onedir_repository() { # amd64 is just a part of repository URI, 32-bit pkgs are hosted under the same location SALTSTACK_DEBIAN_URL="${HTTP_VAL}://${_REPO_URL}/${_ONEDIR_DIR}/${__PY_VERSION_REPO}/debian/${DEBIAN_RELEASE}/${__REPO_ARCH}/${ONEDIR_REV}/" + if [ "${ONEDIR_REV}" = "nightly" ] ; then + SALTSTACK_DEBIAN_URL="${HTTP_VAL}://${_REPO_URL}/${_ONEDIR_NIGHTLY_DIR}/${__PY_VERSION_REPO}/debian/${DEBIAN_RELEASE}/${__REPO_ARCH}/" + fi echo "$__REPO_ARCH_DEB $SALTSTACK_DEBIAN_URL $DEBIAN_CODENAME main" > "/etc/apt/sources.list.d/salt.list" __apt_key_fetch "${SALTSTACK_DEBIAN_URL}salt-archive-keyring.gpg" || return 1 From 4d55d1b26d8f2bbe695129066be3426a7434142f Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Mon, 5 Dec 2022 08:11:23 +0000 Subject: [PATCH 034/104] feat(bootstrap-salt): add Ubuntu-specific `onedir nightly` --- bootstrap-salt.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh index 81a77a5..f797b47 100755 --- a/bootstrap-salt.sh +++ b/bootstrap-salt.sh @@ -3055,6 +3055,9 @@ __install_saltstack_ubuntu_onedir_repository() { # SaltStack's stable Ubuntu repository: SALTSTACK_UBUNTU_URL="${HTTP_VAL}://${_REPO_URL}/${_ONEDIR_DIR}/${__PY_VERSION_REPO}/ubuntu/${UBUNTU_VERSION}/${__REPO_ARCH}/${ONEDIR_REV}/" + if [ "${ONEDIR_REV}" = "nightly" ] ; then + SALTSTACK_UBUNTU_URL="${HTTP_VAL}://${_REPO_URL}/${_ONEDIR_NIGHTLY_DIR}/${__PY_VERSION_REPO}/ubuntu/${UBUNTU_VERSION}/${__REPO_ARCH}/" + fi echo "$__REPO_ARCH_DEB $SALTSTACK_UBUNTU_URL $UBUNTU_CODENAME main" > /etc/apt/sources.list.d/salt.list __apt_key_fetch "${SALTSTACK_UBUNTU_URL}salt-archive-keyring.gpg" || return 1 From 599ec89559819e197a8fd978f549e6c226393f05 Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Mon, 5 Dec 2022 08:25:59 +0000 Subject: [PATCH 035/104] feat(bootstrap-salt): add RedHat-specific `onedir nightly` --- bootstrap-salt.sh | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh index f797b47..608bb68 100755 --- a/bootstrap-salt.sh +++ b/bootstrap-salt.sh @@ -4445,6 +4445,9 @@ __install_saltstack_rhel_onedir_repository() { # Avoid using '$releasever' variable for yum. # Instead, this should work correctly on all RHEL variants. base_url="${HTTP_VAL}://${_REPO_URL}/${_ONEDIR_DIR}/${__PY_VERSION_REPO}/redhat/${DISTRO_MAJOR_VERSION}/\$basearch/${ONEDIR_REV}/" + if [ "${ONEDIR_REV}" = "nightly" ] ; then + base_url="${HTTP_VAL}://${_REPO_URL}/${_ONEDIR_NIGHTLY_DIR}/${__PY_VERSION_REPO}/redhat/${DISTRO_MAJOR_VERSION}/\$basearch/" + fi if [ "${DISTRO_MAJOR_VERSION}" -eq 9 ]; then gpg_key="SALTSTACK-GPG-KEY2.pub" else @@ -4471,6 +4474,9 @@ enabled_metadata=1 _eof fetch_url="${HTTP_VAL}://${_REPO_URL}/${_ONEDIR_DIR}/${__PY_VERSION_REPO}/redhat/${DISTRO_MAJOR_VERSION}/${CPU_ARCH_L}/${ONEDIR_REV}/" + if [ "${ONEDIR_REV}" = "nightly" ] ; then + fetch_url="${HTTP_VAL}://${_REPO_URL}/${_ONEDIR_NIGHTLY_DIR}/${__PY_VERSION_REPO}/redhat/${DISTRO_MAJOR_VERSION}/${CPU_ARCH_L}/" + fi for key in $gpg_key; do __rpm_import_gpg "${fetch_url}${key}" || return 1 done From 100d9727037f03b97ec04755d0c1362a593cf7e3 Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Mon, 5 Dec 2022 08:57:41 +0000 Subject: [PATCH 036/104] feat(bootstrap-salt): add Amazon-specific `onedir nightly` --- bootstrap-salt.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh index 608bb68..625fa3e 100755 --- a/bootstrap-salt.sh +++ b/bootstrap-salt.sh @@ -6212,6 +6212,9 @@ install_amazon_linux_ami_2_onedir_deps() { fi base_url="$HTTP_VAL://${_REPO_URL}/${_ONEDIR_DIR}/${__PY_VERSION_REPO}/amazon/2/\$basearch/$repo_rev/" + if [ "${ONEDIR_REV}" = "nightly" ] ; then + base_url="$HTTP_VAL://${_REPO_URL}/${_ONEDIR_NIGHTLY_DIR}/${__PY_VERSION_REPO}/amazon/2/\$basearch/" + fi gpg_key="${base_url}SALTSTACK-GPG-KEY.pub,${base_url}base/RPM-GPG-KEY-CentOS-7" if [ -n "$_PY_EXE" ] && [ "$_PY_MAJOR_VERSION" -eq 3 ]; then gpg_key="${base_url}SALTSTACK-GPG-KEY.pub" From 83f9c1e190290bd03b8808f5d1764e83566556c0 Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Mon, 5 Dec 2022 08:27:14 +0000 Subject: [PATCH 037/104] test(conftest): skip Salt version test for `nightly` --- tests/conftest.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/conftest.py b/tests/conftest.py index 5e9429d..370525b 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -46,6 +46,6 @@ def target_python_version(): @pytest.fixture(scope="session") def target_salt_version(): target_salt = os.environ["KITCHEN_SUITE"].split("-", 2)[-1].replace("-", ".") - if target_salt in ("latest", "master"): + if target_salt in ("latest", "master", "nightly"): pytest.skip("Don't have a specific salt version to test against") return target_salt From 9b5017dd03d9c3b976c50930864f37ef2b8a76f0 Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Mon, 5 Dec 2022 08:40:41 +0000 Subject: [PATCH 038/104] ci(kitchen): add `onedir-nightly` suite --- kitchen.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/kitchen.yml b/kitchen.yml index acff15f..60a105a 100644 --- a/kitchen.yml +++ b/kitchen.yml @@ -221,6 +221,11 @@ suites: salt_version: latest salt_bootstrap_options: -MP stable %s + - name: onedir-nightly + provisioner: + salt_version: nightly + salt_bootstrap_options: -MP onedir %s + - name: onedir-latest provisioner: salt_version: latest From ad8d9667b255c7de6e42f7d274badf7857211e9b Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Wed, 7 Dec 2022 06:52:47 +0000 Subject: [PATCH 039/104] refactor(generate): use `STABLE_VERSION_BLACKLIST` consistently --- .github/workflows/templates/generate.py | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/.github/workflows/templates/generate.py b/.github/workflows/templates/generate.py index 4180700..a92dfbc 100755 --- a/.github/workflows/templates/generate.py +++ b/.github/workflows/templates/generate.py @@ -169,7 +169,9 @@ VERSION_DISPLAY_NAMES = { "latest": "Latest", } -STABLE_VERSION_BLACKLIST = [] +STABLE_VERSION_BLACKLIST = [ + "master", +] LATEST_PKG_BLACKLIST = [] @@ -327,8 +329,7 @@ def generate_test_jobs(): for bootstrap_type in ("stable",): if bootstrap_type == "stable": - if salt_version == "master": - # For the master branch there's no stable build + if salt_version in STABLE_VERSION_BLACKLIST: continue kitchen_target = f"{bootstrap_type}-{salt_version}" @@ -368,8 +369,7 @@ def generate_test_jobs(): for bootstrap_type in ("stable",): if bootstrap_type == "stable": - if salt_version == "master": - # For the master branch there's no stable build + if salt_version in STABLE_VERSION_BLACKLIST: continue kitchen_target = f"{bootstrap_type}-{salt_version}" @@ -417,15 +417,11 @@ def generate_test_jobs(): continue if bootstrap_type == "stable": - if salt_version == "master": - # For the master branch there's no stable build + if salt_version in STABLE_VERSION_BLACKLIST: continue if distro not in STABLE_DISTROS: continue - if salt_version in STABLE_VERSION_BLACKLIST: - continue - if distro.startswith("fedora") and salt_version != "latest": # Fedora does not keep old builds around continue From 3c3dba8a6ddcb5889b80c46ec06abbb576b7344b Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Wed, 7 Dec 2022 06:54:32 +0000 Subject: [PATCH 040/104] feat(generate): add `onedir-nightly` generation => CI --- .github/workflows/ci.yml | 24 ++++++++++---------- .github/workflows/templates/generate.py | 29 +++++++++++++++++++++++++ 2 files changed, 41 insertions(+), 12 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 57a4068..baa80b0 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -249,7 +249,7 @@ jobs: distro-slug: almalinux-8 display-name: AlmaLinux 8 timeout: 20 - instances: '["stable-3003", "git-3003", "stable-3004", "git-3004", "stable-3005", "git-3005", "onedir-3005", "git-master", "latest"]' + instances: '["stable-3003", "git-3003", "stable-3004", "git-3004", "stable-3005", "git-3005", "onedir-3005", "git-master", "latest", "onedir-nightly"]' amazon-2: @@ -263,7 +263,7 @@ jobs: distro-slug: amazon-2 display-name: Amazon 2 timeout: 20 - instances: '["stable-3003", "stable-3004", "stable-3005", "onedir-3005", "git-master", "latest"]' + instances: '["stable-3003", "stable-3004", "stable-3005", "onedir-3005", "git-master", "latest", "onedir-nightly"]' arch: @@ -291,7 +291,7 @@ jobs: distro-slug: centos-7 display-name: CentOS 7 timeout: 20 - instances: '["stable-3003", "git-3003", "stable-3004", "git-3004", "stable-3005", "git-3005", "onedir-3005", "git-master", "latest"]' + instances: '["stable-3003", "git-3003", "stable-3004", "git-3004", "stable-3005", "git-3005", "onedir-3005", "git-master", "latest", "onedir-nightly"]' centos-stream8: @@ -305,7 +305,7 @@ jobs: distro-slug: centos-stream8 display-name: CentOS Stream 8 timeout: 20 - instances: '["stable-3003", "git-3003", "stable-3004", "git-3004", "stable-3005", "git-3005", "onedir-3005", "git-master", "latest"]' + instances: '["stable-3003", "git-3003", "stable-3004", "git-3004", "stable-3005", "git-3005", "onedir-3005", "git-master", "latest", "onedir-nightly"]' debian-10: @@ -319,7 +319,7 @@ jobs: distro-slug: debian-10 display-name: Debian 10 timeout: 20 - instances: '["stable-3003", "stable-3004", "stable-3005", "onedir-3005", "git-master", "latest"]' + instances: '["stable-3003", "stable-3004", "stable-3005", "onedir-3005", "git-master", "latest", "onedir-nightly"]' debian-11: @@ -333,7 +333,7 @@ jobs: distro-slug: debian-11 display-name: Debian 11 timeout: 20 - instances: '["stable-3004", "stable-3005", "onedir-3005", "git-master", "latest"]' + instances: '["stable-3004", "stable-3005", "onedir-3005", "git-master", "latest", "onedir-nightly"]' fedora-35: @@ -431,7 +431,7 @@ jobs: distro-slug: oraclelinux-7 display-name: Oracle Linux 7 timeout: 20 - instances: '["stable-3003", "git-3003", "stable-3004", "git-3004", "stable-3005", "git-3005", "onedir-3005", "git-master", "latest"]' + instances: '["stable-3003", "git-3003", "stable-3004", "git-3004", "stable-3005", "git-3005", "onedir-3005", "git-master", "latest", "onedir-nightly"]' oraclelinux-8: @@ -445,7 +445,7 @@ jobs: distro-slug: oraclelinux-8 display-name: Oracle Linux 8 timeout: 20 - instances: '["stable-3003", "git-3003", "stable-3004", "git-3004", "stable-3005", "git-3005", "onedir-3005", "git-master", "latest"]' + instances: '["stable-3003", "git-3003", "stable-3004", "git-3004", "stable-3005", "git-3005", "onedir-3005", "git-master", "latest", "onedir-nightly"]' rockylinux-8: @@ -459,7 +459,7 @@ jobs: distro-slug: rockylinux-8 display-name: Rocky Linux 8 timeout: 20 - instances: '["stable-3004", "git-3004", "stable-3005", "git-3005", "onedir-3005", "git-master", "latest"]' + instances: '["stable-3004", "git-3004", "stable-3005", "git-3005", "onedir-3005", "git-master", "latest", "onedir-nightly"]' ubuntu-1804: @@ -473,7 +473,7 @@ jobs: distro-slug: ubuntu-1804 display-name: Ubuntu 18.04 timeout: 20 - instances: '["stable-3003", "git-3003", "stable-3004", "git-3004", "stable-3005", "git-3005", "onedir-3005", "git-master", "latest"]' + instances: '["stable-3003", "git-3003", "stable-3004", "git-3004", "stable-3005", "git-3005", "onedir-3005", "git-master", "latest", "onedir-nightly"]' ubuntu-2004: @@ -487,7 +487,7 @@ jobs: distro-slug: ubuntu-2004 display-name: Ubuntu 20.04 timeout: 20 - instances: '["stable-3003", "stable-3004", "stable-3005", "onedir-3005", "git-master", "latest"]' + instances: '["stable-3003", "stable-3004", "stable-3005", "onedir-3005", "git-master", "latest", "onedir-nightly"]' ubuntu-2204: @@ -501,7 +501,7 @@ jobs: distro-slug: ubuntu-2204 display-name: Ubuntu 22.04 timeout: 20 - instances: '["stable-3004", "stable-3005", "onedir-3005", "git-master", "latest"]' + instances: '["stable-3004", "stable-3005", "onedir-3005", "git-master", "latest", "onedir-nightly"]' set-pipeline-exit-status: diff --git a/.github/workflows/templates/generate.py b/.github/workflows/templates/generate.py index a92dfbc..81ab8b7 100755 --- a/.github/workflows/templates/generate.py +++ b/.github/workflows/templates/generate.py @@ -66,6 +66,21 @@ STABLE_DISTROS = [ "ubuntu-2204", ] +ONEDIR_DISTROS = [ + "almalinux-8", + "amazon-2", + "centos-7", + "centos-stream8", + "debian-10", + "debian-11", + "oraclelinux-7", + "oraclelinux-8", + "rockylinux-8", + "ubuntu-1804", + "ubuntu-2004", + "ubuntu-2204", +] + BLACKLIST_3003 = [ "arch", "debian-11", @@ -154,11 +169,13 @@ SALT_VERSIONS = [ "3005", "master", "latest", + "nightly", ] ONEDIR_SALT_VERSIONS = [ "3005", "latest", + "nightly", ] VERSION_DISPLAY_NAMES = { @@ -167,10 +184,16 @@ VERSION_DISPLAY_NAMES = { "3005": "v3005", "master": "Master", "latest": "Latest", + "nightly": "Nightly", } STABLE_VERSION_BLACKLIST = [ "master", + "nightly", +] + +GIT_VERSION_BLACKLIST = [ + "nightly", ] LATEST_PKG_BLACKLIST = [] @@ -415,6 +438,8 @@ def generate_test_jobs(): if bootstrap_type == "onedir": if salt_version not in ONEDIR_SALT_VERSIONS: continue + if distro not in ONEDIR_DISTROS: + continue if bootstrap_type == "stable": if salt_version in STABLE_VERSION_BLACKLIST: @@ -426,6 +451,10 @@ def generate_test_jobs(): # Fedora does not keep old builds around continue + if bootstrap_type == "git": + if salt_version in GIT_VERSION_BLACKLIST: + continue + BLACKLIST = { "3003": BLACKLIST_3003, "3004": BLACKLIST_3004, From c327961f2ab76f35f2239cdebd5a150824b81dca Mon Sep 17 00:00:00 2001 From: "Gareth J. Greenaway" Date: Thu, 8 Dec 2022 11:54:33 -0800 Subject: [PATCH 041/104] removing references that might indicate that Ubuntu 16.04 might be supported by the bootstrap script. --- README.rst | 6 +----- bootstrap-salt.sh | 2 +- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/README.rst b/README.rst index aa798dd..e2dc40a 100644 --- a/README.rst +++ b/README.rst @@ -193,7 +193,7 @@ To view the latest options and descriptions for ``salt-bootstrap``, use ``-h`` a -q Quiet salt installation from git (setup.py install -q) -x Changes the Python version used to install Salt. For CentOS 6 git installations python2.7 is supported. - Fedora git installation, CentOS 7, Debian 9, Ubuntu 16.04 and 18.04 support python3. + Fedora git installation, CentOS 7, Ubuntu 18.04 support python3. -y Installs a different python version on host. Currently this has only been tested with CentOS 6 and is considered experimental. This will install the ius repo on the box if disable repo is false. This must be used in conjunction @@ -488,7 +488,6 @@ Ubuntu and derivatives - KDE neon (based on Ubuntu 18.04) - Linux Mint 17/18 -- Ubuntu 14.04/16.04/18.04 and subsequent non-LTS releases (see below) Ubuntu Best Effort Support: Non-LTS Releases ******************************************** @@ -563,12 +562,9 @@ Some distributions support installing Salt to use Python 3 instead of Python 2. this offering, while limited, is as follows: - CentOS 7 -- Centos 8 -- Debian 9 - Debian 10 - Debian 11 - Fedora (only git installations) -- Ubuntu 16.04 - Ubuntu 18.04 - Ubuntu 20.04 diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh index 625fa3e..a6662fb 100755 --- a/bootstrap-salt.sh +++ b/bootstrap-salt.sh @@ -405,7 +405,7 @@ __usage() { implemented for SUSE. -x Changes the Python version used to install Salt. For CentOS 6 git installations python2.7 is supported. - Fedora git installation, CentOS 7, Debian 9, Ubuntu 16.04 and 18.04 support python3. + Fedora git installation, CentOS 7, Ubuntu 18.04 support python3. -X Do not start daemons after installation -y Installs a different python version on host. Currently this has only been tested with CentOS 6 and is considered experimental. This will install the From efb45ff7bff79bf03d28d7c8afd77eab0dac9cf7 Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Sun, 19 Jun 2022 20:42:57 +0100 Subject: [PATCH 042/104] refactor(salt-bootstrap): use virtual `pyzmq` package on Tumbleweed --- bootstrap-salt.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh index 625fa3e..312bf16 100755 --- a/bootstrap-salt.sh +++ b/bootstrap-salt.sh @@ -7242,7 +7242,7 @@ install_opensuse_git_deps() { fi # Check for Tumbleweed elif [ "${DISTRO_MAJOR_VERSION}" -ge 20210101 ]; then - __PACKAGES="python3-pip gcc-c++ python310-pyzmq-devel" + __PACKAGES="python3-pip gcc-c++ python3-pyzmq-devel" else __PACKAGES="python-pip python-setuptools gcc" fi From 9cd72ffb3bfb25b17283478eaa81434a594d90ef Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Fri, 9 Dec 2022 06:28:15 +0000 Subject: [PATCH 043/104] fix(salt-bootstrap): use correct installation type in error messages --- bootstrap-salt.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh index 312bf16..02790b4 100755 --- a/bootstrap-salt.sh +++ b/bootstrap-salt.sh @@ -649,7 +649,7 @@ elif [ "$ITYPE" = "onedir" ]; then ONEDIR_REV="minor/$1" shift else - echo "Unknown stable version: $1 (valid: 3005, latest, nightly.)" + echo "Unknown onedir version: $1 (valid: 3005, latest, nightly.)" exit 1 fi fi @@ -673,7 +673,7 @@ elif [ "$ITYPE" = "onedir_rc" ]; then ONEDIR_REV="minor/$1" shift else - echo "Unknown stable version: $1 (valid: 3005-1, latest.)" + echo "Unknown onedir_rc version: $1 (valid: 3005-1, latest.)" exit 1 fi fi From e8b4966e1d6921c8b88b4f9b2ea9ed9db7a683ab Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Tue, 21 Jun 2022 20:36:58 +0100 Subject: [PATCH 044/104] ci(fedora-37): add platform --- .github/workflows/ci.yml | 15 +++++++++++++++ .github/workflows/templates/generate.py | 9 +++++++++ kitchen.yml | 3 +++ 3 files changed, 27 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index baa80b0..9ef4320 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -364,6 +364,20 @@ jobs: instances: '["git-master", "latest"]' + fedora-37: + name: Fedora 37 + 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: fedora-37 + display-name: Fedora 37 + timeout: 20 + instances: '["git-master", "latest"]' + + gentoo: name: Gentoo if: github.event_name == 'push' @@ -529,6 +543,7 @@ jobs: - debian-11 - fedora-35 - fedora-36 + - fedora-37 - gentoo - gentoo-systemd - opensuse-15 diff --git a/.github/workflows/templates/generate.py b/.github/workflows/templates/generate.py index 81ab8b7..19a780f 100755 --- a/.github/workflows/templates/generate.py +++ b/.github/workflows/templates/generate.py @@ -17,6 +17,7 @@ LINUX_DISTROS = [ "debian-11", "fedora-35", "fedora-36", + "fedora-37", "gentoo", "gentoo-systemd", "opensuse-15", @@ -54,6 +55,7 @@ STABLE_DISTROS = [ "debian-11", "fedora-35", "fedora-36", + "fedora-37", "gentoo", "gentoo-systemd", "opensuse-15", @@ -86,6 +88,7 @@ BLACKLIST_3003 = [ "debian-11", "fedora-35", "fedora-36", + "fedora-37", "gentoo", "gentoo-systemd", "opensuse-15", @@ -101,6 +104,7 @@ BLACKLIST_GIT_3003 = [ "debian-11", "fedora-35", "fedora-36", + "fedora-37", "gentoo", "gentoo-systemd", "opensuse-15", @@ -115,6 +119,7 @@ BLACKLIST_3004 = [ "arch", "fedora-35", "fedora-36", + "fedora-37", "gentoo", "gentoo-systemd", "opensuse-15", @@ -125,6 +130,7 @@ BLACKLIST_3005 = [ "arch", "fedora-35", "fedora-36", + "fedora-37", "gentoo", "gentoo-systemd", "opensuse-15", @@ -138,6 +144,7 @@ BLACKLIST_GIT_3004 = [ "debian-11", "fedora-35", "fedora-36", + "fedora-37", "gentoo", "gentoo-systemd", "opensuse-15", @@ -154,6 +161,7 @@ BLACKLIST_GIT_3005 = [ "debian-11", "fedora-35", "fedora-36", + "fedora-37", "gentoo", "gentoo-systemd", "opensuse-15", @@ -208,6 +216,7 @@ DISTRO_DISPLAY_NAMES = { "debian-11": "Debian 11", "fedora-35": "Fedora 35", "fedora-36": "Fedora 36", + "fedora-37": "Fedora 37", "gentoo": "Gentoo", "gentoo-systemd": "Gentoo (systemd)", "opensuse-15": "Opensuse 15", diff --git a/kitchen.yml b/kitchen.yml index 60a105a..37e9ddc 100644 --- a/kitchen.yml +++ b/kitchen.yml @@ -65,6 +65,9 @@ platforms: - name: fedora-36 driver: provision_command: *fedora_provision_command + - name: fedora-37 + driver: + provision_command: *fedora_provision_command - name: gentoo driver: image: gentoo/stage3:latest From 4f8fa0bf456da12f79215231b5de8c1488767e88 Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Fri, 9 Dec 2022 06:33:08 +0000 Subject: [PATCH 045/104] ci(fedora-38): add platform --- .github/workflows/ci.yml | 15 +++++++++++++++ .github/workflows/templates/generate.py | 9 +++++++++ kitchen.yml | 3 +++ 3 files changed, 27 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 9ef4320..e1b50cc 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -378,6 +378,20 @@ jobs: instances: '["git-master", "latest"]' + fedora-38: + name: Fedora 38 + 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: fedora-38 + display-name: Fedora 38 + timeout: 20 + instances: '["git-master", "latest"]' + + gentoo: name: Gentoo if: github.event_name == 'push' @@ -544,6 +558,7 @@ jobs: - fedora-35 - fedora-36 - fedora-37 + - fedora-38 - gentoo - gentoo-systemd - opensuse-15 diff --git a/.github/workflows/templates/generate.py b/.github/workflows/templates/generate.py index 19a780f..6d34d00 100755 --- a/.github/workflows/templates/generate.py +++ b/.github/workflows/templates/generate.py @@ -18,6 +18,7 @@ LINUX_DISTROS = [ "fedora-35", "fedora-36", "fedora-37", + "fedora-38", "gentoo", "gentoo-systemd", "opensuse-15", @@ -56,6 +57,7 @@ STABLE_DISTROS = [ "fedora-35", "fedora-36", "fedora-37", + "fedora-38", "gentoo", "gentoo-systemd", "opensuse-15", @@ -89,6 +91,7 @@ BLACKLIST_3003 = [ "fedora-35", "fedora-36", "fedora-37", + "fedora-38", "gentoo", "gentoo-systemd", "opensuse-15", @@ -105,6 +108,7 @@ BLACKLIST_GIT_3003 = [ "fedora-35", "fedora-36", "fedora-37", + "fedora-38", "gentoo", "gentoo-systemd", "opensuse-15", @@ -120,6 +124,7 @@ BLACKLIST_3004 = [ "fedora-35", "fedora-36", "fedora-37", + "fedora-38", "gentoo", "gentoo-systemd", "opensuse-15", @@ -131,6 +136,7 @@ BLACKLIST_3005 = [ "fedora-35", "fedora-36", "fedora-37", + "fedora-38", "gentoo", "gentoo-systemd", "opensuse-15", @@ -145,6 +151,7 @@ BLACKLIST_GIT_3004 = [ "fedora-35", "fedora-36", "fedora-37", + "fedora-38", "gentoo", "gentoo-systemd", "opensuse-15", @@ -162,6 +169,7 @@ BLACKLIST_GIT_3005 = [ "fedora-35", "fedora-36", "fedora-37", + "fedora-38", "gentoo", "gentoo-systemd", "opensuse-15", @@ -217,6 +225,7 @@ DISTRO_DISPLAY_NAMES = { "fedora-35": "Fedora 35", "fedora-36": "Fedora 36", "fedora-37": "Fedora 37", + "fedora-38": "Fedora 38", "gentoo": "Gentoo", "gentoo-systemd": "Gentoo (systemd)", "opensuse-15": "Opensuse 15", diff --git a/kitchen.yml b/kitchen.yml index 37e9ddc..1d5a7c0 100644 --- a/kitchen.yml +++ b/kitchen.yml @@ -68,6 +68,9 @@ platforms: - name: fedora-37 driver: provision_command: *fedora_provision_command + - name: fedora-38 + driver: + provision_command: *fedora_provision_command - name: gentoo driver: image: gentoo/stage3:latest From 705dc7b801a859b8067c9fd5df067af3c495b3e1 Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Fri, 9 Dec 2022 06:45:59 +0000 Subject: [PATCH 046/104] feat(generate): use temp. workaround to avoid `git` builds on Fedora 37+ --- .github/workflows/ci.yml | 4 ++-- .github/workflows/templates/generate.py | 15 +++++++++++++++ 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e1b50cc..dd48aba 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -375,7 +375,7 @@ jobs: distro-slug: fedora-37 display-name: Fedora 37 timeout: 20 - instances: '["git-master", "latest"]' + instances: '["latest"]' fedora-38: @@ -389,7 +389,7 @@ jobs: distro-slug: fedora-38 display-name: Fedora 38 timeout: 20 - instances: '["git-master", "latest"]' + instances: '["latest"]' gentoo: diff --git a/.github/workflows/templates/generate.py b/.github/workflows/templates/generate.py index 6d34d00..4f25e32 100755 --- a/.github/workflows/templates/generate.py +++ b/.github/workflows/templates/generate.py @@ -212,6 +212,19 @@ GIT_VERSION_BLACKLIST = [ "nightly", ] +# TODO: Revert the commit relating to this section, once the Git-based builds +# have been fixed for the distros listed below +# +# Apparent failure is: +# +# /usr/lib/python3.11/site-packages/setuptools/command/install.py:34: +# SetuptoolsDeprecationWarning: setup.py install is deprecated. +# Use build and pip and other standards-based tools. +GIT_DISTRO_BLACKLIST = [ + "fedora-37", + "fedora-38", +] + LATEST_PKG_BLACKLIST = [] DISTRO_DISPLAY_NAMES = { @@ -472,6 +485,8 @@ def generate_test_jobs(): if bootstrap_type == "git": if salt_version in GIT_VERSION_BLACKLIST: continue + if distro in GIT_DISTRO_BLACKLIST: + continue BLACKLIST = { "3003": BLACKLIST_3003, From 02034112eafaf8ac35120ab33bd73a4619c13d14 Mon Sep 17 00:00:00 2001 From: "Gareth J. Greenaway" Date: Fri, 9 Dec 2022 17:01:57 -0800 Subject: [PATCH 047/104] Use amd64 repos for anything older than Debian 11 since the packages are arch-indepedant --- bootstrap-salt.sh | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh index 625fa3e..3e8b80e 100755 --- a/bootstrap-salt.sh +++ b/bootstrap-salt.sh @@ -1442,9 +1442,13 @@ __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 does not yet have arm64 metadata, - # use arm64 repositories on arm64, since all pkgs are arch-independent - __REPO_ARCH="arm64" + # Saltstack official repository has arm64 metadata beginning with Debian 11, + # 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 + __REPO_ARCH="amd64" + else + __REPO_ARCH="arm64" + fi __REPO_ARCH_DEB="deb [signed-by=/usr/share/keyrings/salt-archive-keyring.gpg arch=$__REPO_ARCH]" warn_msg="Support for arm64 packages is experimental and might rely on architecture-independent packages from the amd64 repository." fi From 294096c2485b541985f731fe013a4a1b836874dd Mon Sep 17 00:00:00 2001 From: Shom Bandopadhaya Date: Sat, 10 Dec 2022 13:27:23 -0600 Subject: [PATCH 048/104] Added Pop!_OS as a Ubuntu derivative Only added 22 as a variant of Ubuntu 22.04 since that's all I can test, other versions should work equally well. --- bootstrap-salt.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh index 02790b4..da858ac 100755 --- a/bootstrap-salt.sh +++ b/bootstrap-salt.sh @@ -1370,7 +1370,7 @@ __gather_system_info() { #---------------------------------------------------------------------------------------------------------------------- # shellcheck disable=SC2034 __ubuntu_derivatives_translation() { - UBUNTU_DERIVATIVES="(trisquel|linuxmint|linaro|elementary_os|neon)" + UBUNTU_DERIVATIVES="(trisquel|linuxmint|linaro|elementary_os|neon|pop)" # Mappings trisquel_6_ubuntu_base="12.04" linuxmint_13_ubuntu_base="12.04" @@ -1383,6 +1383,7 @@ __ubuntu_derivatives_translation() { neon_16_ubuntu_base="16.04" neon_18_ubuntu_base="18.04" neon_20_ubuntu_base="20.04" + pop_22_ubuntu_base="22.04" # Translate Ubuntu derivatives to their base Ubuntu version match=$(echo "$DISTRO_NAME_L" | grep -E ${UBUNTU_DERIVATIVES}) From 80f6059d12e9bcafd676496a633f28c4b002a252 Mon Sep 17 00:00:00 2001 From: "Gareth J. Greenaway" Date: Wed, 14 Dec 2022 12:19:14 -0800 Subject: [PATCH 049/104] Adding newer versions of CentOS Stream, AlmaLinux, and Rocky Linux --- .github/workflows/ci.yml | 45 +++++++++++++++++++++++++ .github/workflows/templates/generate.py | 21 ++++++++++++ 2 files changed, 66 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index dd48aba..9c292ba 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -252,6 +252,20 @@ jobs: instances: '["stable-3003", "git-3003", "stable-3004", "git-3004", "stable-3005", "git-3005", "onedir-3005", "git-master", "latest", "onedir-nightly"]' + almalinux-9: + name: AlmaLinux 9 + 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: almalinux-9 + display-name: AlmaLinux 9 + timeout: 20 + instances: '["git-3005", "onedir-3005", "git-master", "latest", "onedir-nightly"]' + + amazon-2: name: Amazon 2 if: github.event_name == 'push' || needs.collect-changed-files.outputs.run-tests == 'true' @@ -308,6 +322,20 @@ jobs: instances: '["stable-3003", "git-3003", "stable-3004", "git-3004", "stable-3005", "git-3005", "onedir-3005", "git-master", "latest", "onedir-nightly"]' + centos-stream9: + name: CentOS Stream 9 + 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: centos-stream9 + display-name: CentOS Stream 9 + timeout: 20 + instances: '["git-3005", "onedir-3005", "git-master", "latest", "onedir-nightly"]' + + debian-10: name: Debian 10 if: github.event_name == 'push' || needs.collect-changed-files.outputs.run-tests == 'true' @@ -490,6 +518,20 @@ jobs: instances: '["stable-3004", "git-3004", "stable-3005", "git-3005", "onedir-3005", "git-master", "latest", "onedir-nightly"]' + rockylinux-9: + name: Rocky Linux 9 + 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: rockylinux-9 + display-name: Rocky Linux 9 + timeout: 20 + instances: '["git-3005", "onedir-3005", "git-master", "latest", "onedir-nightly"]' + + ubuntu-1804: name: Ubuntu 18.04 if: github.event_name == 'push' || needs.collect-changed-files.outputs.run-tests == 'true' @@ -549,10 +591,12 @@ jobs: - windows-2019 - windows-2022 - almalinux-8 + - almalinux-9 - amazon-2 - arch - centos-7 - centos-stream8 + - centos-stream9 - debian-10 - debian-11 - fedora-35 @@ -566,6 +610,7 @@ jobs: - oraclelinux-7 - oraclelinux-8 - rockylinux-8 + - rockylinux-9 - ubuntu-1804 - ubuntu-2004 - ubuntu-2204 diff --git a/.github/workflows/templates/generate.py b/.github/workflows/templates/generate.py index 4f25e32..0f2f053 100755 --- a/.github/workflows/templates/generate.py +++ b/.github/workflows/templates/generate.py @@ -9,10 +9,12 @@ os.chdir(os.path.abspath(os.path.dirname(__file__))) LINUX_DISTROS = [ "almalinux-8", + "almalinux-9", "amazon-2", "arch", "centos-7", "centos-stream8", + "centos-stream9", "debian-10", "debian-11", "fedora-35", @@ -26,6 +28,7 @@ LINUX_DISTROS = [ "oraclelinux-7", "oraclelinux-8", "rockylinux-8", + "rockylinux-9", "ubuntu-1804", "ubuntu-2004", "ubuntu-2204", @@ -72,21 +75,26 @@ STABLE_DISTROS = [ ONEDIR_DISTROS = [ "almalinux-8", + "almalinux-9", "amazon-2", "centos-7", "centos-stream8", + "centos-stream9", "debian-10", "debian-11", "oraclelinux-7", "oraclelinux-8", "rockylinux-8", + "rockylinux-9", "ubuntu-1804", "ubuntu-2004", "ubuntu-2204", ] BLACKLIST_3003 = [ + "almalinux-9", "arch", + "centos-stream9", "debian-11", "fedora-35", "fedora-36", @@ -97,12 +105,15 @@ BLACKLIST_3003 = [ "opensuse-15", "opensuse-tumbleweed", "rockylinux-8", + "rockylinux-9", "ubuntu-2204", ] BLACKLIST_GIT_3003 = [ + "almalinux-9", "amazon-2", "arch", + "centos-stream9", "debian-10", "debian-11", "fedora-35", @@ -114,13 +125,16 @@ BLACKLIST_GIT_3003 = [ "opensuse-15", "opensuse-tumbleweed", "rockylinux-8", + "rockylinux-9", "ubuntu-2004", "ubuntu-2110", "ubuntu-2204", ] BLACKLIST_3004 = [ + "almalinux-9", "arch", + "centos-stream9", "fedora-35", "fedora-36", "fedora-37", @@ -129,6 +143,7 @@ BLACKLIST_3004 = [ "gentoo-systemd", "opensuse-15", "opensuse-tumbleweed", + "rockylinux-9", ] BLACKLIST_3005 = [ @@ -144,8 +159,10 @@ BLACKLIST_3005 = [ ] BLACKLIST_GIT_3004 = [ + "almalinux-9", "amazon-2", "arch", + "centos-stream9", "debian-10", "debian-11", "fedora-35", @@ -159,6 +176,7 @@ BLACKLIST_GIT_3004 = [ "ubuntu-2004", "ubuntu-2110", "ubuntu-2204", + "rockylinux-9", ] BLACKLIST_GIT_3005 = [ @@ -229,10 +247,12 @@ LATEST_PKG_BLACKLIST = [] DISTRO_DISPLAY_NAMES = { "almalinux-8": "AlmaLinux 8", + "almalinux-9": "AlmaLinux 9", "amazon-2": "Amazon 2", "arch": "Arch", "centos-7": "CentOS 7", "centos-stream8": "CentOS Stream 8", + "centos-stream9": "CentOS Stream 9", "debian-10": "Debian 10", "debian-11": "Debian 11", "fedora-35": "Fedora 35", @@ -246,6 +266,7 @@ DISTRO_DISPLAY_NAMES = { "oraclelinux-7": "Oracle Linux 7", "oraclelinux-8": "Oracle Linux 8", "rockylinux-8": "Rocky Linux 8", + "rockylinux-9": "Rocky Linux 9", "ubuntu-1804": "Ubuntu 18.04", "ubuntu-2004": "Ubuntu 20.04", "ubuntu-2204": "Ubuntu 22.04", From 59ffb10a717541547ae4a0e7c88189ec2337b6a2 Mon Sep 17 00:00:00 2001 From: "Gareth J. Greenaway" Date: Wed, 14 Dec 2022 11:11:10 -0800 Subject: [PATCH 050/104] Classic packages, done via stable install type, is no longer supported on later versions of Ubuntu, Debian, and Red Hat variants. If the bootstrap script is run with stable type on those systems, log an error and exit. --- bootstrap-salt.sh | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh index 21f847b..d45034b 100755 --- a/bootstrap-salt.sh +++ b/bootstrap-salt.sh @@ -1829,6 +1829,24 @@ else fi fi +i# Red Hat variants after 9.x not supported by stable type +if [ "$(echo "${DISTRO_NAME_L}" | grep -E '(centos|red_hat|scientific|almalinux|rocky)')" != "" ] && [ "$ITYPE" = "stable" ] && [ "$DISTRO_MAJOR_VERSION" -ge 9 ]; then + echoerror "${DISTRO_NAME} ${DISTRO_VERSION} not supported by stable type, use type onedir." + exit 1 +fi + +# Debian after 11.x not supported by stable type +if [ "$(echo "${DISTRO_NAME_L}" | grep -E '(debian)')" != "" ] && [ "$ITYPE" = "stable" ] && [ "$DISTRO_MAJOR_VERSION" -ge 11 ]; then + echoerror "${DISTRO_NAME} ${DISTRO_VERSION} not supported by stable type, use type onedir." + exit 1 +fi + +# Ubuntu after 22.x not supported by stable type +if [ "$(echo "${DISTRO_NAME_L}" | grep -E '(ubuntu)')" != "" ] && [ "$ITYPE" = "stable" ] && [ "$DISTRO_MAJOR_VERSION" -ge 22 ]; then + echoerror "${DISTRO_NAME} ${DISTRO_VERSION} not supported by stable type, use type onedir." + exit 1 +fi + # For Ubuntu derivatives, pretend to be their Ubuntu base version __ubuntu_derivatives_translation From d29943132673aa4e6cda74f5fb516f25a7778d32 Mon Sep 17 00:00:00 2001 From: "Gareth J. Greenaway" Date: Wed, 14 Dec 2022 11:19:55 -0800 Subject: [PATCH 051/104] removing debian 11. --- bootstrap-salt.sh | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh index d45034b..f29d872 100755 --- a/bootstrap-salt.sh +++ b/bootstrap-salt.sh @@ -1829,18 +1829,12 @@ else fi fi -i# Red Hat variants after 9.x not supported by stable type +# Red Hat variants after 9.x not supported by stable type if [ "$(echo "${DISTRO_NAME_L}" | grep -E '(centos|red_hat|scientific|almalinux|rocky)')" != "" ] && [ "$ITYPE" = "stable" ] && [ "$DISTRO_MAJOR_VERSION" -ge 9 ]; then echoerror "${DISTRO_NAME} ${DISTRO_VERSION} not supported by stable type, use type onedir." exit 1 fi -# Debian after 11.x not supported by stable type -if [ "$(echo "${DISTRO_NAME_L}" | grep -E '(debian)')" != "" ] && [ "$ITYPE" = "stable" ] && [ "$DISTRO_MAJOR_VERSION" -ge 11 ]; then - echoerror "${DISTRO_NAME} ${DISTRO_VERSION} not supported by stable type, use type onedir." - exit 1 -fi - # Ubuntu after 22.x not supported by stable type if [ "$(echo "${DISTRO_NAME_L}" | grep -E '(ubuntu)')" != "" ] && [ "$ITYPE" = "stable" ] && [ "$DISTRO_MAJOR_VERSION" -ge 22 ]; then echoerror "${DISTRO_NAME} ${DISTRO_VERSION} not supported by stable type, use type onedir." From 156120e4da21c67b2df79d0d7ae22222957e5fe1 Mon Sep 17 00:00:00 2001 From: "Gareth J. Greenaway" Date: Wed, 14 Dec 2022 12:09:31 -0800 Subject: [PATCH 052/104] Do not need check for Ubuntu. Workaround already in place to use older 20.04 packages for stable. --- bootstrap-salt.sh | 6 ------ 1 file changed, 6 deletions(-) diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh index f29d872..21deddb 100755 --- a/bootstrap-salt.sh +++ b/bootstrap-salt.sh @@ -1835,12 +1835,6 @@ if [ "$(echo "${DISTRO_NAME_L}" | grep -E '(centos|red_hat|scientific|almalinux| exit 1 fi -# Ubuntu after 22.x not supported by stable type -if [ "$(echo "${DISTRO_NAME_L}" | grep -E '(ubuntu)')" != "" ] && [ "$ITYPE" = "stable" ] && [ "$DISTRO_MAJOR_VERSION" -ge 22 ]; then - echoerror "${DISTRO_NAME} ${DISTRO_VERSION} not supported by stable type, use type onedir." - exit 1 -fi - # For Ubuntu derivatives, pretend to be their Ubuntu base version __ubuntu_derivatives_translation From b9bc07ac0667126024dce88180a9b18ff9a702c9 Mon Sep 17 00:00:00 2001 From: "Gareth J. Greenaway" Date: Mon, 19 Dec 2022 12:39:55 -0800 Subject: [PATCH 053/104] Adding entries to kitchen.yml --- kitchen.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/kitchen.yml b/kitchen.yml index 1d5a7c0..829a146 100644 --- a/kitchen.yml +++ b/kitchen.yml @@ -29,6 +29,7 @@ provisioner: sh -c 't=$(shuf -i 1-15 -n 1); echo Sleeping $t seconds; sleep $t' platforms: + - name: almalinux-9 - name: almalinux-8 - name: amazon-2 driver: @@ -43,6 +44,9 @@ platforms: - pacman -Syu --noconfirm --needed systemd grep awk procps which - systemctl enable sshd - echo "PubkeyAcceptedAlgorithms +ssh-rsa" | tee -a /etc/ssh/sshd_config + - name: centos-stream9 + driver: + image: quay.io/centos/centos:stream8 - name: centos-stream8 driver: image: quay.io/centos/centos:stream8 @@ -103,6 +107,7 @@ platforms: - name: oraclelinux-8 - name: oraclelinux-7 - name: rockylinux-8 + - name: rockylinux-9 - name: ubuntu-22.04 driver: run_command: /lib/systemd/systemd From ffef0b1746ef295432e0e0dbcae2e62cd44888e5 Mon Sep 17 00:00:00 2001 From: "Gareth J. Greenaway" Date: Tue, 20 Dec 2022 08:12:52 -0800 Subject: [PATCH 054/104] Need ssh-rsa for RockyLinux 9. --- kitchen.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/kitchen.yml b/kitchen.yml index 829a146..76dd785 100644 --- a/kitchen.yml +++ b/kitchen.yml @@ -108,6 +108,10 @@ platforms: - name: oraclelinux-7 - name: rockylinux-8 - name: rockylinux-9 + driver: + run_command: /usr/lib/systemd/systemd + provision_command: + - echo "PubkeyAcceptedAlgorithms +ssh-rsa" | tee -a /etc/ssh/sshd_config - name: ubuntu-22.04 driver: run_command: /lib/systemd/systemd From 7cfca56c17053466483e3bab65b4932aa8bab4a6 Mon Sep 17 00:00:00 2001 From: "Gareth J. Greenaway" Date: Tue, 20 Dec 2022 11:56:11 -0800 Subject: [PATCH 055/104] need to install and run update-crypto-policies to allow RSA keys to work via SSH on RockLinux and Almalinux. --- kitchen.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/kitchen.yml b/kitchen.yml index 76dd785..7a9cc2f 100644 --- a/kitchen.yml +++ b/kitchen.yml @@ -30,6 +30,10 @@ provisioner: platforms: - name: almalinux-9 + provision_command: + - dnf -y install crypto-policies-scripts + - update-crypto-policies --set DEFAULT:SHA1 + - echo "PubkeyAcceptedAlgorithms +ssh-rsa" | tee -a /etc/ssh/sshd_config - name: almalinux-8 - name: amazon-2 driver: @@ -111,6 +115,8 @@ platforms: driver: run_command: /usr/lib/systemd/systemd provision_command: + - dnf -y install crypto-policies-scripts + - update-crypto-policies --set DEFAULT:SHA1 - echo "PubkeyAcceptedAlgorithms +ssh-rsa" | tee -a /etc/ssh/sshd_config - name: ubuntu-22.04 driver: From 2c4d317b5181fd9d4437c8d54c3b5b8b30a56c7e Mon Sep 17 00:00:00 2001 From: "Gareth J. Greenaway" Date: Tue, 20 Dec 2022 12:18:10 -0800 Subject: [PATCH 056/104] fixing YAML. --- kitchen.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/kitchen.yml b/kitchen.yml index 7a9cc2f..e95892b 100644 --- a/kitchen.yml +++ b/kitchen.yml @@ -30,6 +30,7 @@ provisioner: platforms: - name: almalinux-9 + driver: provision_command: - dnf -y install crypto-policies-scripts - update-crypto-policies --set DEFAULT:SHA1 From aeb74bc8659edff7f1583a8d0539f80608a34e93 Mon Sep 17 00:00:00 2001 From: "Gareth J. Greenaway" Date: Tue, 20 Dec 2022 13:37:41 -0800 Subject: [PATCH 057/104] Need procps-ng on Almalinux 9 and Rockylinux 9 --- kitchen.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/kitchen.yml b/kitchen.yml index e95892b..46f89b7 100644 --- a/kitchen.yml +++ b/kitchen.yml @@ -32,7 +32,7 @@ platforms: - name: almalinux-9 driver: provision_command: - - dnf -y install crypto-policies-scripts + - dnf -y install crypto-policies-scripts procps-nf - update-crypto-policies --set DEFAULT:SHA1 - echo "PubkeyAcceptedAlgorithms +ssh-rsa" | tee -a /etc/ssh/sshd_config - name: almalinux-8 @@ -116,7 +116,7 @@ platforms: driver: run_command: /usr/lib/systemd/systemd provision_command: - - dnf -y install crypto-policies-scripts + - dnf -y install crypto-policies-scripts procps-ng - update-crypto-policies --set DEFAULT:SHA1 - echo "PubkeyAcceptedAlgorithms +ssh-rsa" | tee -a /etc/ssh/sshd_config - name: ubuntu-22.04 From b6328e2b4b2093f5b9b18781bc3f62a794067ad7 Mon Sep 17 00:00:00 2001 From: "Gareth J. Greenaway" Date: Tue, 20 Dec 2022 14:25:58 -0800 Subject: [PATCH 058/104] fixing typo. procps-ng instead of procps-nf. --- kitchen.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kitchen.yml b/kitchen.yml index 46f89b7..6dd016b 100644 --- a/kitchen.yml +++ b/kitchen.yml @@ -32,7 +32,7 @@ platforms: - name: almalinux-9 driver: provision_command: - - dnf -y install crypto-policies-scripts procps-nf + - dnf -y install crypto-policies-scripts procps-ng - update-crypto-policies --set DEFAULT:SHA1 - echo "PubkeyAcceptedAlgorithms +ssh-rsa" | tee -a /etc/ssh/sshd_config - name: almalinux-8 From 7e53753536e290414f5121270e0f6b309bd6be96 Mon Sep 17 00:00:00 2001 From: "Gareth J. Greenaway" Date: Tue, 20 Dec 2022 16:53:09 -0800 Subject: [PATCH 059/104] blacklist almalinux-9, rockylinux-9, and centos-stream9 for latest. --- .github/workflows/ci.yml | 6 +++--- .github/workflows/templates/generate.py | 6 +++++- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 9c292ba..e234f9f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -263,7 +263,7 @@ jobs: distro-slug: almalinux-9 display-name: AlmaLinux 9 timeout: 20 - instances: '["git-3005", "onedir-3005", "git-master", "latest", "onedir-nightly"]' + instances: '["git-3005", "onedir-3005", "git-master", "onedir-nightly"]' amazon-2: @@ -333,7 +333,7 @@ jobs: distro-slug: centos-stream9 display-name: CentOS Stream 9 timeout: 20 - instances: '["git-3005", "onedir-3005", "git-master", "latest", "onedir-nightly"]' + instances: '["git-3005", "onedir-3005", "git-master", "onedir-nightly"]' debian-10: @@ -529,7 +529,7 @@ jobs: distro-slug: rockylinux-9 display-name: Rocky Linux 9 timeout: 20 - instances: '["git-3005", "onedir-3005", "git-master", "latest", "onedir-nightly"]' + instances: '["git-3005", "onedir-3005", "git-master", "onedir-nightly"]' ubuntu-1804: diff --git a/.github/workflows/templates/generate.py b/.github/workflows/templates/generate.py index 0f2f053..342002b 100755 --- a/.github/workflows/templates/generate.py +++ b/.github/workflows/templates/generate.py @@ -243,7 +243,11 @@ GIT_DISTRO_BLACKLIST = [ "fedora-38", ] -LATEST_PKG_BLACKLIST = [] +LATEST_PKG_BLACKLIST = [ + "almalinux-9", + "centos-stream9", + "rockylinux-9", +] DISTRO_DISPLAY_NAMES = { "almalinux-8": "AlmaLinux 8", From 4779cc92ff1b739f0f00c96583834e42f7ef88cf Mon Sep 17 00:00:00 2001 From: "Gareth J. Greenaway" Date: Wed, 21 Dec 2022 09:47:22 -0800 Subject: [PATCH 060/104] when installing git_deps, fall back to onedir_deps if stable_deps fails. will happens if installing on a Red Hat based host, eg. CentOS Stream 9, Alma Linux 9, etc, as the classic package repos do not exist there. --- bootstrap-salt.sh | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh index 21f847b..6ba1da8 100755 --- a/bootstrap-salt.sh +++ b/bootstrap-salt.sh @@ -4617,7 +4617,12 @@ install_centos_stable_post() { } install_centos_git_deps() { - install_centos_stable_deps || return 1 + # First try stable deps then fall back to onedir deps if that one fails + # if we're installing on a Red Hat based host that doesn't have the classic + # package repos available. + install_centos_stable_deps || \ + install_centos_onedir_deps || \ + return 1 if [ "$_INSECURE_DL" -eq $BS_FALSE ] && [ "${_SALT_REPO_URL%%://*}" = "https" ]; then __yum_install_noinput ca-certificates || return 1 From ca683c6ac3cd98ea7c9f3e0b800b4d8a0ec066bb Mon Sep 17 00:00:00 2001 From: "Gareth J. Greenaway" Date: Wed, 21 Dec 2022 10:40:46 -0800 Subject: [PATCH 061/104] Set ONEDIR_REV incase we end up calling install_centos_onedir_deps. --- bootstrap-salt.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh index 6ba1da8..bfcdb6e 100755 --- a/bootstrap-salt.sh +++ b/bootstrap-salt.sh @@ -4620,6 +4620,9 @@ install_centos_git_deps() { # First try stable deps then fall back to onedir deps if that one fails # if we're installing on a Red Hat based host that doesn't have the classic # package repos available. + # Set ONEDIR_REV to STABLE_REV in case we + # end up calling install_centos_onedir_deps + ONEDIR_REV=${STABLE_REV} install_centos_stable_deps || \ install_centos_onedir_deps || \ return 1 From cc0e70ab802d7a566858318dc067dcd5e8759284 Mon Sep 17 00:00:00 2001 From: thilo Date: Mon, 16 Jan 2023 09:05:15 +0100 Subject: [PATCH 062/104] Add support for KDE neon based on Ubuntu 22.04 --- README.rst | 2 +- bootstrap-salt.sh | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/README.rst b/README.rst index aa798dd..f4eb852 100644 --- a/README.rst +++ b/README.rst @@ -486,7 +486,7 @@ in combination with the ``git`` installation method. Ubuntu and derivatives ~~~~~~~~~~~~~~~~~~~~~~ -- KDE neon (based on Ubuntu 18.04) +- KDE neon (based on Ubuntu 18.04/20.04/22.04) - Linux Mint 17/18 - Ubuntu 14.04/16.04/18.04 and subsequent non-LTS releases (see below) diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh index 21deddb..963eb2b 100755 --- a/bootstrap-salt.sh +++ b/bootstrap-salt.sh @@ -1383,6 +1383,7 @@ __ubuntu_derivatives_translation() { neon_16_ubuntu_base="16.04" neon_18_ubuntu_base="18.04" neon_20_ubuntu_base="20.04" + neon_22_ubuntu_base="22.04" pop_22_ubuntu_base="22.04" # Translate Ubuntu derivatives to their base Ubuntu version From 0280cde59ad29690b2dc8c6758b7d0c0c6746a67 Mon Sep 17 00:00:00 2001 From: "Gareth J. Greenaway" Date: Tue, 31 Jan 2023 14:24:23 -0800 Subject: [PATCH 063/104] bump the version of koalaman/shellcheck-alpine up --- .github/workflows/ci.yml | 2 +- .github/workflows/templates/ci.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e234f9f..34af654 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -93,7 +93,7 @@ jobs: name: Lint runs-on: ubuntu-latest needs: collect-changed-files - container: koalaman/shellcheck-alpine:v0.6.0 + container: koalaman/shellcheck-alpine:v0.7.0 if: github.event_name == 'push' || needs.collect-changed-files.outputs.run-tests == 'true' steps: - uses: actions/checkout@v3 diff --git a/.github/workflows/templates/ci.yml b/.github/workflows/templates/ci.yml index 96d3bb6..113c8ee 100644 --- a/.github/workflows/templates/ci.yml +++ b/.github/workflows/templates/ci.yml @@ -93,7 +93,7 @@ jobs: name: Lint runs-on: ubuntu-latest needs: collect-changed-files - container: koalaman/shellcheck-alpine:v0.6.0 + container: koalaman/shellcheck-alpine:v0.7.0 if: github.event_name == 'push' || needs.collect-changed-files.outputs.run-tests == 'true' steps: - uses: actions/checkout@v3 From 4eabf0aeb6b5bea2884cbfab64af4ec00acc8b90 Mon Sep 17 00:00:00 2001 From: "Gareth J. Greenaway" Date: Wed, 1 Feb 2023 18:52:13 -0800 Subject: [PATCH 064/104] account for different paths for the systemd service files in later versions. --- bootstrap-salt.sh | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh index d942c90..c46b12d 100755 --- a/bootstrap-salt.sh +++ b/bootstrap-salt.sh @@ -4791,10 +4791,16 @@ install_centos_git_post() { [ $fname = "minion" ] && [ "$_INSTALL_MINION" -eq $BS_FALSE ] && continue [ $fname = "syndic" ] && [ "$_INSTALL_SYNDIC" -eq $BS_FALSE ] && continue + # Account for new path for services files in later releases + if [ -f "${_SALT_GIT_CHECKOUT_DIR}/pkg/common/salt-${fname}.service" ]; then + _SERVICE_FILE="${_SALT_GIT_CHECKOUT_DIR}/pkg/common/salt-${fname}.service" + else + _SERVICE_FILE="${_SALT_GIT_CHECKOUT_DIR}/pkg/rpm/salt-${fname}.service" + fi if [ -f /bin/systemctl ]; then if [ ! -f "/usr/lib/systemd/system/salt-${fname}.service" ] || \ { [ -f "/usr/lib/systemd/system/salt-${fname}.service" ] && [ "$_FORCE_OVERWRITE" -eq $BS_TRUE ]; }; then - __copyfile "${_SALT_GIT_CHECKOUT_DIR}/pkg/rpm/salt-${fname}.service" /usr/lib/systemd/system + __copyfile "${_SERVICE_FILE}" /usr/lib/systemd/system fi SYSTEMD_RELOAD=$BS_TRUE From aea71469ec3d15d26be6b3bfe9c4b034a357ecc8 Mon Sep 17 00:00:00 2001 From: "Gareth J. Greenaway" Date: Thu, 2 Feb 2023 08:51:12 -0800 Subject: [PATCH 065/104] Account for new location for systemd and upstart files on Debian and Ubuntu. --- bootstrap-salt.sh | 28 +++++++++++++++++++++------- 1 file changed, 21 insertions(+), 7 deletions(-) diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh index c46b12d..ab21352 100755 --- a/bootstrap-salt.sh +++ b/bootstrap-salt.sh @@ -3402,8 +3402,15 @@ install_ubuntu_git_post() { [ $fname = "minion" ] && [ "$_INSTALL_MINION" -eq $BS_FALSE ] && continue [ $fname = "syndic" ] && [ "$_INSTALL_SYNDIC" -eq $BS_FALSE ] && continue + # Account for new path for services files in later releases + if [ -f "${_SALT_GIT_CHECKOUT_DIR}/pkg/common/salt-${fname}.service" ]; then + _SERVICE_DIR="${_SALT_GIT_CHECKOUT_DIR}/pkg/common" + else + _SERVICE_DIR="${_SALT_GIT_CHECKOUT_DIR}/pkg" + fi + if [ -f /bin/systemctl ] && [ "$DISTRO_MAJOR_VERSION" -ge 16 ]; then - __copyfile "${_SALT_GIT_CHECKOUT_DIR}/pkg/salt-${fname}.service" "/lib/systemd/system/salt-${fname}.service" + __copyfile "${_SERVICE_DIR}/salt-${fname}.service" "/lib/systemd/system/salt-${fname}.service" # Skip salt-api since the service should be opt-in and not necessarily started on boot [ $fname = "api" ] && continue @@ -3418,8 +3425,8 @@ install_ubuntu_git_post() { if [ ! -f $_upstart_conf ]; then # upstart does not know about our service, let's copy the proper file echowarn "Upstart does not appear to know about salt-$fname" - echodebug "Copying ${_SALT_GIT_CHECKOUT_DIR}/pkg/salt-$fname.upstart to $_upstart_conf" - __copyfile "${_SALT_GIT_CHECKOUT_DIR}/pkg/salt-${fname}.upstart" "$_upstart_conf" + echodebug "Copying ${_SERVICE_DIR}/salt-$fname.upstart to $_upstart_conf" + __copyfile "${_SERVICE_DIR}/salt-${fname}.upstart" "$_upstart_conf" # Set service to know about virtualenv if [ "${_VIRTUALENV_DIR}" != "null" ]; then echo "SALT_USE_VIRTUALENV=${_VIRTUALENV_DIR}" > /etc/default/salt-${fname} @@ -4014,16 +4021,23 @@ install_debian_git_post() { [ "$fname" = "minion" ] && [ "$_INSTALL_MINION" -eq $BS_FALSE ] && continue [ "$fname" = "syndic" ] && [ "$_INSTALL_SYNDIC" -eq $BS_FALSE ] && continue + # Account for new path for services files in later releases + if [ -f "${_SALT_GIT_CHECKOUT_DIR}/pkg/common/salt-${fname}.service" ]; then + _SERVICE_DIR="${_SALT_GIT_CHECKOUT_DIR}/pkg/common" + else + _SERVICE_DIR="${_SALT_GIT_CHECKOUT_DIR}/pkg" + fi + # Configure SystemD for Debian 8 "Jessie" and later if [ -f /bin/systemctl ]; then if [ ! -f /lib/systemd/system/salt-${fname}.service ] || \ { [ -f /lib/systemd/system/salt-${fname}.service ] && [ $_FORCE_OVERWRITE -eq $BS_TRUE ]; }; then - if [ -f "${_SALT_GIT_CHECKOUT_DIR}/pkg/salt-${fname}.service" ]; then - __copyfile "${_SALT_GIT_CHECKOUT_DIR}/pkg/salt-${fname}.service" /lib/systemd/system - __copyfile "${_SALT_GIT_CHECKOUT_DIR}/pkg/salt-${fname}.environment" "/etc/default/salt-${fname}" + if [ -f "${_SERVICE_DIR}/salt-${fname}.service" ]; then + __copyfile "${_SERVICE_DIR}/salt-${fname}.service" /lib/systemd/system + __copyfile "${_SERVICE_DIR}/salt-${fname}.environment" "/etc/default/salt-${fname}" else # workaround before adding Debian-specific unit files to the Salt main repo - __copyfile "${_SALT_GIT_CHECKOUT_DIR}/pkg/salt-${fname}.service" /lib/systemd/system + __copyfile "${_SERVICE_DIR}/salt-${fname}.service" /lib/systemd/system sed -i -e '/^Type/ s/notify/simple/' /lib/systemd/system/salt-${fname}.service fi fi From 84604ae7f97188ca7f1f4d880662b79a944b61b0 Mon Sep 17 00:00:00 2001 From: "Gareth J. Greenaway" Date: Thu, 2 Feb 2023 10:12:59 -0800 Subject: [PATCH 066/104] Account for new location for systemd files on Fedora. --- bootstrap-salt.sh | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh index ab21352..cc88f7a 100755 --- a/bootstrap-salt.sh +++ b/bootstrap-salt.sh @@ -4337,7 +4337,13 @@ install_fedora_git_post() { [ $fname = "minion" ] && [ "$_INSTALL_MINION" -eq $BS_FALSE ] && continue [ $fname = "syndic" ] && [ "$_INSTALL_SYNDIC" -eq $BS_FALSE ] && continue - __copyfile "${_SALT_GIT_CHECKOUT_DIR}/pkg/rpm/salt-${fname}.service" "/lib/systemd/system/salt-${fname}.service" + # Account for new path for services files in later releases + if [ -f "${_SALT_GIT_CHECKOUT_DIR}/pkg/common/salt-${fname}.service" ]; then + _SERVICE_DIR="${_SALT_GIT_CHECKOUT_DIR}/pkg/common" + else + _SERVICE_DIR="${_SALT_GIT_CHECKOUT_DIR}/pkg/rpm" + fi + __copyfile "${_SERVICE_DIR}/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 From 59da03a73c0c457e773fe2f63efbadd5253d47a8 Mon Sep 17 00:00:00 2001 From: "Gareth J. Greenaway" Date: Thu, 2 Feb 2023 10:20:50 -0800 Subject: [PATCH 067/104] Account for new location for systemd files on OpenSUSE. --- bootstrap-salt.sh | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh index cc88f7a..bcc9680 100755 --- a/bootstrap-salt.sh +++ b/bootstrap-salt.sh @@ -7380,10 +7380,17 @@ install_opensuse_git_post() { use_usr_lib=$BS_TRUE fi - if [ "${use_usr_lib}" -eq $BS_TRUE ]; then - __copyfile "${_SALT_GIT_CHECKOUT_DIR}/pkg/salt-${fname}.service" "/usr/lib/systemd/system/salt-${fname}.service" + # Account for new path for services files in later releases + if [ -f "${_SALT_GIT_CHECKOUT_DIR}/pkg/common/salt-${fname}.service" ]; then + _SERVICE_DIR="${_SALT_GIT_CHECKOUT_DIR}/pkg/common" else - __copyfile "${_SALT_GIT_CHECKOUT_DIR}/pkg/salt-${fname}.service" "/lib/systemd/system/salt-${fname}.service" + _SERVICE_DIR="${_SALT_GIT_CHECKOUT_DIR}/pkg/" + fi + + if [ "${use_usr_lib}" -eq $BS_TRUE ]; then + __copyfile "${_SERVICE_DIR}/salt-${fname}.service" "/usr/lib/systemd/system/salt-${fname}.service" + else + __copyfile "${_SERVICE_DIR}/salt-${fname}.service" "/lib/systemd/system/salt-${fname}.service" fi continue From 465ec9a8e9c18adc57790ccab026b0bd534670d7 Mon Sep 17 00:00:00 2001 From: "Gareth J. Greenaway" Date: Thu, 2 Feb 2023 10:24:12 -0800 Subject: [PATCH 068/104] Account for new location for systemd files on Arch. --- bootstrap-salt.sh | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh index bcc9680..d782ecc 100755 --- a/bootstrap-salt.sh +++ b/bootstrap-salt.sh @@ -6556,8 +6556,15 @@ install_arch_linux_git_post() { [ $fname = "minion" ] && [ "$_INSTALL_MINION" -eq $BS_FALSE ] && continue [ $fname = "syndic" ] && [ "$_INSTALL_SYNDIC" -eq $BS_FALSE ] && continue + # Account for new path for services files in later releases + if [ -f "${_SALT_GIT_CHECKOUT_DIR}/pkg/common/salt-${fname}.service" ]; then + _SERVICE_DIR="${_SALT_GIT_CHECKOUT_DIR}/pkg/common" + else + _SERVICE_DIR="${_SALT_GIT_CHECKOUT_DIR}/pkg/rpm" + fi + if [ -f /usr/bin/systemctl ]; then - __copyfile "${_SALT_GIT_CHECKOUT_DIR}/pkg/rpm/salt-${fname}.service" "/lib/systemd/system/salt-${fname}.service" + __copyfile "${_SERVICE_DIR}/salt-${fname}.service" "/lib/systemd/system/salt-${fname}.service" # Skip salt-api since the service should be opt-in and not necessarily started on boot [ $fname = "api" ] && continue From db46fb94e422ab3e98195721ad8c2c83eccec03d Mon Sep 17 00:00:00 2001 From: "Gareth J. Greenaway" Date: Thu, 2 Feb 2023 10:28:31 -0800 Subject: [PATCH 069/104] Account for new location for systemd files on Gentoo. --- bootstrap-salt.sh | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh index d782ecc..34267ef 100755 --- a/bootstrap-salt.sh +++ b/bootstrap-salt.sh @@ -8099,8 +8099,15 @@ install_gentoo_git_post() { [ $fname = "minion" ] && [ "$_INSTALL_MINION" -eq $BS_FALSE ] && continue [ $fname = "syndic" ] && [ "$_INSTALL_SYNDIC" -eq $BS_FALSE ] && continue + # Account for new path for services files in later releases + if [ -f "${_SALT_GIT_CHECKOUT_DIR}/pkg/common/salt-${fname}.service" ]; then + _SERVICE_DIR="${_SALT_GIT_CHECKOUT_DIR}/pkg/common" + else + _SERVICE_DIR="${_SALT_GIT_CHECKOUT_DIR}/pkg" + fi + if __check_command_exists systemctl ; then - __copyfile "${_SALT_GIT_CHECKOUT_DIR}/pkg/salt-${fname}.service" "/lib/systemd/system/salt-${fname}.service" + __copyfile "${_SERVICE_DIR}/salt-${fname}.service" "/lib/systemd/system/salt-${fname}.service" # Skip salt-api since the service should be opt-in and not necessarily started on boot [ $fname = "api" ] && continue From 4358274986d81d685934bcaaf536eaf7a72a53ec Mon Sep 17 00:00:00 2001 From: "Gareth J. Greenaway" Date: Thu, 2 Feb 2023 13:59:20 -0800 Subject: [PATCH 070/104] Update install_ubuntu_git and install_debian_git to account for different locations for the systemd service files. --- bootstrap-salt.sh | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh index 34267ef..02195a6 100755 --- a/bootstrap-salt.sh +++ b/bootstrap-salt.sh @@ -3330,7 +3330,15 @@ install_ubuntu_git() { _POST_NEON_PIP_INSTALL_ARGS="" __install_salt_from_repo_post_neon "${_PY_EXE}" || return 1 cd "${_SALT_GIT_CHECKOUT_DIR}" || return 1 - sed -i 's:/usr/bin:/usr/local/bin:g' pkg/*.service + + # Account for new path for services files in later releases + if [ -d "pkg/common" ]; then + _SERVICE_DIR="pkg/common" + else + _SERVICE_DIR="pkg" + fi + + sed -i 's:/usr/bin:/usr/local/bin:g' ${_SERVICE_DIR}/*.service return 0 fi @@ -3962,7 +3970,15 @@ install_debian_git() { _POST_NEON_PIP_INSTALL_ARGS="" __install_salt_from_repo_post_neon "${_PY_EXE}" || return 1 cd "${_SALT_GIT_CHECKOUT_DIR}" || return 1 - sed -i 's:/usr/bin:/usr/local/bin:g' pkg/*.service + + # Account for new path for services files in later releases + if [ -d "pkg/common" ]; then + _SERVICE_DIR="pkg/common" + else + _SERVICE_DIR="pkg" + fi + + sed -i 's:/usr/bin:/usr/local/bin:g' ${_SERVICE_DIR}/*.service return 0 fi From 78b9d765e96a8a56e2fd1f4b0c85f9f5be162022 Mon Sep 17 00:00:00 2001 From: "Gareth J. Greenaway" Date: Fri, 3 Feb 2023 10:25:51 -0800 Subject: [PATCH 071/104] Need to add --use-517 when installing dependencies from PIP when building on Arch and Gentoo. --- bootstrap-salt.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh index 02195a6..b050dc5 100755 --- a/bootstrap-salt.sh +++ b/bootstrap-salt.sh @@ -2832,11 +2832,11 @@ EOM mkdir /tmp/git/deps echoinfo "Downloading Salt Dependencies from PyPi" echodebug "Running '${_pip_cmd} download -d /tmp/git/deps .'" - ${_pip_cmd} download -d /tmp/git/deps . || (echo "Failed to download salt dependencies" && return 1) + ${_pip_cmd} download --use-517 -d /tmp/git/deps . || (echo "Failed to download salt dependencies" && return 1) echoinfo "Installing Downloaded Salt Dependencies" echodebug "Running '${_pip_cmd} install --ignore-installed ${_POST_NEON_PIP_INSTALL_ARGS} /tmp/git/deps/*'" - ${_pip_cmd} install --ignore-installed ${_POST_NEON_PIP_INSTALL_ARGS} /tmp/git/deps/* || return 1 + ${_pip_cmd} install --use-517 --ignore-installed ${_POST_NEON_PIP_INSTALL_ARGS} /tmp/git/deps/* || return 1 rm -f /tmp/git/deps/* echoinfo "Building Salt Python Wheel" From af44e88261e39bf37ec1d6ebecb4bbabd41359cf Mon Sep 17 00:00:00 2001 From: "Gareth J. Greenaway" Date: Fri, 3 Feb 2023 10:55:41 -0800 Subject: [PATCH 072/104] fixing typo. --use-pep517 instead of --use-517 --- bootstrap-salt.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh index b050dc5..f03162d 100755 --- a/bootstrap-salt.sh +++ b/bootstrap-salt.sh @@ -2832,11 +2832,11 @@ EOM mkdir /tmp/git/deps echoinfo "Downloading Salt Dependencies from PyPi" echodebug "Running '${_pip_cmd} download -d /tmp/git/deps .'" - ${_pip_cmd} download --use-517 -d /tmp/git/deps . || (echo "Failed to download salt dependencies" && return 1) + ${_pip_cmd} download --use-pep517 -d /tmp/git/deps . || (echo "Failed to download salt dependencies" && return 1) echoinfo "Installing Downloaded Salt Dependencies" echodebug "Running '${_pip_cmd} install --ignore-installed ${_POST_NEON_PIP_INSTALL_ARGS} /tmp/git/deps/*'" - ${_pip_cmd} install --use-517 --ignore-installed ${_POST_NEON_PIP_INSTALL_ARGS} /tmp/git/deps/* || return 1 + ${_pip_cmd} install --use-pep517 --ignore-installed ${_POST_NEON_PIP_INSTALL_ARGS} /tmp/git/deps/* || return 1 rm -f /tmp/git/deps/* echoinfo "Building Salt Python Wheel" From 4d74e818e449285f53c79ae5d19eb9c47049ec65 Mon Sep 17 00:00:00 2001 From: "Gareth J. Greenaway" Date: Fri, 3 Feb 2023 14:56:32 -0800 Subject: [PATCH 073/104] only use --use-pep517 with Arch. --- bootstrap-salt.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh index f03162d..c0ff3ca 100755 --- a/bootstrap-salt.sh +++ b/bootstrap-salt.sh @@ -2832,11 +2832,11 @@ EOM mkdir /tmp/git/deps echoinfo "Downloading Salt Dependencies from PyPi" echodebug "Running '${_pip_cmd} download -d /tmp/git/deps .'" - ${_pip_cmd} download --use-pep517 -d /tmp/git/deps . || (echo "Failed to download salt dependencies" && return 1) + ${_pip_cmd} download -d /tmp/git/deps ${_POST_NEON_PIP_INSTALL_ARGS} . || (echo "Failed to download salt dependencies" && return 1) echoinfo "Installing Downloaded Salt Dependencies" echodebug "Running '${_pip_cmd} install --ignore-installed ${_POST_NEON_PIP_INSTALL_ARGS} /tmp/git/deps/*'" - ${_pip_cmd} install --use-pep517 --ignore-installed ${_POST_NEON_PIP_INSTALL_ARGS} /tmp/git/deps/* || return 1 + ${_pip_cmd} install --ignore-installed ${_POST_NEON_PIP_INSTALL_ARGS} /tmp/git/deps/* || return 1 rm -f /tmp/git/deps/* echoinfo "Building Salt Python Wheel" @@ -6515,6 +6515,7 @@ install_arch_linux_stable() { install_arch_linux_git() { + _POST_NEON_PIP_INSTALL_ARGS="${_POST_NEON_PIP_INSTALL_ARGS} --use-pep517" if [ "${_POST_NEON_INSTALL}" -eq $BS_TRUE ]; then __install_salt_from_repo_post_neon "${_PY_EXE}" || return 1 return 0 From 1fc0b89e3e6bffa18e508c7d9ffb7909260bd891 Mon Sep 17 00:00:00 2001 From: "Gareth J. Greenaway" Date: Fri, 3 Feb 2023 16:39:35 -0800 Subject: [PATCH 074/104] Swapping ${_POST_NEON_PIP_INSTALL_ARGS} for ${_PIP_DOWNLOAD_ARGS} --- bootstrap-salt.sh | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh index c0ff3ca..d2c87af 100755 --- a/bootstrap-salt.sh +++ b/bootstrap-salt.sh @@ -277,6 +277,7 @@ _POST_NEON_INSTALL=$BS_FALSE _MINIMUM_PIP_VERSION="9.0.1" _MINIMUM_SETUPTOOLS_VERSION="9.1" _POST_NEON_PIP_INSTALL_ARGS="--prefix=/usr" +_PIP_DOWNLOAD_ARGS="" # Defaults for install arguments ITYPE="stable" @@ -2831,8 +2832,8 @@ EOM mkdir /tmp/git/deps echoinfo "Downloading Salt Dependencies from PyPi" - echodebug "Running '${_pip_cmd} download -d /tmp/git/deps .'" - ${_pip_cmd} download -d /tmp/git/deps ${_POST_NEON_PIP_INSTALL_ARGS} . || (echo "Failed to download salt dependencies" && return 1) + echodebug "Running '${_pip_cmd} download -d /tmp/git/deps ${_PIP_DOWNLOAD_ARGS} .'" + ${_pip_cmd} download -d /tmp/git/deps ${_PIP_DOWNLOAD_ARGS} . || (echo "Failed to download salt dependencies" && return 1) echoinfo "Installing Downloaded Salt Dependencies" echodebug "Running '${_pip_cmd} install --ignore-installed ${_POST_NEON_PIP_INSTALL_ARGS} /tmp/git/deps/*'" @@ -6516,6 +6517,7 @@ install_arch_linux_stable() { install_arch_linux_git() { _POST_NEON_PIP_INSTALL_ARGS="${_POST_NEON_PIP_INSTALL_ARGS} --use-pep517" + _PIP_DOWNLOAD_ARGS="${_PIP_DOWNLOAD_ARGS} --use-pep517" if [ "${_POST_NEON_INSTALL}" -eq $BS_TRUE ]; then __install_salt_from_repo_post_neon "${_PY_EXE}" || return 1 return 0 From e301b91ad415274bdda316020a96c5f592f71ffc Mon Sep 17 00:00:00 2001 From: "Gareth J. Greenaway" Date: Fri, 3 Feb 2023 18:27:12 -0800 Subject: [PATCH 075/104] Adding to install_gentoo_git_deps to update setuptools to fix bootstrap install with git master. --- bootstrap-salt.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh index d2c87af..d1c6d5b 100755 --- a/bootstrap-salt.sh +++ b/bootstrap-salt.sh @@ -8036,6 +8036,8 @@ install_gentoo_git_deps() { __emerge ${GENTOO_GIT_PACKAGES} || return 1 fi + __emerge -v1 setuptools || return 1 + __git_clone_and_checkout || return 1 __gentoo_post_dep || return 1 } From 123bae77b19ddf75b20483ba532f3913fa0d9657 Mon Sep 17 00:00:00 2001 From: "Gareth J. Greenaway" Date: Fri, 3 Feb 2023 18:56:22 -0800 Subject: [PATCH 076/104] Adding some logging to be able to find the command. --- bootstrap-salt.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh index d1c6d5b..1c144d1 100755 --- a/bootstrap-salt.sh +++ b/bootstrap-salt.sh @@ -8036,6 +8036,7 @@ install_gentoo_git_deps() { __emerge ${GENTOO_GIT_PACKAGES} || return 1 fi + echoinfo "Running emerge -v1 setuptools" __emerge -v1 setuptools || return 1 __git_clone_and_checkout || return 1 From ccd67c4f6662d84e6e3995f6c23b85ba9b4609f0 Mon Sep 17 00:00:00 2001 From: Dafydd Jones Date: Thu, 2 Feb 2023 15:10:33 +0000 Subject: [PATCH 077/104] readme: improve windows install guidance --- README.rst | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/README.rst b/README.rst index aa798dd..aa08668 100644 --- a/README.rst +++ b/README.rst @@ -397,12 +397,16 @@ Using ``PowerShell`` to install latest stable version: .. code:: console - New-Item -ItemType Directory -Force -Path C:\Temp - Invoke-WebRequest -Uri https://winbootstrap.saltproject.io -OutFile C:\Temp\bootstrap-salt.ps1 + Invoke-WebRequest -Uri https://winbootstrap.saltproject.io -OutFile $env:TEMP\bootstrap-salt.ps1 Set-ExecutionPolicy -ExecutionPolicy Unrestricted -Scope CurrentUser - C:\Temp\bootstrap-salt.ps1 + & $env:TEMP\bootstrap-salt.ps1 Set-ExecutionPolicy -ExecutionPolicy Undefined -Scope CurrentUser +Display information about the install script parameters: + +.. code:: console + + help $env:TEMP\bootstrap-salt.ps1 -Detailed Using ``cygwin`` to install latest stable version: From a740729d8c2355f382776326a8ea77093d5b53a8 Mon Sep 17 00:00:00 2001 From: Dafydd Jones Date: Thu, 2 Feb 2023 15:17:33 +0000 Subject: [PATCH 078/104] bootstrap-salt.ps1: [docs] improve links --- bootstrap-salt.ps1 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/bootstrap-salt.ps1 b/bootstrap-salt.ps1 index 468732a..4943e8f 100644 --- a/bootstrap-salt.ps1 +++ b/bootstrap-salt.ps1 @@ -65,10 +65,10 @@ version. The architecture is dynamically determined by the script. .LINK - Bootstrap GitHub Project (script home) - https://github.com/saltstack/salt-windows-bootstrap - Original Vagrant Provisioner Project -https://github.com/saltstack/salty-vagrant + Salt Bootstrap GitHub Project (script home) - https://github.com/saltstack/salt-bootstrap + Original Vagrant Provisioner Project - https://github.com/saltstack/salty-vagrant Vagrant Project (utilizes this script) - https://github.com/mitchellh/vagrant - SaltStack Download Location - https://repo.saltproject.io/windows/ + Salt Download Location - https://repo.saltproject.io/windows/ #> #=============================================================================== From 247fa77229523cf828362540439c9ac92cb4b24f Mon Sep 17 00:00:00 2001 From: Dafydd Jones Date: Thu, 2 Feb 2023 15:42:59 +0000 Subject: [PATCH 079/104] ci: update shellcheck container version --- .github/workflows/ci.yml | 2 +- .github/workflows/templates/ci.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index dd48aba..073c242 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -93,7 +93,7 @@ jobs: name: Lint runs-on: ubuntu-latest needs: collect-changed-files - container: koalaman/shellcheck-alpine:v0.6.0 + container: koalaman/shellcheck-alpine:v0.7.0 if: github.event_name == 'push' || needs.collect-changed-files.outputs.run-tests == 'true' steps: - uses: actions/checkout@v3 diff --git a/.github/workflows/templates/ci.yml b/.github/workflows/templates/ci.yml index 96d3bb6..113c8ee 100644 --- a/.github/workflows/templates/ci.yml +++ b/.github/workflows/templates/ci.yml @@ -93,7 +93,7 @@ jobs: name: Lint runs-on: ubuntu-latest needs: collect-changed-files - container: koalaman/shellcheck-alpine:v0.6.0 + container: koalaman/shellcheck-alpine:v0.7.0 if: github.event_name == 'push' || needs.collect-changed-files.outputs.run-tests == 'true' steps: - uses: actions/checkout@v3 From b1f5203f506cae28e60fac44dca295c5b041fa56 Mon Sep 17 00:00:00 2001 From: "Gareth J. Greenaway" Date: Wed, 8 Feb 2023 12:25:36 -0800 Subject: [PATCH 080/104] Removing rockylinux:9 until PR into kitchen-docker has been merged. --- .github/workflows/ci.yml | 15 --------------- .github/workflows/templates/generate.py | 8 -------- kitchen.yml | 1 - 3 files changed, 24 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 34af654..f9818dc 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -518,20 +518,6 @@ jobs: instances: '["stable-3004", "git-3004", "stable-3005", "git-3005", "onedir-3005", "git-master", "latest", "onedir-nightly"]' - rockylinux-9: - name: Rocky Linux 9 - 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: rockylinux-9 - display-name: Rocky Linux 9 - timeout: 20 - instances: '["git-3005", "onedir-3005", "git-master", "onedir-nightly"]' - - ubuntu-1804: name: Ubuntu 18.04 if: github.event_name == 'push' || needs.collect-changed-files.outputs.run-tests == 'true' @@ -610,7 +596,6 @@ jobs: - oraclelinux-7 - oraclelinux-8 - rockylinux-8 - - rockylinux-9 - ubuntu-1804 - ubuntu-2004 - ubuntu-2204 diff --git a/.github/workflows/templates/generate.py b/.github/workflows/templates/generate.py index 342002b..4877292 100755 --- a/.github/workflows/templates/generate.py +++ b/.github/workflows/templates/generate.py @@ -28,7 +28,6 @@ LINUX_DISTROS = [ "oraclelinux-7", "oraclelinux-8", "rockylinux-8", - "rockylinux-9", "ubuntu-1804", "ubuntu-2004", "ubuntu-2204", @@ -85,7 +84,6 @@ ONEDIR_DISTROS = [ "oraclelinux-7", "oraclelinux-8", "rockylinux-8", - "rockylinux-9", "ubuntu-1804", "ubuntu-2004", "ubuntu-2204", @@ -105,7 +103,6 @@ BLACKLIST_3003 = [ "opensuse-15", "opensuse-tumbleweed", "rockylinux-8", - "rockylinux-9", "ubuntu-2204", ] @@ -125,7 +122,6 @@ BLACKLIST_GIT_3003 = [ "opensuse-15", "opensuse-tumbleweed", "rockylinux-8", - "rockylinux-9", "ubuntu-2004", "ubuntu-2110", "ubuntu-2204", @@ -143,7 +139,6 @@ BLACKLIST_3004 = [ "gentoo-systemd", "opensuse-15", "opensuse-tumbleweed", - "rockylinux-9", ] BLACKLIST_3005 = [ @@ -176,7 +171,6 @@ BLACKLIST_GIT_3004 = [ "ubuntu-2004", "ubuntu-2110", "ubuntu-2204", - "rockylinux-9", ] BLACKLIST_GIT_3005 = [ @@ -246,7 +240,6 @@ GIT_DISTRO_BLACKLIST = [ LATEST_PKG_BLACKLIST = [ "almalinux-9", "centos-stream9", - "rockylinux-9", ] DISTRO_DISPLAY_NAMES = { @@ -270,7 +263,6 @@ DISTRO_DISPLAY_NAMES = { "oraclelinux-7": "Oracle Linux 7", "oraclelinux-8": "Oracle Linux 8", "rockylinux-8": "Rocky Linux 8", - "rockylinux-9": "Rocky Linux 9", "ubuntu-1804": "Ubuntu 18.04", "ubuntu-2004": "Ubuntu 20.04", "ubuntu-2204": "Ubuntu 22.04", diff --git a/kitchen.yml b/kitchen.yml index 6dd016b..6e1ebe9 100644 --- a/kitchen.yml +++ b/kitchen.yml @@ -112,7 +112,6 @@ platforms: - name: oraclelinux-8 - name: oraclelinux-7 - name: rockylinux-8 - - name: rockylinux-9 driver: run_command: /usr/lib/systemd/systemd provision_command: From 3b9439856dab5ce0e54dd3757e95701a7d019609 Mon Sep 17 00:00:00 2001 From: "Gareth J. Greenaway" Date: Wed, 8 Feb 2023 15:38:36 -0800 Subject: [PATCH 081/104] removing update-crypto-policies --set DEFAULT:SHA1, no longer needed for rockylinux:8 --- kitchen.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/kitchen.yml b/kitchen.yml index 6e1ebe9..401e7b1 100644 --- a/kitchen.yml +++ b/kitchen.yml @@ -109,14 +109,13 @@ platforms: - *opensuse_provision_command_02 - *opensuse_provision_command_03 - echo "PubkeyAcceptedAlgorithms +ssh-rsa" | tee -a /etc/ssh/sshd_config + - name: rockylinux-8 - name: oraclelinux-8 - name: oraclelinux-7 - - name: rockylinux-8 driver: run_command: /usr/lib/systemd/systemd provision_command: - dnf -y install crypto-policies-scripts procps-ng - - update-crypto-policies --set DEFAULT:SHA1 - echo "PubkeyAcceptedAlgorithms +ssh-rsa" | tee -a /etc/ssh/sshd_config - name: ubuntu-22.04 driver: From eeeaddd21d25f44e394882e1374c604be61417dd Mon Sep 17 00:00:00 2001 From: "Gareth J. Greenaway" Date: Wed, 8 Feb 2023 16:26:21 -0800 Subject: [PATCH 082/104] removing bits not needed for rockylinux:8, oraclelinux:8, or oraclelinux:9 --- kitchen.yml | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/kitchen.yml b/kitchen.yml index 401e7b1..9504d89 100644 --- a/kitchen.yml +++ b/kitchen.yml @@ -109,14 +109,9 @@ platforms: - *opensuse_provision_command_02 - *opensuse_provision_command_03 - echo "PubkeyAcceptedAlgorithms +ssh-rsa" | tee -a /etc/ssh/sshd_config - - name: rockylinux-8 - name: oraclelinux-8 - name: oraclelinux-7 - driver: - run_command: /usr/lib/systemd/systemd - provision_command: - - dnf -y install crypto-policies-scripts procps-ng - - echo "PubkeyAcceptedAlgorithms +ssh-rsa" | tee -a /etc/ssh/sshd_config + - name: rockylinux-8 - name: ubuntu-22.04 driver: run_command: /lib/systemd/systemd From e5981993ca2fe23031b1f05cbaee27516d28682d Mon Sep 17 00:00:00 2001 From: "Gareth J. Greenaway" Date: Thu, 9 Feb 2023 11:24:36 -0800 Subject: [PATCH 083/104] fixing centos:stream9 docker URL --- kitchen.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/kitchen.yml b/kitchen.yml index 9504d89..33a64ea 100644 --- a/kitchen.yml +++ b/kitchen.yml @@ -51,7 +51,11 @@ platforms: - echo "PubkeyAcceptedAlgorithms +ssh-rsa" | tee -a /etc/ssh/sshd_config - name: centos-stream9 driver: - image: quay.io/centos/centos:stream8 + image: quay.io/centos/centos:stream9 + provision_command: + - dnf -y install crypto-policies-scripts procps-ng + - update-crypto-policies --set DEFAULT:SHA1 + - echo "PubkeyAcceptedAlgorithms +ssh-rsa" | tee -a /etc/ssh/sshd_config - name: centos-stream8 driver: image: quay.io/centos/centos:stream8 From 35e360189ac1df8d7013d54dea4548619c3c5951 Mon Sep 17 00:00:00 2001 From: "Gareth J. Greenaway" Date: Thu, 9 Feb 2023 12:12:50 -0800 Subject: [PATCH 084/104] Adding platform: centosstraem to centosstream:9 --- kitchen.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/kitchen.yml b/kitchen.yml index 33a64ea..7cd0f60 100644 --- a/kitchen.yml +++ b/kitchen.yml @@ -51,6 +51,7 @@ platforms: - echo "PubkeyAcceptedAlgorithms +ssh-rsa" | tee -a /etc/ssh/sshd_config - name: centos-stream9 driver: + platform: centosstream image: quay.io/centos/centos:stream9 provision_command: - dnf -y install crypto-policies-scripts procps-ng From 98f30a8a56ff8340418e5f7450d4694f7fe2d8a7 Mon Sep 17 00:00:00 2001 From: "Gareth J. Greenaway" Date: Wed, 8 Feb 2023 16:06:34 -0800 Subject: [PATCH 085/104] seperate branch for adding and testing rockylinux:9, swapping out the kitchen-docker Github until PR is merged. --- .github/workflows/ci.yml | 17 ++++++++++++++++- .github/workflows/templates/generate.py | 10 +++++++++- Gemfile | 2 +- kitchen.yml | 8 ++++++++ 4 files changed, 34 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f9818dc..ace9470 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -333,7 +333,7 @@ jobs: distro-slug: centos-stream9 display-name: CentOS Stream 9 timeout: 20 - instances: '["git-3005", "onedir-3005", "git-master", "onedir-nightly"]' + instances: '["git-3005", "onedir-3005", "git-master", "latest", "onedir-nightly"]' debian-10: @@ -518,6 +518,20 @@ jobs: instances: '["stable-3004", "git-3004", "stable-3005", "git-3005", "onedir-3005", "git-master", "latest", "onedir-nightly"]' + rockylinux-9: + name: Rocky Linux 9 + 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: rockylinux-9 + display-name: Rocky Linux 9 + timeout: 20 + instances: '["git-3005", "onedir-3005", "git-master", "onedir-nightly"]' + + ubuntu-1804: name: Ubuntu 18.04 if: github.event_name == 'push' || needs.collect-changed-files.outputs.run-tests == 'true' @@ -596,6 +610,7 @@ jobs: - oraclelinux-7 - oraclelinux-8 - rockylinux-8 + - rockylinux-9 - ubuntu-1804 - ubuntu-2004 - ubuntu-2204 diff --git a/.github/workflows/templates/generate.py b/.github/workflows/templates/generate.py index 4877292..89fd3eb 100755 --- a/.github/workflows/templates/generate.py +++ b/.github/workflows/templates/generate.py @@ -28,6 +28,7 @@ LINUX_DISTROS = [ "oraclelinux-7", "oraclelinux-8", "rockylinux-8", + "rockylinux-9", "ubuntu-1804", "ubuntu-2004", "ubuntu-2204", @@ -84,6 +85,7 @@ ONEDIR_DISTROS = [ "oraclelinux-7", "oraclelinux-8", "rockylinux-8", + "rockylinux-9", "ubuntu-1804", "ubuntu-2004", "ubuntu-2204", @@ -103,6 +105,7 @@ BLACKLIST_3003 = [ "opensuse-15", "opensuse-tumbleweed", "rockylinux-8", + "rockylinux-9", "ubuntu-2204", ] @@ -122,6 +125,7 @@ BLACKLIST_GIT_3003 = [ "opensuse-15", "opensuse-tumbleweed", "rockylinux-8", + "rockylinux-9", "ubuntu-2004", "ubuntu-2110", "ubuntu-2204", @@ -139,6 +143,7 @@ BLACKLIST_3004 = [ "gentoo-systemd", "opensuse-15", "opensuse-tumbleweed", + "rockylinux-9", ] BLACKLIST_3005 = [ @@ -171,6 +176,7 @@ BLACKLIST_GIT_3004 = [ "ubuntu-2004", "ubuntu-2110", "ubuntu-2204", + "rockylinux-9", ] BLACKLIST_GIT_3005 = [ @@ -239,7 +245,8 @@ GIT_DISTRO_BLACKLIST = [ LATEST_PKG_BLACKLIST = [ "almalinux-9", - "centos-stream9", + "centos-stream-9", + "rockylinux-9", ] DISTRO_DISPLAY_NAMES = { @@ -263,6 +270,7 @@ DISTRO_DISPLAY_NAMES = { "oraclelinux-7": "Oracle Linux 7", "oraclelinux-8": "Oracle Linux 8", "rockylinux-8": "Rocky Linux 8", + "rockylinux-9": "Rocky Linux 9", "ubuntu-1804": "Ubuntu 18.04", "ubuntu-2004": "Ubuntu 20.04", "ubuntu-2204": "Ubuntu 22.04", diff --git a/Gemfile b/Gemfile index a70a9da..8fa4c92 100644 --- a/Gemfile +++ b/Gemfile @@ -4,7 +4,7 @@ source "https://rubygems.org" gem 'test-kitchen', '>= 3.2.2' gem 'kitchen-salt', '>= 0.7.2' -gem 'kitchen-docker', :git => 'https://github.com/test-kitchen/kitchen-docker.git', :branch => 'main' +gem 'kitchen-docker', :git => 'https://github.com/garethgreenaway/kitchen-docker.git', :branch => 'add_rockylinux_platform_section' group :vagrant do gem 'kitchen-vagrant' diff --git a/kitchen.yml b/kitchen.yml index 7cd0f60..672f86a 100644 --- a/kitchen.yml +++ b/kitchen.yml @@ -114,6 +114,14 @@ platforms: - *opensuse_provision_command_02 - *opensuse_provision_command_03 - echo "PubkeyAcceptedAlgorithms +ssh-rsa" | tee -a /etc/ssh/sshd_config + - name: rockylinux-9 + driver: + run_command: /usr/lib/systemd/systemd + provision_command: + - dnf -y install crypto-policies-scripts procps-ng + - update-crypto-policies --set DEFAULT:SHA1 + - echo "PubkeyAcceptedAlgorithms +ssh-rsa" | tee -a /etc/ssh/sshd_config + - name: rockylinux-8 - name: oraclelinux-8 - name: oraclelinux-7 - name: rockylinux-8 From 03bcfbc76bec7d8a6bcf5ff5f3b204c3d5d00790 Mon Sep 17 00:00:00 2001 From: "Gareth J. Greenaway" Date: Thu, 9 Feb 2023 15:53:51 -0800 Subject: [PATCH 086/104] swap kitchen-docker URL for official one. Use centosstream platform for rockylinux9 --- Gemfile | 2 +- kitchen.yml | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Gemfile b/Gemfile index 8fa4c92..a70a9da 100644 --- a/Gemfile +++ b/Gemfile @@ -4,7 +4,7 @@ source "https://rubygems.org" gem 'test-kitchen', '>= 3.2.2' gem 'kitchen-salt', '>= 0.7.2' -gem 'kitchen-docker', :git => 'https://github.com/garethgreenaway/kitchen-docker.git', :branch => 'add_rockylinux_platform_section' +gem 'kitchen-docker', :git => 'https://github.com/test-kitchen/kitchen-docker.git', :branch => 'main' group :vagrant do gem 'kitchen-vagrant' diff --git a/kitchen.yml b/kitchen.yml index 672f86a..1603749 100644 --- a/kitchen.yml +++ b/kitchen.yml @@ -116,6 +116,7 @@ platforms: - echo "PubkeyAcceptedAlgorithms +ssh-rsa" | tee -a /etc/ssh/sshd_config - name: rockylinux-9 driver: + platform: centosstream run_command: /usr/lib/systemd/systemd provision_command: - dnf -y install crypto-policies-scripts procps-ng From 68e1fdc39ecfe70856db41c45a487ef7deab5bc4 Mon Sep 17 00:00:00 2001 From: "Gareth J. Greenaway" Date: Sat, 18 Feb 2023 14:06:58 -0800 Subject: [PATCH 087/104] When installing setuptools and wheel, upgrade if available. --- bootstrap-salt.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh index 049da1d..d8c7fe2 100755 --- a/bootstrap-salt.sh +++ b/bootstrap-salt.sh @@ -2826,7 +2826,7 @@ EOM fi echodebug "Running '${_pip_cmd} install wheel ${_setuptools_dep}'" - ${_pip_cmd} install ${_POST_NEON_PIP_INSTALL_ARGS} wheel "${_setuptools_dep}" + ${_pip_cmd} install --upgrade ${_POST_NEON_PIP_INSTALL_ARGS} wheel "${_setuptools_dep}" echoinfo "Installing salt using ${_py_exe}" cd "${_SALT_GIT_CHECKOUT_DIR}" || return 1 From b0dad4a52d6ce0e3a8d33b8f5403e70e36a813a1 Mon Sep 17 00:00:00 2001 From: "Gareth J. Greenaway" Date: Sat, 18 Feb 2023 15:27:42 -0800 Subject: [PATCH 088/104] Fixing typo. Blacklist centos-stream9 in latest pkg tests. removing --upgrade --- .github/workflows/ci.yml | 31 +++++++------------------ .github/workflows/templates/generate.py | 14 +++++++---- .github/workflows/test-windows.yml | 5 ++++ bootstrap-salt.sh | 3 ++- tests/conftest.py | 8 ++++--- 5 files changed, 29 insertions(+), 32 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ace9470..bc3892f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -249,7 +249,7 @@ jobs: distro-slug: almalinux-8 display-name: AlmaLinux 8 timeout: 20 - instances: '["stable-3003", "git-3003", "stable-3004", "git-3004", "stable-3005", "git-3005", "onedir-3005", "git-master", "latest", "onedir-nightly"]' + instances: '["stable-3003", "stable-3004", "stable-3005", "onedir-3005", "latest", "onedir-nightly"]' almalinux-9: @@ -305,7 +305,7 @@ jobs: distro-slug: centos-7 display-name: CentOS 7 timeout: 20 - instances: '["stable-3003", "git-3003", "stable-3004", "git-3004", "stable-3005", "git-3005", "onedir-3005", "git-master", "latest", "onedir-nightly"]' + instances: '["stable-3003", "stable-3004", "stable-3005", "onedir-3005", "latest", "onedir-nightly"]' centos-stream8: @@ -319,7 +319,7 @@ jobs: distro-slug: centos-stream8 display-name: CentOS Stream 8 timeout: 20 - instances: '["stable-3003", "git-3003", "stable-3004", "git-3004", "stable-3005", "git-3005", "onedir-3005", "git-master", "latest", "onedir-nightly"]' + instances: '["stable-3003", "stable-3004", "stable-3005", "onedir-3005", "latest", "onedir-nightly"]' centos-stream9: @@ -333,7 +333,7 @@ jobs: distro-slug: centos-stream9 display-name: CentOS Stream 9 timeout: 20 - instances: '["git-3005", "onedir-3005", "git-master", "latest", "onedir-nightly"]' + instances: '["git-3005", "onedir-3005", "git-master", "onedir-nightly"]' debian-10: @@ -459,7 +459,7 @@ jobs: distro-slug: opensuse-15 display-name: Opensuse 15 timeout: 20 - instances: '["git-master", "latest"]' + instances: '["latest"]' opensuse-tumbleweed: @@ -487,7 +487,7 @@ jobs: distro-slug: oraclelinux-7 display-name: Oracle Linux 7 timeout: 20 - instances: '["stable-3003", "git-3003", "stable-3004", "git-3004", "stable-3005", "git-3005", "onedir-3005", "git-master", "latest", "onedir-nightly"]' + instances: '["stable-3003", "stable-3004", "stable-3005", "onedir-3005", "latest", "onedir-nightly"]' oraclelinux-8: @@ -501,7 +501,7 @@ jobs: distro-slug: oraclelinux-8 display-name: Oracle Linux 8 timeout: 20 - instances: '["stable-3003", "git-3003", "stable-3004", "git-3004", "stable-3005", "git-3005", "onedir-3005", "git-master", "latest", "onedir-nightly"]' + instances: '["stable-3003", "stable-3004", "stable-3005", "onedir-3005", "latest", "onedir-nightly"]' rockylinux-8: @@ -515,7 +515,7 @@ jobs: distro-slug: rockylinux-8 display-name: Rocky Linux 8 timeout: 20 - instances: '["stable-3004", "git-3004", "stable-3005", "git-3005", "onedir-3005", "git-master", "latest", "onedir-nightly"]' + instances: '["stable-3004", "stable-3005", "onedir-3005", "latest", "onedir-nightly"]' rockylinux-9: @@ -532,20 +532,6 @@ jobs: instances: '["git-3005", "onedir-3005", "git-master", "onedir-nightly"]' - ubuntu-1804: - name: Ubuntu 18.04 - 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: ubuntu-1804 - display-name: Ubuntu 18.04 - timeout: 20 - instances: '["stable-3003", "git-3003", "stable-3004", "git-3004", "stable-3005", "git-3005", "onedir-3005", "git-master", "latest", "onedir-nightly"]' - - ubuntu-2004: name: Ubuntu 20.04 if: github.event_name == 'push' || needs.collect-changed-files.outputs.run-tests == 'true' @@ -611,7 +597,6 @@ jobs: - oraclelinux-8 - rockylinux-8 - rockylinux-9 - - ubuntu-1804 - ubuntu-2004 - ubuntu-2204 if: always() diff --git a/.github/workflows/templates/generate.py b/.github/workflows/templates/generate.py index 89fd3eb..1c49731 100755 --- a/.github/workflows/templates/generate.py +++ b/.github/workflows/templates/generate.py @@ -29,7 +29,6 @@ LINUX_DISTROS = [ "oraclelinux-8", "rockylinux-8", "rockylinux-9", - "ubuntu-1804", "ubuntu-2004", "ubuntu-2204", ] @@ -68,7 +67,6 @@ STABLE_DISTROS = [ "oraclelinux-7", "oraclelinux-8", "rockylinux-8", - "ubuntu-1804", "ubuntu-2004", "ubuntu-2204", ] @@ -86,7 +84,6 @@ ONEDIR_DISTROS = [ "oraclelinux-8", "rockylinux-8", "rockylinux-9", - "ubuntu-1804", "ubuntu-2004", "ubuntu-2204", ] @@ -238,14 +235,22 @@ GIT_VERSION_BLACKLIST = [ # /usr/lib/python3.11/site-packages/setuptools/command/install.py:34: # SetuptoolsDeprecationWarning: setup.py install is deprecated. # Use build and pip and other standards-based tools. +# GIT_DISTRO_BLACKLIST = [ + "almalinux-8", + "centos-7", + "centos-stream8", "fedora-37", "fedora-38", + "opensuse-15", + "oraclelinux-7", + "oraclelinux-8", + "rockylinux-8", ] LATEST_PKG_BLACKLIST = [ "almalinux-9", - "centos-stream-9", + "centos-stream9", "rockylinux-9", ] @@ -271,7 +276,6 @@ DISTRO_DISPLAY_NAMES = { "oraclelinux-8": "Oracle Linux 8", "rockylinux-8": "Rocky Linux 8", "rockylinux-9": "Rocky Linux 9", - "ubuntu-1804": "Ubuntu 18.04", "ubuntu-2004": "Ubuntu 20.04", "ubuntu-2204": "Ubuntu 22.04", "macos-1015": "macOS 10.15", diff --git a/.github/workflows/test-windows.yml b/.github/workflows/test-windows.yml index 70b5661..a9ae83b 100644 --- a/.github/workflows/test-windows.yml +++ b/.github/workflows/test-windows.yml @@ -70,10 +70,14 @@ jobs: $password = ConvertTo-SecureString $env:machine_pass -AsPlainText -Force New-LocalUser $env:machine_user -Password $password Add-LocalGroupMember -Group "Administrators" -Member $env:machine_user + Get-LocalUser + Get-LocalGroupMember -Group "Administrators" - name: Set up WinRM run: | Set-WSManQuickConfig -Force + winrm set winrm/config/service '@{AllowUnencrypted="True"}' + env - name: Set up Python 3.9 uses: actions/setup-python@v4 @@ -91,6 +95,7 @@ jobs: - name: Test Bootstrap run: | + env bundle exec kitchen verify ${{ matrix.instance }}-${{ inputs.distro-slug }} - name: Destroy Test Instance diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh index d8c7fe2..94c3b8d 100755 --- a/bootstrap-salt.sh +++ b/bootstrap-salt.sh @@ -2826,7 +2826,8 @@ EOM fi echodebug "Running '${_pip_cmd} install wheel ${_setuptools_dep}'" - ${_pip_cmd} install --upgrade ${_POST_NEON_PIP_INSTALL_ARGS} wheel "${_setuptools_dep}" + #${_pip_cmd} install --upgrade ${_POST_NEON_PIP_INSTALL_ARGS} wheel "${_setuptools_dep}" + ${_pip_cmd} install ${_POST_NEON_PIP_INSTALL_ARGS} wheel "${_setuptools_dep}" echoinfo "Installing salt using ${_py_exe}" cd "${_SALT_GIT_CHECKOUT_DIR}" || return 1 diff --git a/tests/conftest.py b/tests/conftest.py index 370525b..d7bb0be 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -21,10 +21,12 @@ def host(): "KITCHEN_INSTANCE" ): if "windows" in os.environ.get("KITCHEN_INSTANCE"): + _url = "winrm://{KITCHEN_USERNAME}:{KITCHEN_PASSWORD}@{KITCHEN_HOSTNAME}:{KITCHEN_PORT}".format( + **os.environ + ) + log.debug("=== %s ====", _url) return testinfra.get_host( - "winrm://{KITCHEN_USERNAME}:{KITCHEN_PASSWORD}@{KITCHEN_HOSTNAME}:{KITCHEN_PORT}".format( - **os.environ - ), + _url, no_ssl=True, ) return testinfra.get_host( From c1a928e2f344865d53ee32e84fa5e3ab89764338 Mon Sep 17 00:00:00 2001 From: "Gareth J. Greenaway" Date: Wed, 8 Mar 2023 14:09:03 -0800 Subject: [PATCH 089/104] pin requests-ntlm to 1.1.0 --- tests/conftest.py | 1 - tests/requirements.txt | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/conftest.py b/tests/conftest.py index d7bb0be..9e26a11 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -24,7 +24,6 @@ def host(): _url = "winrm://{KITCHEN_USERNAME}:{KITCHEN_PASSWORD}@{KITCHEN_HOSTNAME}:{KITCHEN_PORT}".format( **os.environ ) - log.debug("=== %s ====", _url) return testinfra.get_host( _url, no_ssl=True, diff --git a/tests/requirements.txt b/tests/requirements.txt index c76dfdd..21d133d 100644 --- a/tests/requirements.txt +++ b/tests/requirements.txt @@ -1,4 +1,5 @@ pytest-testinfra paramiko +requests-ntlm==1.1.0; sys.platform == 'win32' pywinrm; sys.platform == 'win32' six>=1.10.0 From 8605f7040b5ae10b708e87234b13a7f0b9b39c9b Mon Sep 17 00:00:00 2001 From: "Gareth J. Greenaway" Date: Wed, 8 Mar 2023 15:36:45 -0800 Subject: [PATCH 090/104] Addin --upgrade back in. --- bootstrap-salt.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh index 94c3b8d..d8c7fe2 100755 --- a/bootstrap-salt.sh +++ b/bootstrap-salt.sh @@ -2826,8 +2826,7 @@ EOM fi echodebug "Running '${_pip_cmd} install wheel ${_setuptools_dep}'" - #${_pip_cmd} install --upgrade ${_POST_NEON_PIP_INSTALL_ARGS} wheel "${_setuptools_dep}" - ${_pip_cmd} install ${_POST_NEON_PIP_INSTALL_ARGS} wheel "${_setuptools_dep}" + ${_pip_cmd} install --upgrade ${_POST_NEON_PIP_INSTALL_ARGS} wheel "${_setuptools_dep}" echoinfo "Installing salt using ${_py_exe}" cd "${_SALT_GIT_CHECKOUT_DIR}" || return 1 From 01f5db67bd7929982bf3703235b22d5a988605be Mon Sep 17 00:00:00 2001 From: "Gareth J. Greenaway" Date: Thu, 2 Mar 2023 18:56:39 -0800 Subject: [PATCH 091/104] fixes for 3006 release. --- bootstrap-salt.sh | 32 +++++++++++++++++++++++++------- 1 file changed, 25 insertions(+), 7 deletions(-) diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh index d8c7fe2..7516377 100755 --- a/bootstrap-salt.sh +++ b/bootstrap-salt.sh @@ -673,6 +673,11 @@ elif [ "$ITYPE" = "onedir_rc" ]; then #ONEDIR_REV=$(echo "$1" | sed -E 's/^([3-9][0-9]{3})\.0$/\1/') ONEDIR_REV="minor/$1" shift + elif [ "$(echo "$1" | grep -E '^([3-9][0-9]{3}\.[0-9]?rc[0-9]$)')" != "" ]; then + # Handle the 3xxx.0 version as 3xxx archive (pin to minor) and strip the fake ".0" suffix + #ONEDIR_REV=$(echo "$1" | sed -E 's/^([3-9][0-9]{3})\.0$/\1/') + ONEDIR_REV="minor/$1" + shift else echo "Unknown onedir_rc version: $1 (valid: 3005-1, latest.)" exit 1 @@ -4497,10 +4502,14 @@ __install_saltstack_rhel_onedir_repository() { if [ "${ONEDIR_REV}" = "nightly" ] ; then base_url="${HTTP_VAL}://${_REPO_URL}/${_ONEDIR_NIGHTLY_DIR}/${__PY_VERSION_REPO}/redhat/${DISTRO_MAJOR_VERSION}/\$basearch/" fi - if [ "${DISTRO_MAJOR_VERSION}" -eq 9 ]; then - gpg_key="SALTSTACK-GPG-KEY2.pub" + if [ "$(echo "${repo_rev}" | grep -E '^(3004|3005)')" != "" ]; then + if [ "${DISTRO_MAJOR_VERSION}" -eq 9 ]; then + gpg_key="SALTSTACK-GPG-KEY2.pub" + else + gpg_key="SALTSTACK-GPG-KEY.pub" + fi else - gpg_key="SALTSTACK-GPG-KEY.pub" + gpg_key="SALT-PROJECT-GPG-PUBKEY-2023.pub" fi gpg_key_urls="" @@ -6278,9 +6287,14 @@ install_amazon_linux_ami_2_onedir_deps() { if [ "${ONEDIR_REV}" = "nightly" ] ; then base_url="$HTTP_VAL://${_REPO_URL}/${_ONEDIR_NIGHTLY_DIR}/${__PY_VERSION_REPO}/amazon/2/\$basearch/" fi - gpg_key="${base_url}SALTSTACK-GPG-KEY.pub,${base_url}base/RPM-GPG-KEY-CentOS-7" - if [ -n "$_PY_EXE" ] && [ "$_PY_MAJOR_VERSION" -eq 3 ]; then - gpg_key="${base_url}SALTSTACK-GPG-KEY.pub" + + if [ "$(echo "${repo_rev}" | grep -E '^(3004|3005)')" != "" ]; then + gpg_key="${base_url}SALTSTACK-GPG-KEY.pub,${base_url}base/RPM-GPG-KEY-CentOS-7" + if [ -n "$_PY_EXE" ] && [ "$_PY_MAJOR_VERSION" -eq 3 ]; then + gpg_key="${base_url}SALTSTACK-GPG-KEY.pub" + fi + else + gpg_key="${base_url}SALTSTACK-GPG-PUBKEY-2023.pub" fi # This should prob be refactored to use __install_saltstack_rhel_repository() @@ -8652,7 +8666,11 @@ daemons_running_onedir() { [ $fname = "master" ] && [ "$_INSTALL_MASTER" -eq $BS_FALSE ] && continue [ $fname = "syndic" ] && [ "$_INSTALL_SYNDIC" -eq $BS_FALSE ] && continue - salt_path="/opt/saltstack/salt/run/run ${fname}" + if [ -f "/opt/saltstack/salt/run/run" ]; then + salt_path="/opt/saltstack/salt/run/run ${fname}" + else + salt_path="salt-${fname}" + fi process_running=$(pgrep -f "${salt_path}") if [ "${process_running}" = "" ]; then echoerror "${salt_path} was not found running" From 537d2eecd03e7b8e54e551b45f3338f89824ac3c Mon Sep 17 00:00:00 2001 From: "Gareth J. Greenaway" Date: Fri, 3 Mar 2023 09:14:44 -0800 Subject: [PATCH 092/104] Update repo GPG keys for debian and Ubuntu. --- bootstrap-salt.sh | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh index 7516377..89b9c23 100755 --- a/bootstrap-salt.sh +++ b/bootstrap-salt.sh @@ -3078,7 +3078,11 @@ __install_saltstack_ubuntu_onedir_repository() { fi echo "$__REPO_ARCH_DEB $SALTSTACK_UBUNTU_URL $UBUNTU_CODENAME main" > /etc/apt/sources.list.d/salt.list - __apt_key_fetch "${SALTSTACK_UBUNTU_URL}salt-archive-keyring.gpg" || return 1 + if [ "$(echo "${ONEDIR_REV}" | grep -E '^(3004|3005)')" != "" ]; then + __apt_key_fetch "${SALTSTACK_UBUNTU_URL}salt-archive-keyring.gpg" || return 1 + else + __apt_key_fetch "${SALTSTACK_UBUNTU_URL}SALT-PROJECT-GPG-PUBKEY-2023.gpg" || return 1 + fi __wait_for_apt apt-get update || return 1 } @@ -3618,7 +3622,11 @@ __install_saltstack_debian_onedir_repository() { fi echo "$__REPO_ARCH_DEB $SALTSTACK_DEBIAN_URL $DEBIAN_CODENAME main" > "/etc/apt/sources.list.d/salt.list" - __apt_key_fetch "${SALTSTACK_DEBIAN_URL}salt-archive-keyring.gpg" || return 1 + if [ "$(echo "${ONEDIR_REV}" | grep -E '^(3004|3005)')" != "" ]; then + __apt_key_fetch "${SALTSTACK_DEBIAN_URL}salt-archive-keyring.gpg" || return 1 + else + __apt_key_fetch "${SALTSTACK_DEBIAN_URL}SALT-PROJECT-GPG-PUBKEY-2023.gpg" || return 1 + fi __wait_for_apt apt-get update || return 1 } From e1fb1c512cf048423a8649a5981daf9dd4730cbb Mon Sep 17 00:00:00 2001 From: "Gareth J. Greenaway" Date: Thu, 9 Mar 2023 10:00:46 -0800 Subject: [PATCH 093/104] Update regex for determining the GPG key to use. --- bootstrap-salt.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh index 89b9c23..01a1080 100755 --- a/bootstrap-salt.sh +++ b/bootstrap-salt.sh @@ -3078,7 +3078,7 @@ __install_saltstack_ubuntu_onedir_repository() { fi echo "$__REPO_ARCH_DEB $SALTSTACK_UBUNTU_URL $UBUNTU_CODENAME main" > /etc/apt/sources.list.d/salt.list - if [ "$(echo "${ONEDIR_REV}" | grep -E '^(3004|3005)')" != "" ]; then + if [ "$(echo "${ONEDIR_REV}" | grep -E '(3004|3005)')" != "" ]; then __apt_key_fetch "${SALTSTACK_UBUNTU_URL}salt-archive-keyring.gpg" || return 1 else __apt_key_fetch "${SALTSTACK_UBUNTU_URL}SALT-PROJECT-GPG-PUBKEY-2023.gpg" || return 1 @@ -3622,7 +3622,7 @@ __install_saltstack_debian_onedir_repository() { fi echo "$__REPO_ARCH_DEB $SALTSTACK_DEBIAN_URL $DEBIAN_CODENAME main" > "/etc/apt/sources.list.d/salt.list" - if [ "$(echo "${ONEDIR_REV}" | grep -E '^(3004|3005)')" != "" ]; then + if [ "$(echo "${ONEDIR_REV}" | grep -E '(3004|3005)')" != "" ]; then __apt_key_fetch "${SALTSTACK_DEBIAN_URL}salt-archive-keyring.gpg" || return 1 else __apt_key_fetch "${SALTSTACK_DEBIAN_URL}SALT-PROJECT-GPG-PUBKEY-2023.gpg" || return 1 @@ -4510,7 +4510,7 @@ __install_saltstack_rhel_onedir_repository() { if [ "${ONEDIR_REV}" = "nightly" ] ; then base_url="${HTTP_VAL}://${_REPO_URL}/${_ONEDIR_NIGHTLY_DIR}/${__PY_VERSION_REPO}/redhat/${DISTRO_MAJOR_VERSION}/\$basearch/" fi - if [ "$(echo "${repo_rev}" | grep -E '^(3004|3005)')" != "" ]; then + if [ "$(echo "${repo_rev}" | grep -E '(3004|3005)')" != "" ]; then if [ "${DISTRO_MAJOR_VERSION}" -eq 9 ]; then gpg_key="SALTSTACK-GPG-KEY2.pub" else From 44198af5ebad26fc3eadb644ccaf0afd9830398d Mon Sep 17 00:00:00 2001 From: "Gareth J. Greenaway" Date: Thu, 9 Mar 2023 13:19:45 -0800 Subject: [PATCH 094/104] Look for version in ONEDIR_REV. Use older key for nightly builds unitl the 3006 release. --- bootstrap-salt.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh index 01a1080..d45d708 100755 --- a/bootstrap-salt.sh +++ b/bootstrap-salt.sh @@ -3078,7 +3078,7 @@ __install_saltstack_ubuntu_onedir_repository() { fi echo "$__REPO_ARCH_DEB $SALTSTACK_UBUNTU_URL $UBUNTU_CODENAME main" > /etc/apt/sources.list.d/salt.list - if [ "$(echo "${ONEDIR_REV}" | grep -E '(3004|3005)')" != "" ]; then + if [ "$(echo "${ONEDIR_REV}" | grep -E '(3004|3005|nightly)')" != "" ]; then __apt_key_fetch "${SALTSTACK_UBUNTU_URL}salt-archive-keyring.gpg" || return 1 else __apt_key_fetch "${SALTSTACK_UBUNTU_URL}SALT-PROJECT-GPG-PUBKEY-2023.gpg" || return 1 @@ -3622,7 +3622,7 @@ __install_saltstack_debian_onedir_repository() { fi echo "$__REPO_ARCH_DEB $SALTSTACK_DEBIAN_URL $DEBIAN_CODENAME main" > "/etc/apt/sources.list.d/salt.list" - if [ "$(echo "${ONEDIR_REV}" | grep -E '(3004|3005)')" != "" ]; then + if [ "$(echo "${ONEDIR_REV}" | grep -E '(3004|3005|nightly)')" != "" ]; then __apt_key_fetch "${SALTSTACK_DEBIAN_URL}salt-archive-keyring.gpg" || return 1 else __apt_key_fetch "${SALTSTACK_DEBIAN_URL}SALT-PROJECT-GPG-PUBKEY-2023.gpg" || return 1 @@ -4510,7 +4510,7 @@ __install_saltstack_rhel_onedir_repository() { if [ "${ONEDIR_REV}" = "nightly" ] ; then base_url="${HTTP_VAL}://${_REPO_URL}/${_ONEDIR_NIGHTLY_DIR}/${__PY_VERSION_REPO}/redhat/${DISTRO_MAJOR_VERSION}/\$basearch/" fi - if [ "$(echo "${repo_rev}" | grep -E '(3004|3005)')" != "" ]; then + if [ "$(echo "${ONEDIR_REV}" | grep -E '(3004|3005|nightly)')" != "" ]; then if [ "${DISTRO_MAJOR_VERSION}" -eq 9 ]; then gpg_key="SALTSTACK-GPG-KEY2.pub" else From 1d4776cdbaec4e49b2a7cbc441689fbda1f7abdb Mon Sep 17 00:00:00 2001 From: "Gareth J. Greenaway" Date: Thu, 9 Mar 2023 15:43:50 -0800 Subject: [PATCH 095/104] fix for amazon2 GPG key logic. --- bootstrap-salt.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh index d45d708..c617c26 100755 --- a/bootstrap-salt.sh +++ b/bootstrap-salt.sh @@ -6296,7 +6296,7 @@ install_amazon_linux_ami_2_onedir_deps() { base_url="$HTTP_VAL://${_REPO_URL}/${_ONEDIR_NIGHTLY_DIR}/${__PY_VERSION_REPO}/amazon/2/\$basearch/" fi - if [ "$(echo "${repo_rev}" | grep -E '^(3004|3005)')" != "" ]; then + if [ "$(echo "${ONEDIR_REV}" | grep -E '(3004|3005)')" != "" ]; then gpg_key="${base_url}SALTSTACK-GPG-KEY.pub,${base_url}base/RPM-GPG-KEY-CentOS-7" if [ -n "$_PY_EXE" ] && [ "$_PY_MAJOR_VERSION" -eq 3 ]; then gpg_key="${base_url}SALTSTACK-GPG-KEY.pub" From d40c7f12e78a46f2f3bd8f0f0aa8e09c631fdf03 Mon Sep 17 00:00:00 2001 From: "Gareth J. Greenaway" Date: Fri, 10 Mar 2023 06:02:55 -0800 Subject: [PATCH 096/104] Adding nightly to the check for the older GPG key until 3006 release. --- bootstrap-salt.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh index c617c26..568d91f 100755 --- a/bootstrap-salt.sh +++ b/bootstrap-salt.sh @@ -6296,7 +6296,7 @@ install_amazon_linux_ami_2_onedir_deps() { base_url="$HTTP_VAL://${_REPO_URL}/${_ONEDIR_NIGHTLY_DIR}/${__PY_VERSION_REPO}/amazon/2/\$basearch/" fi - if [ "$(echo "${ONEDIR_REV}" | grep -E '(3004|3005)')" != "" ]; then + if [ "$(echo "${ONEDIR_REV}" | grep -E '(3004|3005|nightly)')" != "" ]; then gpg_key="${base_url}SALTSTACK-GPG-KEY.pub,${base_url}base/RPM-GPG-KEY-CentOS-7" if [ -n "$_PY_EXE" ] && [ "$_PY_MAJOR_VERSION" -eq 3 ]; then gpg_key="${base_url}SALTSTACK-GPG-KEY.pub" From 8ece9b9cba352a5f757276d5a8ec44fa86b58fc4 Mon Sep 17 00:00:00 2001 From: "Gareth J. Greenaway" Date: Tue, 14 Mar 2023 13:48:23 -0700 Subject: [PATCH 097/104] Adding 3006.0rc1 to Github actions. --- .github/workflows/ci.yml | 28 +++++++++++----------- .github/workflows/templates/generate.py | 32 ++++++++++++++++++++++++- kitchen.yml | 14 +++++++++++ 3 files changed, 59 insertions(+), 15 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index bc3892f..d8a1468 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -249,7 +249,7 @@ jobs: distro-slug: almalinux-8 display-name: AlmaLinux 8 timeout: 20 - instances: '["stable-3003", "stable-3004", "stable-3005", "onedir-3005", "latest", "onedir-nightly"]' + instances: '["stable-3003", "stable-3004", "stable-3005", "onedir-3005", "latest", "onedir-nightly", "onedir_rc-3006.0rc1"]' almalinux-9: @@ -263,7 +263,7 @@ jobs: distro-slug: almalinux-9 display-name: AlmaLinux 9 timeout: 20 - instances: '["git-3005", "onedir-3005", "git-master", "onedir-nightly"]' + instances: '["git-3005", "onedir-3005", "git-master", "onedir-nightly", "onedir_rc-3006.0rc1"]' amazon-2: @@ -277,7 +277,7 @@ jobs: distro-slug: amazon-2 display-name: Amazon 2 timeout: 20 - instances: '["stable-3003", "stable-3004", "stable-3005", "onedir-3005", "git-master", "latest", "onedir-nightly"]' + instances: '["stable-3003", "stable-3004", "stable-3005", "onedir-3005", "git-master", "latest", "onedir-nightly", "onedir_rc-3006.0rc1"]' arch: @@ -305,7 +305,7 @@ jobs: distro-slug: centos-7 display-name: CentOS 7 timeout: 20 - instances: '["stable-3003", "stable-3004", "stable-3005", "onedir-3005", "latest", "onedir-nightly"]' + instances: '["stable-3003", "stable-3004", "stable-3005", "onedir-3005", "latest", "onedir-nightly", "onedir_rc-3006.0rc1"]' centos-stream8: @@ -319,7 +319,7 @@ jobs: distro-slug: centos-stream8 display-name: CentOS Stream 8 timeout: 20 - instances: '["stable-3003", "stable-3004", "stable-3005", "onedir-3005", "latest", "onedir-nightly"]' + instances: '["stable-3003", "stable-3004", "stable-3005", "onedir-3005", "latest", "onedir-nightly", "onedir_rc-3006.0rc1"]' centos-stream9: @@ -333,7 +333,7 @@ jobs: distro-slug: centos-stream9 display-name: CentOS Stream 9 timeout: 20 - instances: '["git-3005", "onedir-3005", "git-master", "onedir-nightly"]' + instances: '["git-3005", "onedir-3005", "git-master", "onedir-nightly", "onedir_rc-3006.0rc1"]' debian-10: @@ -347,7 +347,7 @@ jobs: distro-slug: debian-10 display-name: Debian 10 timeout: 20 - instances: '["stable-3003", "stable-3004", "stable-3005", "onedir-3005", "git-master", "latest", "onedir-nightly"]' + instances: '["stable-3003", "stable-3004", "stable-3005", "onedir-3005", "git-master", "latest", "onedir-nightly", "onedir_rc-3006.0rc1"]' debian-11: @@ -361,7 +361,7 @@ jobs: distro-slug: debian-11 display-name: Debian 11 timeout: 20 - instances: '["stable-3004", "stable-3005", "onedir-3005", "git-master", "latest", "onedir-nightly"]' + instances: '["stable-3004", "stable-3005", "onedir-3005", "git-master", "latest", "onedir-nightly", "onedir_rc-3006.0rc1"]' fedora-35: @@ -487,7 +487,7 @@ jobs: distro-slug: oraclelinux-7 display-name: Oracle Linux 7 timeout: 20 - instances: '["stable-3003", "stable-3004", "stable-3005", "onedir-3005", "latest", "onedir-nightly"]' + instances: '["stable-3003", "stable-3004", "stable-3005", "onedir-3005", "latest", "onedir-nightly", "onedir_rc-3006.0rc1"]' oraclelinux-8: @@ -501,7 +501,7 @@ jobs: distro-slug: oraclelinux-8 display-name: Oracle Linux 8 timeout: 20 - instances: '["stable-3003", "stable-3004", "stable-3005", "onedir-3005", "latest", "onedir-nightly"]' + instances: '["stable-3003", "stable-3004", "stable-3005", "onedir-3005", "latest", "onedir-nightly", "onedir_rc-3006.0rc1"]' rockylinux-8: @@ -515,7 +515,7 @@ jobs: distro-slug: rockylinux-8 display-name: Rocky Linux 8 timeout: 20 - instances: '["stable-3004", "stable-3005", "onedir-3005", "latest", "onedir-nightly"]' + instances: '["stable-3004", "stable-3005", "onedir-3005", "latest", "onedir-nightly", "onedir_rc-3006.0rc1"]' rockylinux-9: @@ -529,7 +529,7 @@ jobs: distro-slug: rockylinux-9 display-name: Rocky Linux 9 timeout: 20 - instances: '["git-3005", "onedir-3005", "git-master", "onedir-nightly"]' + instances: '["git-3005", "onedir-3005", "git-master", "onedir-nightly", "onedir_rc-3006.0rc1"]' ubuntu-2004: @@ -543,7 +543,7 @@ jobs: distro-slug: ubuntu-2004 display-name: Ubuntu 20.04 timeout: 20 - instances: '["stable-3003", "stable-3004", "stable-3005", "onedir-3005", "git-master", "latest", "onedir-nightly"]' + instances: '["stable-3003", "stable-3004", "stable-3005", "onedir-3005", "git-master", "latest", "onedir-nightly", "onedir_rc-3006.0rc1"]' ubuntu-2204: @@ -557,7 +557,7 @@ jobs: distro-slug: ubuntu-2204 display-name: Ubuntu 22.04 timeout: 20 - instances: '["stable-3004", "stable-3005", "onedir-3005", "git-master", "latest", "onedir-nightly"]' + instances: '["stable-3004", "stable-3005", "onedir-3005", "git-master", "latest", "onedir-nightly", "onedir_rc-3006.0rc1"]' set-pipeline-exit-status: diff --git a/.github/workflows/templates/generate.py b/.github/workflows/templates/generate.py index 1c49731..b003f07 100755 --- a/.github/workflows/templates/generate.py +++ b/.github/workflows/templates/generate.py @@ -88,6 +88,23 @@ ONEDIR_DISTROS = [ "ubuntu-2204", ] +ONEDIR_RC_DISTROS = [ + "almalinux-8", + "almalinux-9", + "amazon-2", + "centos-7", + "centos-stream8", + "centos-stream9", + "debian-10", + "debian-11", + "oraclelinux-7", + "oraclelinux-8", + "rockylinux-8", + "rockylinux-9", + "ubuntu-2004", + "ubuntu-2204", +] + BLACKLIST_3003 = [ "almalinux-9", "arch", @@ -201,6 +218,7 @@ SALT_VERSIONS = [ "master", "latest", "nightly", + "3006.0rc1", ] ONEDIR_SALT_VERSIONS = [ @@ -209,6 +227,10 @@ ONEDIR_SALT_VERSIONS = [ "nightly", ] +ONEDIR_RC_SALT_VERSIONS = [ + "3006.0rc1", +] + VERSION_DISPLAY_NAMES = { "3003": "v3003", "3004": "v3004", @@ -221,10 +243,12 @@ VERSION_DISPLAY_NAMES = { STABLE_VERSION_BLACKLIST = [ "master", "nightly", + "3006.0rc1", ] GIT_VERSION_BLACKLIST = [ "nightly", + "3006.0rc1", ] # TODO: Revert the commit relating to this section, once the Git-based builds @@ -494,13 +518,19 @@ def generate_test_jobs(): instances.append(salt_version) continue - for bootstrap_type in ("stable", "git", "onedir"): + for bootstrap_type in ("stable", "git", "onedir", "onedir_rc"): if bootstrap_type == "onedir": if salt_version not in ONEDIR_SALT_VERSIONS: continue if distro not in ONEDIR_DISTROS: continue + if bootstrap_type == "onedir_rc": + if salt_version not in ONEDIR_RC_SALT_VERSIONS: + continue + if distro not in ONEDIR_RC_DISTROS: + continue + if bootstrap_type == "stable": if salt_version in STABLE_VERSION_BLACKLIST: continue diff --git a/kitchen.yml b/kitchen.yml index 1603749..854d08d 100644 --- a/kitchen.yml +++ b/kitchen.yml @@ -265,6 +265,20 @@ suites: salt_version: 3005 salt_bootstrap_options: -MP onedir %s + - name: onedir-rc-3006.0rc1 + provisioner: + salt_version: 3006.0rc1 + salt_bootstrap_options: -R staging.repo.saltproject.io -MP onedir_rc %s + excludes: + - arch + - freebsd-131 + - freebsd-123 + - gentoo + - openbsd-6 + - opensuse-15 + - opensuse-tumbleweed + - ubuntu-1804 + verifier: name: shell remote_exec: false From 9ae48da3fd73266a506e2051c5b759c23ea51f44 Mon Sep 17 00:00:00 2001 From: "Gareth J. Greenaway" Date: Tue, 14 Mar 2023 15:48:43 -0700 Subject: [PATCH 098/104] fixing github actions, cannot have a dot in the name --- .github/workflows/ci.yml | 28 ++++++++++++------------- .github/workflows/templates/generate.py | 8 +++---- kitchen.yml | 2 +- 3 files changed, 19 insertions(+), 19 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d8a1468..dbde501 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -249,7 +249,7 @@ jobs: distro-slug: almalinux-8 display-name: AlmaLinux 8 timeout: 20 - instances: '["stable-3003", "stable-3004", "stable-3005", "onedir-3005", "latest", "onedir-nightly", "onedir_rc-3006.0rc1"]' + instances: '["stable-3003", "stable-3004", "stable-3005", "onedir-3005", "latest", "onedir-nightly", "onedir_rc-3006-0rc1"]' almalinux-9: @@ -263,7 +263,7 @@ jobs: distro-slug: almalinux-9 display-name: AlmaLinux 9 timeout: 20 - instances: '["git-3005", "onedir-3005", "git-master", "onedir-nightly", "onedir_rc-3006.0rc1"]' + instances: '["git-3005", "onedir-3005", "git-master", "onedir-nightly", "onedir_rc-3006-0rc1"]' amazon-2: @@ -277,7 +277,7 @@ jobs: distro-slug: amazon-2 display-name: Amazon 2 timeout: 20 - instances: '["stable-3003", "stable-3004", "stable-3005", "onedir-3005", "git-master", "latest", "onedir-nightly", "onedir_rc-3006.0rc1"]' + instances: '["stable-3003", "stable-3004", "stable-3005", "onedir-3005", "git-master", "latest", "onedir-nightly", "onedir_rc-3006-0rc1"]' arch: @@ -305,7 +305,7 @@ jobs: distro-slug: centos-7 display-name: CentOS 7 timeout: 20 - instances: '["stable-3003", "stable-3004", "stable-3005", "onedir-3005", "latest", "onedir-nightly", "onedir_rc-3006.0rc1"]' + instances: '["stable-3003", "stable-3004", "stable-3005", "onedir-3005", "latest", "onedir-nightly", "onedir_rc-3006-0rc1"]' centos-stream8: @@ -319,7 +319,7 @@ jobs: distro-slug: centos-stream8 display-name: CentOS Stream 8 timeout: 20 - instances: '["stable-3003", "stable-3004", "stable-3005", "onedir-3005", "latest", "onedir-nightly", "onedir_rc-3006.0rc1"]' + instances: '["stable-3003", "stable-3004", "stable-3005", "onedir-3005", "latest", "onedir-nightly", "onedir_rc-3006-0rc1"]' centos-stream9: @@ -333,7 +333,7 @@ jobs: distro-slug: centos-stream9 display-name: CentOS Stream 9 timeout: 20 - instances: '["git-3005", "onedir-3005", "git-master", "onedir-nightly", "onedir_rc-3006.0rc1"]' + instances: '["git-3005", "onedir-3005", "git-master", "onedir-nightly", "onedir_rc-3006-0rc1"]' debian-10: @@ -347,7 +347,7 @@ jobs: distro-slug: debian-10 display-name: Debian 10 timeout: 20 - instances: '["stable-3003", "stable-3004", "stable-3005", "onedir-3005", "git-master", "latest", "onedir-nightly", "onedir_rc-3006.0rc1"]' + instances: '["stable-3003", "stable-3004", "stable-3005", "onedir-3005", "git-master", "latest", "onedir-nightly", "onedir_rc-3006-0rc1"]' debian-11: @@ -361,7 +361,7 @@ jobs: distro-slug: debian-11 display-name: Debian 11 timeout: 20 - instances: '["stable-3004", "stable-3005", "onedir-3005", "git-master", "latest", "onedir-nightly", "onedir_rc-3006.0rc1"]' + instances: '["stable-3004", "stable-3005", "onedir-3005", "git-master", "latest", "onedir-nightly", "onedir_rc-3006-0rc1"]' fedora-35: @@ -487,7 +487,7 @@ jobs: distro-slug: oraclelinux-7 display-name: Oracle Linux 7 timeout: 20 - instances: '["stable-3003", "stable-3004", "stable-3005", "onedir-3005", "latest", "onedir-nightly", "onedir_rc-3006.0rc1"]' + instances: '["stable-3003", "stable-3004", "stable-3005", "onedir-3005", "latest", "onedir-nightly", "onedir_rc-3006-0rc1"]' oraclelinux-8: @@ -501,7 +501,7 @@ jobs: distro-slug: oraclelinux-8 display-name: Oracle Linux 8 timeout: 20 - instances: '["stable-3003", "stable-3004", "stable-3005", "onedir-3005", "latest", "onedir-nightly", "onedir_rc-3006.0rc1"]' + instances: '["stable-3003", "stable-3004", "stable-3005", "onedir-3005", "latest", "onedir-nightly", "onedir_rc-3006-0rc1"]' rockylinux-8: @@ -515,7 +515,7 @@ jobs: distro-slug: rockylinux-8 display-name: Rocky Linux 8 timeout: 20 - instances: '["stable-3004", "stable-3005", "onedir-3005", "latest", "onedir-nightly", "onedir_rc-3006.0rc1"]' + instances: '["stable-3004", "stable-3005", "onedir-3005", "latest", "onedir-nightly", "onedir_rc-3006-0rc1"]' rockylinux-9: @@ -529,7 +529,7 @@ jobs: distro-slug: rockylinux-9 display-name: Rocky Linux 9 timeout: 20 - instances: '["git-3005", "onedir-3005", "git-master", "onedir-nightly", "onedir_rc-3006.0rc1"]' + instances: '["git-3005", "onedir-3005", "git-master", "onedir-nightly", "onedir_rc-3006-0rc1"]' ubuntu-2004: @@ -543,7 +543,7 @@ jobs: distro-slug: ubuntu-2004 display-name: Ubuntu 20.04 timeout: 20 - instances: '["stable-3003", "stable-3004", "stable-3005", "onedir-3005", "git-master", "latest", "onedir-nightly", "onedir_rc-3006.0rc1"]' + instances: '["stable-3003", "stable-3004", "stable-3005", "onedir-3005", "git-master", "latest", "onedir-nightly", "onedir_rc-3006-0rc1"]' ubuntu-2204: @@ -557,7 +557,7 @@ jobs: distro-slug: ubuntu-2204 display-name: Ubuntu 22.04 timeout: 20 - instances: '["stable-3004", "stable-3005", "onedir-3005", "git-master", "latest", "onedir-nightly", "onedir_rc-3006.0rc1"]' + instances: '["stable-3004", "stable-3005", "onedir-3005", "git-master", "latest", "onedir-nightly", "onedir_rc-3006-0rc1"]' set-pipeline-exit-status: diff --git a/.github/workflows/templates/generate.py b/.github/workflows/templates/generate.py index b003f07..19f9459 100755 --- a/.github/workflows/templates/generate.py +++ b/.github/workflows/templates/generate.py @@ -218,7 +218,7 @@ SALT_VERSIONS = [ "master", "latest", "nightly", - "3006.0rc1", + "3006-0rc1", ] ONEDIR_SALT_VERSIONS = [ @@ -228,7 +228,7 @@ ONEDIR_SALT_VERSIONS = [ ] ONEDIR_RC_SALT_VERSIONS = [ - "3006.0rc1", + "3006-0rc1", ] VERSION_DISPLAY_NAMES = { @@ -243,12 +243,12 @@ VERSION_DISPLAY_NAMES = { STABLE_VERSION_BLACKLIST = [ "master", "nightly", - "3006.0rc1", + "3006-0rc1", ] GIT_VERSION_BLACKLIST = [ "nightly", - "3006.0rc1", + "3006-0rc1", ] # TODO: Revert the commit relating to this section, once the Git-based builds diff --git a/kitchen.yml b/kitchen.yml index 854d08d..a730232 100644 --- a/kitchen.yml +++ b/kitchen.yml @@ -265,7 +265,7 @@ suites: salt_version: 3005 salt_bootstrap_options: -MP onedir %s - - name: onedir-rc-3006.0rc1 + - name: onedir-rc-3006-0rc1 provisioner: salt_version: 3006.0rc1 salt_bootstrap_options: -R staging.repo.saltproject.io -MP onedir_rc %s From 605902d931f79f2e82b6bcd22b9d6a63a565dc00 Mon Sep 17 00:00:00 2001 From: "Gareth J. Greenaway" Date: Tue, 14 Mar 2023 17:14:25 -0700 Subject: [PATCH 099/104] swap out the dash for an underscore, onedir-rc to onedir_rc --- kitchen.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kitchen.yml b/kitchen.yml index a730232..c3d4a9c 100644 --- a/kitchen.yml +++ b/kitchen.yml @@ -265,7 +265,7 @@ suites: salt_version: 3005 salt_bootstrap_options: -MP onedir %s - - name: onedir-rc-3006-0rc1 + - name: onedir_rc-3006-0rc1 provisioner: salt_version: 3006.0rc1 salt_bootstrap_options: -R staging.repo.saltproject.io -MP onedir_rc %s From 52e4f97fa9857235153b39cfe06f8c63be40d998 Mon Sep 17 00:00:00 2001 From: "Gareth J. Greenaway" Date: Tue, 14 Mar 2023 17:24:01 -0700 Subject: [PATCH 100/104] swap out the dash for an underscore, onedir-rc to onedir_rc --- .github/workflows/ci.yml | 28 ++++++++++++------------- .github/workflows/templates/generate.py | 4 ++-- kitchen.yml | 2 +- 3 files changed, 17 insertions(+), 17 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index dbde501..573f16f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -249,7 +249,7 @@ jobs: distro-slug: almalinux-8 display-name: AlmaLinux 8 timeout: 20 - instances: '["stable-3003", "stable-3004", "stable-3005", "onedir-3005", "latest", "onedir-nightly", "onedir_rc-3006-0rc1"]' + instances: '["stable-3003", "stable-3004", "stable-3005", "onedir-3005", "latest", "onedir-nightly", "onedir-rc-3006-0rc1"]' almalinux-9: @@ -263,7 +263,7 @@ jobs: distro-slug: almalinux-9 display-name: AlmaLinux 9 timeout: 20 - instances: '["git-3005", "onedir-3005", "git-master", "onedir-nightly", "onedir_rc-3006-0rc1"]' + instances: '["git-3005", "onedir-3005", "git-master", "onedir-nightly", "onedir-rc-3006-0rc1"]' amazon-2: @@ -277,7 +277,7 @@ jobs: distro-slug: amazon-2 display-name: Amazon 2 timeout: 20 - instances: '["stable-3003", "stable-3004", "stable-3005", "onedir-3005", "git-master", "latest", "onedir-nightly", "onedir_rc-3006-0rc1"]' + instances: '["stable-3003", "stable-3004", "stable-3005", "onedir-3005", "git-master", "latest", "onedir-nightly", "onedir-rc-3006-0rc1"]' arch: @@ -305,7 +305,7 @@ jobs: distro-slug: centos-7 display-name: CentOS 7 timeout: 20 - instances: '["stable-3003", "stable-3004", "stable-3005", "onedir-3005", "latest", "onedir-nightly", "onedir_rc-3006-0rc1"]' + instances: '["stable-3003", "stable-3004", "stable-3005", "onedir-3005", "latest", "onedir-nightly", "onedir-rc-3006-0rc1"]' centos-stream8: @@ -319,7 +319,7 @@ jobs: distro-slug: centos-stream8 display-name: CentOS Stream 8 timeout: 20 - instances: '["stable-3003", "stable-3004", "stable-3005", "onedir-3005", "latest", "onedir-nightly", "onedir_rc-3006-0rc1"]' + instances: '["stable-3003", "stable-3004", "stable-3005", "onedir-3005", "latest", "onedir-nightly", "onedir-rc-3006-0rc1"]' centos-stream9: @@ -333,7 +333,7 @@ jobs: distro-slug: centos-stream9 display-name: CentOS Stream 9 timeout: 20 - instances: '["git-3005", "onedir-3005", "git-master", "onedir-nightly", "onedir_rc-3006-0rc1"]' + instances: '["git-3005", "onedir-3005", "git-master", "onedir-nightly", "onedir-rc-3006-0rc1"]' debian-10: @@ -347,7 +347,7 @@ jobs: distro-slug: debian-10 display-name: Debian 10 timeout: 20 - instances: '["stable-3003", "stable-3004", "stable-3005", "onedir-3005", "git-master", "latest", "onedir-nightly", "onedir_rc-3006-0rc1"]' + instances: '["stable-3003", "stable-3004", "stable-3005", "onedir-3005", "git-master", "latest", "onedir-nightly", "onedir-rc-3006-0rc1"]' debian-11: @@ -361,7 +361,7 @@ jobs: distro-slug: debian-11 display-name: Debian 11 timeout: 20 - instances: '["stable-3004", "stable-3005", "onedir-3005", "git-master", "latest", "onedir-nightly", "onedir_rc-3006-0rc1"]' + instances: '["stable-3004", "stable-3005", "onedir-3005", "git-master", "latest", "onedir-nightly", "onedir-rc-3006-0rc1"]' fedora-35: @@ -487,7 +487,7 @@ jobs: distro-slug: oraclelinux-7 display-name: Oracle Linux 7 timeout: 20 - instances: '["stable-3003", "stable-3004", "stable-3005", "onedir-3005", "latest", "onedir-nightly", "onedir_rc-3006-0rc1"]' + instances: '["stable-3003", "stable-3004", "stable-3005", "onedir-3005", "latest", "onedir-nightly", "onedir-rc-3006-0rc1"]' oraclelinux-8: @@ -501,7 +501,7 @@ jobs: distro-slug: oraclelinux-8 display-name: Oracle Linux 8 timeout: 20 - instances: '["stable-3003", "stable-3004", "stable-3005", "onedir-3005", "latest", "onedir-nightly", "onedir_rc-3006-0rc1"]' + instances: '["stable-3003", "stable-3004", "stable-3005", "onedir-3005", "latest", "onedir-nightly", "onedir-rc-3006-0rc1"]' rockylinux-8: @@ -515,7 +515,7 @@ jobs: distro-slug: rockylinux-8 display-name: Rocky Linux 8 timeout: 20 - instances: '["stable-3004", "stable-3005", "onedir-3005", "latest", "onedir-nightly", "onedir_rc-3006-0rc1"]' + instances: '["stable-3004", "stable-3005", "onedir-3005", "latest", "onedir-nightly", "onedir-rc-3006-0rc1"]' rockylinux-9: @@ -529,7 +529,7 @@ jobs: distro-slug: rockylinux-9 display-name: Rocky Linux 9 timeout: 20 - instances: '["git-3005", "onedir-3005", "git-master", "onedir-nightly", "onedir_rc-3006-0rc1"]' + instances: '["git-3005", "onedir-3005", "git-master", "onedir-nightly", "onedir-rc-3006-0rc1"]' ubuntu-2004: @@ -543,7 +543,7 @@ jobs: distro-slug: ubuntu-2004 display-name: Ubuntu 20.04 timeout: 20 - instances: '["stable-3003", "stable-3004", "stable-3005", "onedir-3005", "git-master", "latest", "onedir-nightly", "onedir_rc-3006-0rc1"]' + instances: '["stable-3003", "stable-3004", "stable-3005", "onedir-3005", "git-master", "latest", "onedir-nightly", "onedir-rc-3006-0rc1"]' ubuntu-2204: @@ -557,7 +557,7 @@ jobs: distro-slug: ubuntu-2204 display-name: Ubuntu 22.04 timeout: 20 - instances: '["stable-3004", "stable-3005", "onedir-3005", "git-master", "latest", "onedir-nightly", "onedir_rc-3006-0rc1"]' + instances: '["stable-3004", "stable-3005", "onedir-3005", "git-master", "latest", "onedir-nightly", "onedir-rc-3006-0rc1"]' set-pipeline-exit-status: diff --git a/.github/workflows/templates/generate.py b/.github/workflows/templates/generate.py index 19f9459..150f711 100755 --- a/.github/workflows/templates/generate.py +++ b/.github/workflows/templates/generate.py @@ -518,14 +518,14 @@ def generate_test_jobs(): instances.append(salt_version) continue - for bootstrap_type in ("stable", "git", "onedir", "onedir_rc"): + for bootstrap_type in ("stable", "git", "onedir", "onedir-rc"): if bootstrap_type == "onedir": if salt_version not in ONEDIR_SALT_VERSIONS: continue if distro not in ONEDIR_DISTROS: continue - if bootstrap_type == "onedir_rc": + if bootstrap_type == "onedir-rc": if salt_version not in ONEDIR_RC_SALT_VERSIONS: continue if distro not in ONEDIR_RC_DISTROS: diff --git a/kitchen.yml b/kitchen.yml index c3d4a9c..a730232 100644 --- a/kitchen.yml +++ b/kitchen.yml @@ -265,7 +265,7 @@ suites: salt_version: 3005 salt_bootstrap_options: -MP onedir %s - - name: onedir_rc-3006-0rc1 + - name: onedir-rc-3006-0rc1 provisioner: salt_version: 3006.0rc1 salt_bootstrap_options: -R staging.repo.saltproject.io -MP onedir_rc %s From b3c3753f424604d9d87ad8463439b8ee6ee37e7f Mon Sep 17 00:00:00 2001 From: "Gareth J. Greenaway" Date: Wed, 15 Mar 2023 07:45:46 -0700 Subject: [PATCH 101/104] Fixing Amazon2 GPG key for releases 3006 and higher. --- bootstrap-salt.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh index 568d91f..e875055 100755 --- a/bootstrap-salt.sh +++ b/bootstrap-salt.sh @@ -6302,7 +6302,7 @@ install_amazon_linux_ami_2_onedir_deps() { gpg_key="${base_url}SALTSTACK-GPG-KEY.pub" fi else - gpg_key="${base_url}SALTSTACK-GPG-PUBKEY-2023.pub" + gpg_key="${base_url}SALT-PROJECT-GPG-PUBKEY-2023.pub" fi # This should prob be refactored to use __install_saltstack_rhel_repository() From ec4df56749dbe3206dfc1b4b8fa634a66f5a8ea6 Mon Sep 17 00:00:00 2001 From: "Gareth J. Greenaway" Date: Wed, 15 Mar 2023 17:41:00 -0700 Subject: [PATCH 102/104] Add a workaround for stable 3005 and latest on CentOS Stream 8 --- bootstrap-salt.sh | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh index e875055..df46974 100755 --- a/bootstrap-salt.sh +++ b/bootstrap-salt.sh @@ -4643,6 +4643,13 @@ install_centos_stable() { # shellcheck disable=SC2086 __yum_install_noinput ${__PACKAGES} || return 1 + # Workaround for 3.11 broken on CentOS Stream 8.x + # Re-install Python 3.6 + _py_version=$(${_PY_EXE} -c "import sys; print('{0}.{1}'.format(*sys.version_info))") + if [ "$DISTRO_MAJOR_VERSION" -eq 8 ] && [ "${_py_version}" = "3.11" ]; then + __yum_install_noinput python3 + fi + return 0 } From c009da691f83e2a1f3f690ccc5275c91c2832fd9 Mon Sep 17 00:00:00 2001 From: "Gareth J. Greenaway" Date: Sun, 19 Mar 2023 14:14:48 -0700 Subject: [PATCH 103/104] Adding 3006.0rc2 to bootstrap tests. --- .github/workflows/ci.yml | 28 ++++++++++++------------- .github/workflows/templates/generate.py | 4 ++++ kitchen.yml | 20 ++++++++++++++++++ 3 files changed, 38 insertions(+), 14 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 573f16f..0e01c95 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -249,7 +249,7 @@ jobs: distro-slug: almalinux-8 display-name: AlmaLinux 8 timeout: 20 - instances: '["stable-3003", "stable-3004", "stable-3005", "onedir-3005", "latest", "onedir-nightly", "onedir-rc-3006-0rc1"]' + instances: '["stable-3003", "stable-3004", "stable-3005", "onedir-3005", "latest", "onedir-nightly", "onedir-rc-3006-0rc1", "onedir-rc-3006-0rc2"]' almalinux-9: @@ -263,7 +263,7 @@ jobs: distro-slug: almalinux-9 display-name: AlmaLinux 9 timeout: 20 - instances: '["git-3005", "onedir-3005", "git-master", "onedir-nightly", "onedir-rc-3006-0rc1"]' + instances: '["git-3005", "onedir-3005", "git-master", "onedir-nightly", "onedir-rc-3006-0rc1", "onedir-rc-3006-0rc2"]' amazon-2: @@ -277,7 +277,7 @@ jobs: distro-slug: amazon-2 display-name: Amazon 2 timeout: 20 - instances: '["stable-3003", "stable-3004", "stable-3005", "onedir-3005", "git-master", "latest", "onedir-nightly", "onedir-rc-3006-0rc1"]' + instances: '["stable-3003", "stable-3004", "stable-3005", "onedir-3005", "git-master", "latest", "onedir-nightly", "onedir-rc-3006-0rc1", "onedir-rc-3006-0rc2"]' arch: @@ -305,7 +305,7 @@ jobs: distro-slug: centos-7 display-name: CentOS 7 timeout: 20 - instances: '["stable-3003", "stable-3004", "stable-3005", "onedir-3005", "latest", "onedir-nightly", "onedir-rc-3006-0rc1"]' + instances: '["stable-3003", "stable-3004", "stable-3005", "onedir-3005", "latest", "onedir-nightly", "onedir-rc-3006-0rc1", "onedir-rc-3006-0rc2"]' centos-stream8: @@ -319,7 +319,7 @@ jobs: distro-slug: centos-stream8 display-name: CentOS Stream 8 timeout: 20 - instances: '["stable-3003", "stable-3004", "stable-3005", "onedir-3005", "latest", "onedir-nightly", "onedir-rc-3006-0rc1"]' + instances: '["stable-3003", "stable-3004", "stable-3005", "onedir-3005", "latest", "onedir-nightly", "onedir-rc-3006-0rc1", "onedir-rc-3006-0rc2"]' centos-stream9: @@ -333,7 +333,7 @@ jobs: distro-slug: centos-stream9 display-name: CentOS Stream 9 timeout: 20 - instances: '["git-3005", "onedir-3005", "git-master", "onedir-nightly", "onedir-rc-3006-0rc1"]' + instances: '["git-3005", "onedir-3005", "git-master", "onedir-nightly", "onedir-rc-3006-0rc1", "onedir-rc-3006-0rc2"]' debian-10: @@ -347,7 +347,7 @@ jobs: distro-slug: debian-10 display-name: Debian 10 timeout: 20 - instances: '["stable-3003", "stable-3004", "stable-3005", "onedir-3005", "git-master", "latest", "onedir-nightly", "onedir-rc-3006-0rc1"]' + instances: '["stable-3003", "stable-3004", "stable-3005", "onedir-3005", "git-master", "latest", "onedir-nightly", "onedir-rc-3006-0rc1", "onedir-rc-3006-0rc2"]' debian-11: @@ -361,7 +361,7 @@ jobs: distro-slug: debian-11 display-name: Debian 11 timeout: 20 - instances: '["stable-3004", "stable-3005", "onedir-3005", "git-master", "latest", "onedir-nightly", "onedir-rc-3006-0rc1"]' + instances: '["stable-3004", "stable-3005", "onedir-3005", "git-master", "latest", "onedir-nightly", "onedir-rc-3006-0rc1", "onedir-rc-3006-0rc2"]' fedora-35: @@ -487,7 +487,7 @@ jobs: distro-slug: oraclelinux-7 display-name: Oracle Linux 7 timeout: 20 - instances: '["stable-3003", "stable-3004", "stable-3005", "onedir-3005", "latest", "onedir-nightly", "onedir-rc-3006-0rc1"]' + instances: '["stable-3003", "stable-3004", "stable-3005", "onedir-3005", "latest", "onedir-nightly", "onedir-rc-3006-0rc1", "onedir-rc-3006-0rc2"]' oraclelinux-8: @@ -501,7 +501,7 @@ jobs: distro-slug: oraclelinux-8 display-name: Oracle Linux 8 timeout: 20 - instances: '["stable-3003", "stable-3004", "stable-3005", "onedir-3005", "latest", "onedir-nightly", "onedir-rc-3006-0rc1"]' + instances: '["stable-3003", "stable-3004", "stable-3005", "onedir-3005", "latest", "onedir-nightly", "onedir-rc-3006-0rc1", "onedir-rc-3006-0rc2"]' rockylinux-8: @@ -515,7 +515,7 @@ jobs: distro-slug: rockylinux-8 display-name: Rocky Linux 8 timeout: 20 - instances: '["stable-3004", "stable-3005", "onedir-3005", "latest", "onedir-nightly", "onedir-rc-3006-0rc1"]' + instances: '["stable-3004", "stable-3005", "onedir-3005", "latest", "onedir-nightly", "onedir-rc-3006-0rc1", "onedir-rc-3006-0rc2"]' rockylinux-9: @@ -529,7 +529,7 @@ jobs: distro-slug: rockylinux-9 display-name: Rocky Linux 9 timeout: 20 - instances: '["git-3005", "onedir-3005", "git-master", "onedir-nightly", "onedir-rc-3006-0rc1"]' + instances: '["git-3005", "onedir-3005", "git-master", "onedir-nightly", "onedir-rc-3006-0rc1", "onedir-rc-3006-0rc2"]' ubuntu-2004: @@ -543,7 +543,7 @@ jobs: distro-slug: ubuntu-2004 display-name: Ubuntu 20.04 timeout: 20 - instances: '["stable-3003", "stable-3004", "stable-3005", "onedir-3005", "git-master", "latest", "onedir-nightly", "onedir-rc-3006-0rc1"]' + instances: '["stable-3003", "stable-3004", "stable-3005", "onedir-3005", "git-master", "latest", "onedir-nightly", "onedir-rc-3006-0rc1", "onedir-rc-3006-0rc2"]' ubuntu-2204: @@ -557,7 +557,7 @@ jobs: distro-slug: ubuntu-2204 display-name: Ubuntu 22.04 timeout: 20 - instances: '["stable-3004", "stable-3005", "onedir-3005", "git-master", "latest", "onedir-nightly", "onedir-rc-3006-0rc1"]' + instances: '["stable-3004", "stable-3005", "onedir-3005", "git-master", "latest", "onedir-nightly", "onedir-rc-3006-0rc1", "onedir-rc-3006-0rc2"]' set-pipeline-exit-status: diff --git a/.github/workflows/templates/generate.py b/.github/workflows/templates/generate.py index 150f711..a966c17 100755 --- a/.github/workflows/templates/generate.py +++ b/.github/workflows/templates/generate.py @@ -219,6 +219,7 @@ SALT_VERSIONS = [ "latest", "nightly", "3006-0rc1", + "3006-0rc2", ] ONEDIR_SALT_VERSIONS = [ @@ -229,6 +230,7 @@ ONEDIR_SALT_VERSIONS = [ ONEDIR_RC_SALT_VERSIONS = [ "3006-0rc1", + "3006-0rc2", ] VERSION_DISPLAY_NAMES = { @@ -244,11 +246,13 @@ STABLE_VERSION_BLACKLIST = [ "master", "nightly", "3006-0rc1", + "3006-0rc2", ] GIT_VERSION_BLACKLIST = [ "nightly", "3006-0rc1", + "3006-0rc2", ] # TODO: Revert the commit relating to this section, once the Git-based builds diff --git a/kitchen.yml b/kitchen.yml index a730232..8ff0c11 100644 --- a/kitchen.yml +++ b/kitchen.yml @@ -42,6 +42,12 @@ platforms: platform: rhel provision_command: - yum -y install procps-ng + - name: amazon-2023 + driver: + image: amazonlinux:2023 + platform: fedora + provision_command: + - yum -y install procps-ng - name: arch driver: image: archlinux/archlinux @@ -265,6 +271,20 @@ suites: salt_version: 3005 salt_bootstrap_options: -MP onedir %s + - name: onedir-rc-3006-0rc2 + provisioner: + salt_version: 3006.0rc2 + salt_bootstrap_options: -R staging.repo.saltproject.io -MP onedir_rc %s + excludes: + - arch + - freebsd-131 + - freebsd-123 + - gentoo + - openbsd-6 + - opensuse-15 + - opensuse-tumbleweed + - ubuntu-1804 + - name: onedir-rc-3006-0rc1 provisioner: salt_version: 3006.0rc1 From 08708a031046b3842edb9f6611d223709cc7f4ad Mon Sep 17 00:00:00 2001 From: "github-actions[bot] on behalf of garethgreenaway" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 6 Apr 2023 17:46:46 +0000 Subject: [PATCH 104/104] Update develop branch for the v2023.04.06 release --- CHANGELOG.md | 33 +++++++++++++++++++++++++++++++++ bootstrap-salt.sh | 2 +- 2 files changed, 34 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 01c81cb..277008e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,36 @@ +# v2023.04.06 + +## What's Changed + +- Fix missing functions for post-installation on EL clones by @ggiesen in https://github.com/saltstack/salt-bootstrap/pull/1877 +- Support for dotZero in version beginning in 3006 by @garethgreenaway in https://github.com/saltstack/salt-bootstrap/pull/1879 +- Update gemfile by @garethgreenaway in https://github.com/saltstack/salt-bootstrap/pull/1882 +- update openbsd to 7, seems like 6 (6.9) is no longer available. by @garethgreenaway in https://github.com/saltstack/salt-bootstrap/pull/1881 +- Adding tests for installing onedir packages by @garethgreenaway in https://github.com/saltstack/salt-bootstrap/pull/1880 +- Removing EPEL, which is no longer needed. by @garethgreenaway in https://github.com/saltstack/salt-bootstrap/pull/1884 +- Add support for the -R flag on macOS. by @pjcreath in https://github.com/saltstack/salt-bootstrap/pull/1871 +- feat: add `onedir nightly` support by @myii in https://github.com/saltstack/salt-bootstrap/pull/1885 +- ci: add `fedora-37` & `fedora-38` by @myii in https://github.com/saltstack/salt-bootstrap/pull/1840 +- Debian ARM Fix by @garethgreenaway in https://github.com/saltstack/salt-bootstrap/pull/1887 +- Added Pop!\_OS as a Ubuntu derivative by @shombando in https://github.com/saltstack/salt-bootstrap/pull/1888 +- Don't attempt to stable install on Red Hat onedir only systems by @garethgreenaway in https://github.com/saltstack/salt-bootstrap/pull/1889 +- \[docs\] Improve Windows readme instructions and links in script by @dafyddj in https://github.com/saltstack/salt-bootstrap/pull/1897 +- Adding newer versions of CentOS Stream and AlmaLinux by @garethgreenaway in https://github.com/saltstack/salt-bootstrap/pull/1890 +- Add support for KDE neon based on Ubuntu 22.04 by @digitalkram in https://github.com/saltstack/salt-bootstrap/pull/1894 +- Removing Ubuntu 16.04 by @garethgreenaway in https://github.com/saltstack/salt-bootstrap/pull/1886 +- Adding rockylinux 9 by @garethgreenaway in https://github.com/saltstack/salt-bootstrap/pull/1899 +- Bootstrap fixes for 3006 by @garethgreenaway in https://github.com/saltstack/salt-bootstrap/pull/1900 +- Adding 3006.0rc1 to Github actions. by @garethgreenaway in https://github.com/saltstack/salt-bootstrap/pull/1901 +- Adding 3006.0rc2 to bootstrap tests. by @garethgreenaway in https://github.com/saltstack/salt-bootstrap/pull/1902 + +## New Contributors + +- @ggiesen made their first contribution in https://github.com/saltstack/salt-bootstrap/pull/1877 +- @shombando made their first contribution in https://github.com/saltstack/salt-bootstrap/pull/1888 +- @digitalkram made their first contribution in https://github.com/saltstack/salt-bootstrap/pull/1894 + +**Full Changelog**: https://github.com/saltstack/salt-bootstrap/compare/v2022.10.04...v2023.04.06 + # v2022.10.04 ## What's Changed diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh index df46974..e35fb12 100755 --- a/bootstrap-salt.sh +++ b/bootstrap-salt.sh @@ -23,7 +23,7 @@ #====================================================================================================================== set -o nounset # Treat unset variables as an error -__ScriptVersion="2022.10.04" +__ScriptVersion="2023.04.06" __ScriptName="bootstrap-salt.sh" __ScriptFullName="$0"