Code

Fixes for 3006#1912

Code

Merged

garethgreenaway merged 20 commits intodevelopsaltstack/salt-bootstrap:developfrom adding_3006_to_testssaltstack/salt-bootstrap:adding_3006_to_testsCopy head branch name to clipboardApr 21, 2023

+129-71

Commits

Commits on Apr 18, 2023

• Adding 3006 to tests.

  garethgreenaway

  committed
  90cc157

Commits on Apr 19, 2023

• Update to MacOS latest install. Need to install procps on onedir centos installs.

  garethgreenaway

  committed
  27eef7d

• removing check for different GPG keys for latest & nightly now that 3006 is available with the new GPG format.

  garethgreenaway

  committed
  ef70886

• Adding 3006.0 to kitchen.windows.yml and kitchen.macos.yml

  garethgreenaway

  committed
  717db99

• couple places that 3006 is needed for git installs.

  garethgreenaway

  committed
  1367b09

• updating kitchen.yml with 3006.

  garethgreenaway

  committed
  e1fd498

• fixing 3006 tag name

  garethgreenaway

  committed
  d8a7e90

• fixing version for git-3006.

  garethgreenaway

  committed
  6dbae5e

• removing check for whether to use the new GPG key.

  garethgreenaway

  committed
  142eb80

• Some fixes for MacOS.

  garethgreenaway

  committed
  f823932

• More MacOS fixes.

  garethgreenaway

  committed
  a3fed78

Commits on Apr 20, 2023

• Fixing bootstrap and CICD to install via tag only if version begins with v and use branch otherwise.

  garethgreenaway

  committed
  a8b32ab

• fixing kitchen.yml for git installs.

  garethgreenaway

  committed
  719422a

• If the passed version begins with v, eg. it's a tag, remove it before comparison.

  garethgreenaway

  committed
  e7c8f76

• revert GIT_VERSIONS code.

  garethgreenaway

  committed
  c2c6bd1

• Fixing kitchen.yml file.

  garethgreenaway

  committed
  d9a8f4a

• account for salt_version ending in .x, eg. 3006.x branch.

  garethgreenaway

  committed
  8d02826

Commits on Apr 21, 2023

• Revert to installing 3006 from the tag but blacklist any distribution that was running it until 3006.1 is out.

  garethgreenaway

  committed
  7825da5

• removing nightly from onedir until S3 buckets are fixed.

  garethgreenaway

  committed
  3c8b08c

• merging upstream

  garethgreenaway

  committed
  3d29c38