saltstack/salt-bootstrap
1
0
Fork 0
mirror of https://github.com/saltstack/salt-bootstrap.git synced 2025-04-16 09:40:21 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Increased tiemout to 40, updated to Ubuntu 24.04

Browse source
This commit is contained in:
David Murphy 2024-07-09 15:34:01 -06:00 • committed by Daniel Wozniak
parent 8ee4de5ca4
commit ca1d8d679f
5 changed files with 34 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

50
.github/workflows/ci.yml vendored
View file

@ -139,7 +139,7 @@ jobs:
with:
distro-slug: macos-12
display-name: macOS 12
timeout: 20
timeout: 40
runs-on: macos-12
instances: '["stable-3006", "stable-3006-8", "stable-3007", "stable-3007-1", "latest"]'
@ -154,7 +154,7 @@ jobs:
with:
distro-slug: macos-13
display-name: macOS 13
timeout: 20
timeout: 40
runs-on: macos-13
instances: '["stable-3006", "stable-3006-8", "stable-3007", "stable-3007-1", "latest"]'
@ -170,7 +170,7 @@ jobs:
with:
distro-slug: windows-2019
display-name: Windows 2019
timeout: 20
timeout: 40
runs-on: windows-2019
instances: '["stable-3006", "stable-3006-8", "stable-3007", "stable-3007-1", "latest"]'
@ -185,7 +185,7 @@ jobs:
with:
distro-slug: windows-2022
display-name: Windows 2022
timeout: 20
timeout: 40
runs-on: windows-2022
instances: '["stable-3006", "stable-3006-8", "stable-3007", "stable-3007-1", "latest"]'
@ -201,7 +201,7 @@ jobs:
with:
distro-slug: almalinux-8
display-name: AlmaLinux 8
timeout: 20
timeout: 40
instances: '["stable-3006", "onedir-3006", "stable-3006-8", "stable-3007", "onedir-3007", "stable-3007-1", "latest", "default"]'
@ -215,7 +215,7 @@ jobs:
with:
distro-slug: almalinux-9
display-name: AlmaLinux 9
timeout: 20
timeout: 40
instances: '["stable-3006", "onedir-3006", "stable-3006-8", "stable-3007", "onedir-3007", "stable-3007-1", "git-master", "latest", "default"]'
@ -229,7 +229,7 @@ jobs:
with:
distro-slug: amazon-2
display-name: Amazon 2
timeout: 20
timeout: 40
instances: '["stable-3006", "onedir-3006", "stable-3006-8", "stable-3007", "onedir-3007", "stable-3007-1", "latest", "default"]'
@ -243,7 +243,7 @@ jobs:
with:
distro-slug: amazon-2023
display-name: Amazon 2023
timeout: 20
timeout: 40
instances: '["stable-3006", "git-3006", "onedir-3006", "stable-3006-8", "stable-3007", "git-3007", "onedir-3007", "stable-3007-1", "git-master", "latest", "default"]'
@ -257,7 +257,7 @@ jobs:
with:
distro-slug: arch
display-name: Arch
timeout: 20
timeout: 40
instances: '["git-master", "latest", "default"]'
@ -271,7 +271,7 @@ jobs:
with:
distro-slug: centos-stream9
display-name: CentOS Stream 9
timeout: 20
timeout: 40
instances: '["stable-3006", "onedir-3006", "stable-3006-8", "stable-3007", "onedir-3007", "stable-3007-1", "git-master", "latest", "default"]'
@ -285,7 +285,7 @@ jobs:
with:
distro-slug: debian-11
display-name: Debian 11
timeout: 20
timeout: 40
instances: '["stable-3006", "onedir-3006", "stable-3006-8", "stable-3007", "onedir-3007", "stable-3007-1", "git-master", "latest", "default"]'
@ -299,7 +299,7 @@ jobs:
with:
distro-slug: debian-12
display-name: Debian 12
timeout: 20
timeout: 40
instances: '["stable-3007", "onedir-3007", "stable-3007-1", "git-master", "latest", "default"]'
@ -313,7 +313,7 @@ jobs:
with:
distro-slug: fedora-39
display-name: Fedora 39
timeout: 20
timeout: 40
instances: '["stable-3006", "onedir-3006", "stable-3006-8", "latest", "default"]'
@ -327,7 +327,7 @@ jobs:
with:
distro-slug: fedora-40
display-name: Fedora 40
timeout: 20
timeout: 40
instances: '["stable-3007", "git-3007", "onedir-3007", "stable-3007-1", "git-master", "latest", "default"]'
@ -369,7 +369,7 @@ jobs:
with:
distro-slug: opensuse-15
display-name: Opensuse 15
timeout: 20
timeout: 40
instances: '["latest", "default"]'
@ -383,7 +383,7 @@ jobs:
with:
distro-slug: opensuse-tumbleweed
display-name: Opensuse Tumbleweed
timeout: 20
timeout: 40
instances: '["git-master", "latest", "default"]'
@ -397,7 +397,7 @@ jobs:
with:
distro-slug: oraclelinux-8
display-name: Oracle Linux 8
timeout: 20
timeout: 40
instances: '["stable-3006", "onedir-3006", "stable-3006-8", "stable-3007", "onedir-3007", "stable-3007-1", "latest", "default"]'
@ -411,7 +411,7 @@ jobs:
with:
distro-slug: oraclelinux-9
display-name: Oracle Linux 9
timeout: 20
timeout: 40
instances: '["stable-3006", "git-3006", "onedir-3006", "stable-3006-8", "stable-3007", "git-3007", "onedir-3007", "stable-3007-1", "git-master", "latest", "default"]'
@ -425,7 +425,7 @@ jobs:
with:
distro-slug: photon-4
display-name: Photon OS 4
timeout: 20
timeout: 40
instances: '["stable-3006", "onedir-3006", "stable-3006-8", "git-master", "latest", "default"]'
@ -439,7 +439,7 @@ jobs:
with:
distro-slug: photon-5
display-name: Photon OS 5
timeout: 20
timeout: 40
instances: '["stable-3006", "onedir-3006", "stable-3006-8", "git-master", "latest", "default"]'
@ -453,7 +453,7 @@ jobs:
with:
distro-slug: rockylinux-8
display-name: Rocky Linux 8
timeout: 20
timeout: 40
instances: '["stable-3006", "onedir-3006", "stable-3006-8", "stable-3007", "onedir-3007", "stable-3007-1", "latest", "default"]'
@ -467,7 +467,7 @@ jobs:
with:
distro-slug: rockylinux-9
display-name: Rocky Linux 9
timeout: 20
timeout: 40
instances: '["stable-3006", "onedir-3006", "stable-3006-8", "stable-3007", "onedir-3007", "stable-3007-1", "git-master", "latest", "default"]'
@ -481,7 +481,7 @@ jobs:
with:
distro-slug: ubuntu-2004
display-name: Ubuntu 20.04
timeout: 20
timeout: 40
instances: '["stable-3006", "onedir-3006", "stable-3006-8", "stable-3007", "onedir-3007", "stable-3007-1", "git-master", "latest", "default"]'
@ -495,7 +495,7 @@ jobs:
with:
distro-slug: ubuntu-2204
display-name: Ubuntu 22.04
timeout: 20
timeout: 40
instances: '["stable-3006", "onedir-3006", "stable-3006-8", "stable-3007", "onedir-3007", "stable-3007-1", "git-master", "latest", "default"]'
@ -509,7 +509,7 @@ jobs:
with:
distro-slug: ubuntu-2404
display-name: Ubuntu 24.04
timeout: 20
timeout: 40
instances: '["stable-3007", "onedir-3007", "stable-3007-1", "git-master", "latest", "default"]'

