mirror of
https://github.com/saltstack/salt-bootstrap.git
synced 2025-04-17 10:10:25 +00:00
Get version from instance name
This commit is contained in:
twangboy
parent
7c350c4f48
commit
f1a5e97125
7 changed files with 13 additions and 307 deletions
12
.github/workflows/test-windows.yml
vendored
12
.github/workflows/test-windows.yml
vendored
|
|
@ -62,6 +62,18 @@ jobs:
|
||||||
}
|
}
|
||||||
Write-Output "SaltVersion=$version" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
|
Write-Output "SaltVersion=$version" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
|
||||||
|
|
||||||
|
- name: Get Version
|
||||||
|
run: |
|
||||||
|
# We need to get the version here and make it an environment variable
|
||||||
|
# It is used to install via bootstrap and in the test
|
||||||
|
# The version is in the instance name
|
||||||
|
$instance = "${{ matrix.instance }}"
|
||||||
|
$version = $instance -split "-",2
|
||||||
|
if ( $version.Count -gt 1 ) {
|
||||||
|
$version = $version[1].Replace("-", ".")
|
||||||
|
}
|
||||||
|
Write-Output "SaltVersion=$version" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
|
||||||
|
|
||||||
- name: Bootstrap Salt
|
- name: Bootstrap Salt
|
||||||
run: |
|
run: |
|
||||||
. .\bootstrap-salt.ps1 -RunService $false -Version $env:SaltVersion
|
. .\bootstrap-salt.ps1 -RunService $false -Version $env:SaltVersion
|
||||||
|
|
|
||||||
6
.gitignore
vendored
6
.gitignore
vendored
|
|
@ -8,9 +8,3 @@ venv
|
||||||
|
|
||||||
# Pycharm
|
# Pycharm
|
||||||
.idea
|
.idea
|
||||||
|
|
||||||
# test-kitchen
|
|
||||||
.kitchen.local.yml
|
|
||||||
kitchen.local.yml
|
|
||||||
.kitchen/
|
|
||||||
.bundle/
|
|
||||||
|
|
|
||||||
11
Gemfile
11
Gemfile
|
|
@ -1,11 +0,0 @@
|
||||||
# frozen_string_literal: true
|
|
||||||
|
|
||||||
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'
|
|
||||||
|
|
||||||
group :vagrant do
|
|
||||||
gem 'kitchen-vagrant'
|
|
||||||
end
|
|
||||||
119
Vagrantfile
vendored
119
Vagrantfile
vendored
|
|
@ -1,119 +0,0 @@
|
||||||
# -*- mode: ruby -*-
|
|
||||||
# vi: set ft=ruby :
|
|
||||||
|
|
||||||
# Vagrantfile API/syntax version. Don't touch unless you know what you're doing!
|
|
||||||
VAGRANTFILE_API_VERSION = "2"
|
|
||||||
|
|
||||||
Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
|
|
||||||
# All Vagrant configuration is done here. The most common configuration
|
|
||||||
# options are documented and commented below. For a complete reference,
|
|
||||||
# please see the online documentation at vagrantup.com.
|
|
||||||
|
|
||||||
# Every Vagrant virtual environment requires a box to build off of.
|
|
||||||
config.vm.box = "ubuntu/focal64"
|
|
||||||
|
|
||||||
# The url from where the 'config.vm.box' box will be fetched if it
|
|
||||||
# doesn't already exist on the user's system.
|
|
||||||
# config.vm.box_url = "http://domain.com/path/to/above.box"
|
|
||||||
|
|
||||||
# Create a forwarded port mapping which allows access to a specific port
|
|
||||||
# within the machine from a port on the host machine. In the example below,
|
|
||||||
# accessing "localhost:8080" will access port 80 on the guest machine.
|
|
||||||
# config.vm.network :forwarded_port, guest: 80, host: 8080
|
|
||||||
|
|
||||||
# Create a private network, which allows host-only access to the machine
|
|
||||||
# using a specific IP.
|
|
||||||
# config.vm.network :private_network, ip: "192.168.33.10"
|
|
||||||
|
|
||||||
# Create a public network, which generally matched to bridged network.
|
|
||||||
# Bridged networks make the machine appear as another physical device on
|
|
||||||
# your network.
|
|
||||||
# config.vm.network :public_network
|
|
||||||
|
|
||||||
# If true, then any SSH connections made will enable agent forwarding.
|
|
||||||
# Default value: false
|
|
||||||
# config.ssh.forward_agent = true
|
|
||||||
|
|
||||||
# Share an additional folder to the guest VM. The first argument is
|
|
||||||
# the path on the host to the actual folder. The second argument is
|
|
||||||
# the path on the guest to mount the folder. And the optional third
|
|
||||||
# argument is a set of non-required options.
|
|
||||||
config.vm.synced_folder ".", "/salt_bootstrap"
|
|
||||||
|
|
||||||
config.vm.provision "shell", path: "bootstrap-salt.sh"
|
|
||||||
# Provider-specific configuration so you can fine-tune various
|
|
||||||
# backing providers for Vagrant. These expose provider-specific options.
|
|
||||||
# Example for VirtualBox:
|
|
||||||
#
|
|
||||||
# config.vm.provider :virtualbox do |vb|
|
|
||||||
# # Don't boot with headless mode
|
|
||||||
# vb.gui = true
|
|
||||||
#
|
|
||||||
# # Use VBoxManage to customize the VM. For example to change memory:
|
|
||||||
# vb.customize ["modifyvm", :id, "--memory", "1024"]
|
|
||||||
# end
|
|
||||||
#
|
|
||||||
# View the documentation for the provider you're using for more
|
|
||||||
# information on available options.
|
|
||||||
|
|
||||||
# Enable provisioning with Puppet stand alone. Puppet manifests
|
|
||||||
# are contained in a directory path relative to this Vagrantfile.
|
|
||||||
# You will need to create the manifests directory and a manifest in
|
|
||||||
# the file precise64.pp in the manifests_path directory.
|
|
||||||
#
|
|
||||||
# An example Puppet manifest to provision the message of the day:
|
|
||||||
#
|
|
||||||
# # group { "puppet":
|
|
||||||
# # ensure => "present",
|
|
||||||
# # }
|
|
||||||
# #
|
|
||||||
# # File { owner => 0, group => 0, mode => 0644 }
|
|
||||||
# #
|
|
||||||
# # file { '/etc/motd':
|
|
||||||
# # content => "Welcome to your Vagrant-built virtual machine!
|
|
||||||
# # Managed by Puppet.\n"
|
|
||||||
# # }
|
|
||||||
#
|
|
||||||
# config.vm.provision :puppet do |puppet|
|
|
||||||
# puppet.manifests_path = "manifests"
|
|
||||||
# puppet.manifest_file = "site.pp"
|
|
||||||
# end
|
|
||||||
|
|
||||||
# Enable provisioning with chef solo, specifying a cookbooks path, roles
|
|
||||||
# path, and data_bags path (all relative to this Vagrantfile), and adding
|
|
||||||
# some recipes and/or roles.
|
|
||||||
#
|
|
||||||
# config.vm.provision :chef_solo do |chef|
|
|
||||||
# chef.cookbooks_path = "../my-recipes/cookbooks"
|
|
||||||
# chef.roles_path = "../my-recipes/roles"
|
|
||||||
# chef.data_bags_path = "../my-recipes/data_bags"
|
|
||||||
# chef.add_recipe "mysql"
|
|
||||||
# chef.add_role "web"
|
|
||||||
#
|
|
||||||
# # You may also specify custom JSON attributes:
|
|
||||||
# chef.json = { :mysql_password => "foo" }
|
|
||||||
# end
|
|
||||||
|
|
||||||
# Enable provisioning with chef server, specifying the chef server URL,
|
|
||||||
# and the path to the validation key (relative to this Vagrantfile).
|
|
||||||
#
|
|
||||||
# The Opscode Platform uses HTTPS. Substitute your organization for
|
|
||||||
# ORGNAME in the URL and validation key.
|
|
||||||
#
|
|
||||||
# If you have your own Chef Server, use the appropriate URL, which may be
|
|
||||||
# HTTP instead of HTTPS depending on your configuration. Also change the
|
|
||||||
# validation key to validation.pem.
|
|
||||||
#
|
|
||||||
# config.vm.provision :chef_client do |chef|
|
|
||||||
# chef.chef_server_url = "https://api.opscode.com/organizations/ORGNAME"
|
|
||||||
# chef.validation_key_path = "ORGNAME-validator.pem"
|
|
||||||
# end
|
|
||||||
#
|
|
||||||
# If you're using the Opscode platform, your validator client is
|
|
||||||
# ORGNAME-validator, replacing ORGNAME with your organization name.
|
|
||||||
#
|
|
||||||
# If you have your own Chef Server, the default validation client name is
|
|
||||||
# chef-validator, unless you changed the configuration.
|
|
||||||
#
|
|
||||||
# chef.validation_client_name = "ORGNAME-validator"
|
|
||||||
end
|
|
||||||
158
kitchen.yml
158
kitchen.yml
|
|
@ -1,158 +0,0 @@
|
||||||
---
|
|
||||||
driver:
|
|
||||||
name: docker
|
|
||||||
use_sudo: false
|
|
||||||
hostname: salt
|
|
||||||
privileged: true
|
|
||||||
username: root
|
|
||||||
cap_add:
|
|
||||||
- sys_admin
|
|
||||||
disable_upstart: false
|
|
||||||
use_internal_docker_network: false
|
|
||||||
run_command: /usr/lib/systemd/systemd
|
|
||||||
|
|
||||||
provisioner:
|
|
||||||
name: salt_solo
|
|
||||||
salt_install: bootstrap
|
|
||||||
salt_bootstrap_url: bootstrap-salt.sh
|
|
||||||
salt_bootstrap_options: -MPfq git %s
|
|
||||||
install_after_init_environment: true
|
|
||||||
log_level: info
|
|
||||||
sudo: false
|
|
||||||
require_chef: false
|
|
||||||
formula: tests
|
|
||||||
run_salt_call: false
|
|
||||||
init_environment: |
|
|
||||||
echo 'auto_accept: true' > /tmp/auto-accept-keys.conf
|
|
||||||
mkdir -p /etc/salt/master.d
|
|
||||||
mv /tmp/auto-accept-keys.conf /etc/salt/master.d/auto-accept-keys.conf
|
|
||||||
sh -c 't=$(shuf -i 1-15 -n 1); echo Sleeping $t seconds; sleep $t'
|
|
||||||
|
|
||||||
|
|
||||||
platforms:
|
|
||||||
- name: rockylinux-9
|
|
||||||
- name: ubuntu-24.04
|
|
||||||
driver:
|
|
||||||
run_command: /lib/systemd/systemd
|
|
||||||
provision_command:
|
|
||||||
- echo "PubkeyAcceptedAlgorithms +ssh-rsa" | tee -a /etc/ssh/sshd_config
|
|
||||||
|
|
||||||
suites:
|
|
||||||
- name: git-3006
|
|
||||||
provisioner:
|
|
||||||
salt_version: v3006
|
|
||||||
salt_bootstrap_options: -x python3 -MPfq git %s
|
|
||||||
excludes:
|
|
||||||
- opensuse-15
|
|
||||||
- opensuse-tumbleweed
|
|
||||||
- gentoo
|
|
||||||
- gentoo-systemd
|
|
||||||
- name: git-3006x
|
|
||||||
provisioner:
|
|
||||||
salt_version: 3006.x
|
|
||||||
salt_bootstrap_options: -x python3 -MPfq git %s
|
|
||||||
excludes:
|
|
||||||
- opensuse-15
|
|
||||||
- opensuse-tumbleweed
|
|
||||||
- gentoo
|
|
||||||
- gentoo-systemd
|
|
||||||
- name: git-3007
|
|
||||||
provisioner:
|
|
||||||
salt_version: v3007
|
|
||||||
salt_bootstrap_options: -x python3 -MPfq git %s
|
|
||||||
excludes:
|
|
||||||
- opensuse-15
|
|
||||||
- opensuse-tumbleweed
|
|
||||||
- gentoo
|
|
||||||
- gentoo-systemd
|
|
||||||
- name: git-3007x
|
|
||||||
provisioner:
|
|
||||||
salt_version: 3007.x
|
|
||||||
salt_bootstrap_options: -x python3 -MPfq git %s
|
|
||||||
excludes:
|
|
||||||
- opensuse-15
|
|
||||||
- opensuse-tumbleweed
|
|
||||||
- gentoo
|
|
||||||
- gentoo-systemd
|
|
||||||
- name: stable-3006
|
|
||||||
provisioner:
|
|
||||||
salt_version: 3006
|
|
||||||
salt_bootstrap_options: -x python3 -MP stable %s
|
|
||||||
excludes:
|
|
||||||
- opensuse-15
|
|
||||||
- opensuse-tumbleweed
|
|
||||||
- name: stable-3006-8
|
|
||||||
provisioner:
|
|
||||||
salt_version: 3006.8
|
|
||||||
salt_bootstrap_options: -x python3 -MP stable %s
|
|
||||||
excludes:
|
|
||||||
- opensuse-15
|
|
||||||
- opensuse-tumbleweed
|
|
||||||
- name: stable-3007
|
|
||||||
provisioner:
|
|
||||||
salt_version: 3007
|
|
||||||
salt_bootstrap_options: -x python3 -MP stable %s
|
|
||||||
excludes:
|
|
||||||
- opensuse-15
|
|
||||||
- opensuse-tumbleweed
|
|
||||||
- name: stable-3007-1
|
|
||||||
provisioner:
|
|
||||||
salt_version: 3007.1
|
|
||||||
salt_bootstrap_options: -x python3 -MP stable %s
|
|
||||||
excludes:
|
|
||||||
- opensuse-15
|
|
||||||
- opensuse-tumbleweed
|
|
||||||
- name: git-master
|
|
||||||
provisioner:
|
|
||||||
salt_version: master
|
|
||||||
salt_bootstrap_options: -x python3 -MPfq -D git %s
|
|
||||||
|
|
||||||
- name: latest
|
|
||||||
provisioner:
|
|
||||||
salt_version: latest
|
|
||||||
salt_bootstrap_options: -MP stable %s
|
|
||||||
|
|
||||||
- name: default
|
|
||||||
provisioner:
|
|
||||||
salt_version: latest
|
|
||||||
salt_bootstrap_options: -MP
|
|
||||||
|
|
||||||
- name: onedir-nightly
|
|
||||||
provisioner:
|
|
||||||
salt_version: nightly
|
|
||||||
salt_bootstrap_options: -MP onedir %s
|
|
||||||
|
|
||||||
- name: onedir-latest
|
|
||||||
provisioner:
|
|
||||||
salt_version: latest
|
|
||||||
salt_bootstrap_options: -MP onedir %s
|
|
||||||
|
|
||||||
- name: onedir-3006
|
|
||||||
provisioner:
|
|
||||||
salt_version: 3006
|
|
||||||
salt_bootstrap_options: -MP onedir %s
|
|
||||||
|
|
||||||
- name: onedir-3007
|
|
||||||
provisioner:
|
|
||||||
salt_version: 3007
|
|
||||||
salt_bootstrap_options: -MP onedir %s
|
|
||||||
|
|
||||||
- name: onedir-rc-3008-0rc1
|
|
||||||
provisioner:
|
|
||||||
salt_version: 3008.0rc1
|
|
||||||
salt_bootstrap_options: -R staging.repo.saltproject.io -MP onedir_rc %s
|
|
||||||
excludes:
|
|
||||||
- gentoo
|
|
||||||
- opensuse-15
|
|
||||||
- opensuse-tumbleweed
|
|
||||||
- ubuntu-2004
|
|
||||||
- ubuntu-2204
|
|
||||||
|
|
||||||
- name: quickstart
|
|
||||||
provisioner:
|
|
||||||
salt_bootstrap_options: -Q
|
|
||||||
|
|
||||||
verifier:
|
|
||||||
name: shell
|
|
||||||
remote_exec: false
|
|
||||||
command: pytest --cache-clear -v -s -ra --log-cli-level=info tests/integration/
|
|
||||||
|
|
@ -13,18 +13,7 @@ def target_python_version():
|
||||||
|
|
||||||
@pytest.fixture(scope="session")
|
@pytest.fixture(scope="session")
|
||||||
def target_salt_version():
|
def target_salt_version():
|
||||||
bootstrap_types = ("git", "stable", "onedir", "onedir_rc")
|
target_salt = os.environ.get("SaltVersion", "")
|
||||||
|
|
||||||
# filter out any bootstrap types and then join
|
|
||||||
target_salt = ".".join(
|
|
||||||
[
|
|
||||||
item
|
|
||||||
for item in os.environ.get("KITCHEN_SUITE", "").split("-")
|
|
||||||
if item not in bootstrap_types
|
|
||||||
]
|
|
||||||
)
|
|
||||||
|
|
||||||
# target_salt = os.environ["KITCHEN_SUITE"].split("-", 1)[-1].replace("-", ".")
|
|
||||||
|
|
||||||
if target_salt.startswith("v"):
|
if target_salt.startswith("v"):
|
||||||
target_salt = target_salt[1:]
|
target_salt = target_salt[1:]
|
||||||
|
|
|
||||||
|
|
@ -1 +0,0 @@
|
||||||
# -*- coding: utf-8 -*-
|
|
||||||
Loading…
Add table
Reference in a new issue