3
.github/workflows/templates/generate.py vendored
View file

@ -267,7 +267,8 @@ DISTRO_DISPLAY_NAMES = {
"windows-2022": "Windows 2022",
}
TIMEOUT_DEFAULT = 20
## DGM TIMEOUT_DEFAULT = 20
TIMEOUT_DEFAULT = 40
TIMEOUT_OVERRIDES = {
"gentoo": 90,
"gentoo-systemd": 90,

4
Dockerfile
View file

@ -1,8 +1,8 @@
FROM ubuntu:20.04
FROM ubuntu:24.04
MAINTAINER "SaltStack Team"
# Bootstrap script options: install Salt Master by default
ENV BOOTSTRAP_OPTS='-M'
ENV BOOTSTRAP_OPTS='-M -x python3'
# Version of salt to install: stable or git
ENV SALT_VERSION=stable

2
Vagrantfile vendored
View file

@ -10,7 +10,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
# please see the online documentation at vagrantup.com.
# Every Vagrant virtual environment requires a box to build off of.
config.vm.box = "ubuntu/focal64"
config.vm.box = "ubuntu/noble64"
# The url from where the 'config.vm.box' box will be fetched if it
# doesn't already exist on the user's system.

10
kitchen.yml
View file

@ -46,10 +46,11 @@ platforms:
- name: amazon-2023
driver:
image: amazonlinux:2023
## platform: fedora
platform: rhel
platform: fedora
## DGM platform: rhel
provision_command:
- yum -y install procps-ng
## DGM - yum -y install procps-ng
- yum -y install --allowerasing procps-ng curl
- name: arch
driver:
image: archlinux/archlinux
@ -285,6 +286,3 @@ verifier:
name: shell
remote_exec: false
command: pytest --cache-clear -v -s -ra --log-cli-level=info tests/integration/
## DGM transport:
## DGM name: docker