Skip to content

Commit 1040775

Browse files
dmurphy18dmurphy18
committed
Added Debian 11 and 13 containers, removed Amazon Linux 2 container, updated test
1 parent 316e65a commit 1040775

File tree

4 files changed

+57
-110
lines changed

4 files changed

+57
-110
lines changed

‎.github/workflows/ci.yml‎

Lines changed: 27 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -180,32 +180,32 @@ jobs:
180180

181181

182182

183-
amazonlinux-2:
184-
name: Amazon 2
183+
amazonlinux-2023:
184+
name: Amazon 2023
185185
if: github.event_name == 'push' || needs.collect-changed-files.outputs.run-tests == 'true'
186186
uses: ./.github/workflows/test-linux.yml
187187
needs:
188188
- lint
189189
- generate-actions-workflow
190190
with:
191-
distro-slug: amazonlinux-2
192-
display-name: Amazon 2
193-
container-slug: amazonlinux-2
191+
distro-slug: amazonlinux-2023
192+
display-name: Amazon 2023
193+
container-slug: amazonlinux-2023
194194
timeout: 20
195195
instances: '["stable-3006", "onedir-3006", "stable-3006-8", "stable-3007", "onedir-3007", "stable-3007-1", "latest", "default"]'
196196

197197

198-
amazonlinux-2023:
199-
name: Amazon 2023
198+
debian-11:
199+
name: Debian 11
200200
if: github.event_name == 'push' || needs.collect-changed-files.outputs.run-tests == 'true'
201201
uses: ./.github/workflows/test-linux.yml
202202
needs:
203203
- lint
204204
- generate-actions-workflow
205205
with:
206-
distro-slug: amazonlinux-2023
207-
display-name: Amazon 2023
208-
container-slug: amazonlinux-2023
206+
distro-slug: debian-11
207+
display-name: Debian 11
208+
container-slug: debian-11
209209
timeout: 20
210210
instances: '["stable-3006", "onedir-3006", "stable-3006-8", "stable-3007", "onedir-3007", "stable-3007-1", "latest", "default"]'
211211

@@ -225,6 +225,21 @@ jobs:
225225
instances: '["stable-3007", "git-3007", "onedir-3007", "stable-3007-1", "git-master", "latest", "default"]'
226226

227227

228+
debian-13:
229+
name: Debian 13
230+
if: github.event_name == 'push' || needs.collect-changed-files.outputs.run-tests == 'true'
231+
uses: ./.github/workflows/test-linux.yml
232+
needs:
233+
- lint
234+
- generate-actions-workflow
235+
with:
236+
distro-slug: debian-13
237+
display-name: Debian 13
238+
container-slug: debian-13
239+
timeout: 20
240+
instances: '["stable-3006", "git-3006", "onedir-3006", "stable-3006-8", "stable-3007", "onedir-3007", "stable-3007-1", "latest", "default"]'
241+
242+
228243
photon-5:
229244
name: Photon OS 5
230245
if: github.event_name == 'push' || needs.collect-changed-files.outputs.run-tests == 'true'
@@ -297,9 +312,10 @@ jobs:
297312
- macos-13
298313
- macos-14
299314
- windows-2022
300-
- amazonlinux-2
301315
- amazonlinux-2023
316+
- debian-11
302317
- debian-12
318+
- debian-13
303319
- photon-5
304320
- rockylinux-8
305321
- rockylinux-9

‎.github/workflows/templates/generate.py‎

Lines changed: 9 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -6,18 +6,16 @@
66

77
os.chdir(os.path.abspath(os.path.dirname(__file__)))
88

9-
# only test against current containers with systemd
10-
# will add these when they become available with systemd
11-
# "debian-11",
12-
# "debian-13",
9+
# "amazonlinux-2",
1310
# "fedora-40",
1411
# "photon-4",
1512
# "ubuntu-2004",
1613
# "ubuntu-2404",
1714
LINUX_DISTROS = [
18-
"amazonlinux-2",
1915
"amazonlinux-2023",
16+
"debian-11",
2017
"debian-12",
18+
"debian-13",
2119
"photon-5",
2220
"rockylinux-8",
2321
"rockylinux-9",
@@ -34,44 +32,38 @@
3432
"macos-14",
3533
]
3634

37-
# only test against current containers with systemd
38-
# will add these when they become available with systemd
39-
# "debian-11",
40-
# "debian-13",
35+
# "amazonlinux-2",
4136
# "fedora-40",
4237
# "photon-4",
4338
# "ubuntu-2004",
4439
# "ubuntu-2404",
4540
STABLE_DISTROS = [
46-
"amazonlinux-2",
4741
"amazonlinux-2023",
42+
"debian-11",
4843
"debian-12",
44+
"debian-13",
4945
"photon-5",
5046
"rockylinux-8",
5147
"rockylinux-9",
5248
"ubuntu-2204",
5349
]
5450

55-
# only test against current containers with systemd
56-
# will add these when they become available with systemd
57-
# "debian-11",
58-
# "debian-13",
51+
# "amazonlinux-2",
5952
# "fedora-40",
6053
# "photon-4",
6154
# "ubuntu-2004",
6255
# "ubuntu-2404",
6356
ONEDIR_DISTROS = [
64-
"amazonlinux-2",
6557
"amazonlinux-2023",
58+
"debian-11",
6659
"debian-12",
60+
"debian-13",
6761
"photon-5",
6862
"rockylinux-8",
6963
"rockylinux-9",
7064
"ubuntu-2204",
7165
]
7266

73-
# only test against current containers with systemd
74-
# will add these when they become available with systemd
7567
# "amazonlinux-2",
7668
# "amazonlinux-2023",
7769
# "photon-4",
@@ -216,19 +208,6 @@
216208
"windows-2022": "Windows 2022",
217209
}
218210

219-
## "amazonlinux-2": "systemd-amazonlinux-2",
220-
## "amazonlinux-2023": "systemd-amazonlinux-2023",
221-
## "debian-11": "systemd-debian-11",
222-
## "debian-12": "systemd-debian-12",
223-
## "debian-13": "systemd-debian-13",
224-
## "fedora-40": "systemd-fedora-40",
225-
## "photon-4": "systemd-photon-4",
226-
## "photon-5": "systemd-photon-5",
227-
## "rockylinux-8": "systemd-rockylinux-8",
228-
## "rockylinux-9": "systemd-rockylinux-9",
229-
## "ubuntu-2004": "systemd-ubuntu-20.04",
230-
## "ubuntu-2204": "systemd-ubuntu-22.04",
231-
## "ubuntu-2404": "systemd-ubuntu-24.04",
232211
CONTAINER_SLUG_NAMES = {
233212
"amazonlinux-2": "amazonlinux-2",
234213
"amazonlinux-2023": "amazonlinux-2023",

‎bootstrap-salt.sh‎

Lines changed: 17 additions & 68 deletions
Original file line numberDiff line numberDiff line change
@@ -2468,12 +2468,6 @@ __check_services_systemd() {
24682468
servicename=$1
24692469
echodebug "Checking if service ${servicename} is enabled"
24702470

2471-
## DGM
2472-
if [ "${DISTRO_NAME_L}" = "amazon_linux_ami" ] && [ "${DISTRO_VERSION}" = "2" ]; then
2473-
echoinfo "DGM skipping the is-enabled test on AMZN2, since command 'systemctl is-enabled salt-minion' is generating error msg 'Failed to get D-Bus connection: No such file or directory' on AMZN2 container"
2474-
return 0
2475-
fi
2476-
24772471
if [ "$(systemctl is-enabled "${servicename}")" = "enabled" ]; then
24782472
echodebug "Service ${servicename} is enabled"
24792473
return 0
@@ -3195,11 +3189,8 @@ install_ubuntu_git_deps() {
31953189
__PACKAGES="${__PACKAGES} util-linux-extra"
31963190
fi
31973191

3198-
# Additionally install procps and pciutils which allows for Docker bootstraps. See 366#issuecomment-39666813
3199-
__PACKAGES="${__PACKAGES} procps pciutils"
3200-
3201-
# ensure sudo installed
3202-
__PACKAGES="${__PACKAGES} sudo"
3192+
# Additionally install procps pciutils and sudo which allows for Docker bootstraps. See 366#issuecomment-39666813
3193+
__PACKAGES="${__PACKAGES} procps pciutils sudo"
32033194

32043195
# shellcheck disable=SC2086
32053196
__apt_get_install_noinput ${__PACKAGES} || return 1
@@ -3598,15 +3589,12 @@ install_debian_onedir_deps() {
35983589
return 1
35993590
fi
36003591

3601-
# Additionally install procps and pciutils which allows for Docker bootstraps. See 366#issuecomment-39666813
3602-
__PACKAGES='procps pciutils'
3592+
# Additionally install procps, pciutils and sudo which allows for Docker bootstraps. See 366#issuecomment-39666813
3593+
__PACKAGES='procps pciutils sudo'
36033594

36043595
# YAML module is used for generating custom master/minion configs
36053596
__PACKAGES="${__PACKAGES} python${PY_PKG_VER}-yaml"
36063597

3607-
# ensure sudo installed
3608-
__PACKAGES="${__PACKAGES} sudo"
3609-
36103598
# shellcheck disable=SC2086
36113599
__apt_get_install_noinput ${__PACKAGES} || return 1
36123600

@@ -3649,11 +3637,8 @@ install_debian_git_deps() {
36493637
__PACKAGES="python${PY_PKG_VER}-dev python${PY_PKG_VER}-pip python${PY_PKG_VER}-setuptools gcc"
36503638
echodebug "install_debian_git_deps() Installing ${__PACKAGES}"
36513639

3652-
# Additionally install procps and pciutils which allows for Docker bootstraps. See 366#issuecomment-39666813
3653-
__PACKAGES="${__PACKAGES} procps pciutils"
3654-
3655-
# ensure sudo installed
3656-
__PACKAGES="${__PACKAGES} sudo"
3640+
# Additionally install procps, pciutils and sudo which allows for Docker bootstraps. See 366#issuecomment-39666813
3641+
__PACKAGES="${__PACKAGES} procps pciutils sudo"
36573642

36583643
# shellcheck disable=SC2086
36593644
__apt_get_install_noinput ${__PACKAGES} || return 1
@@ -3953,14 +3938,11 @@ install_fedora_deps() {
39533938
__PACKAGES="${__PACKAGES} dnf-utils libyaml procps-ng python${PY_PKG_VER}-crypto python${PY_PKG_VER}-jinja2"
39543939
__PACKAGES="${__PACKAGES} python${PY_PKG_VER}-msgpack python${PY_PKG_VER}-requests python${PY_PKG_VER}-zmq"
39553940
__PACKAGES="${__PACKAGES} python${PY_PKG_VER}-pip python${PY_PKG_VER}-m2crypto python${PY_PKG_VER}-pyyaml"
3956-
__PACKAGES="${__PACKAGES} python${PY_PKG_VER}-systemd"
3941+
__PACKAGES="${__PACKAGES} python${PY_PKG_VER}-systemd sudo"
39573942
if [ "${_EXTRA_PACKAGES}" != "" ]; then
39583943
echoinfo "Installing the following extra packages as requested: ${_EXTRA_PACKAGES}"
39593944
fi
39603945

3961-
# ensure sudo installed
3962-
__PACKAGES="${__PACKAGES} sudo"
3963-
39643946
# shellcheck disable=SC2086
39653947
__dnf_install_noinput ${__PACKAGES} ${_EXTRA_PACKAGES} || return 1
39663948

@@ -3991,10 +3973,7 @@ install_fedora_git_deps() {
39913973
# shellcheck disable=SC2119
39923974
__git_clone_and_checkout || return 1
39933975

3994-
__PACKAGES="python${PY_PKG_VER}-devel python${PY_PKG_VER}-pip python${PY_PKG_VER}-setuptools gcc gcc-c++"
3995-
3996-
# ensure sudo installed
3997-
__PACKAGES="${__PACKAGES} sudo"
3976+
__PACKAGES="python${PY_PKG_VER}-devel python${PY_PKG_VER}-pip python${PY_PKG_VER}-setuptools gcc gcc-c++ sudo"
39983977

39993978
# shellcheck disable=SC2086
40003979
__dnf_install_noinput ${__PACKAGES} || return 1
@@ -4123,10 +4102,7 @@ install_fedora_onedir_deps() {
41234102
__install_saltstack_fedora_onedir_repository || return 1
41244103
fi
41254104

4126-
__PACKAGES="dnf-utils chkconfig procps-ng"
4127-
4128-
# ensure sudo installed
4129-
__PACKAGES="${__PACKAGES} sudo"
4105+
__PACKAGES="dnf-utils chkconfig procps-ng sudo"
41304106

41314107
# shellcheck disable=SC2086
41324108
__yum_install_noinput ${__PACKAGES} || return 1
@@ -4286,10 +4262,7 @@ install_centos_stable_deps() {
42864262
__install_saltstack_rhel_onedir_repository || return 1
42874263
fi
42884264

4289-
__PACKAGES="yum-utils chkconfig procps-ng findutils"
4290-
4291-
# ensure sudo installed
4292-
__PACKAGES="${__PACKAGES} sudo"
4265+
__PACKAGES="yum-utils chkconfig procps-ng findutils sudo"
42934266

42944267
# shellcheck disable=SC2086
42954268
__yum_install_noinput ${__PACKAGES} || return 1
@@ -4335,9 +4308,6 @@ install_centos_stable() {
43354308
__PACKAGES="${__PACKAGES} salt-api$MINOR_VER_STRG"
43364309
fi
43374310

4338-
# ensure sudo installed
4339-
__PACKAGES="${__PACKAGES} sudo"
4340-
43414311
# shellcheck disable=SC2086
43424312
yum makecache || return 1
43434313
__yum_install_noinput ${__PACKAGES} || return 1
@@ -4416,10 +4386,7 @@ install_centos_git_deps() {
44164386
return 1
44174387
fi
44184388

4419-
__PACKAGES="${__PACKAGES} python${PY_PKG_VER}-devel python${PY_PKG_VER}-pip python${PY_PKG_VER}-setuptools gcc"
4420-
4421-
# ensure sudo installed
4422-
__PACKAGES="${__PACKAGES} sudo"
4389+
__PACKAGES="${__PACKAGES} python${PY_PKG_VER}-devel python${PY_PKG_VER}-pip python${PY_PKG_VER}-setuptools gcc sudo"
44234390

44244391
# shellcheck disable=SC2086
44254392
__yum_install_noinput ${__PACKAGES} || return 1
@@ -4515,10 +4482,7 @@ install_centos_onedir_deps() {
45154482
__install_saltstack_rhel_onedir_repository || return 1
45164483
fi
45174484

4518-
__PACKAGES="yum-utils chkconfig procps-ng findutils"
4519-
4520-
# ensure sudo installed
4521-
__PACKAGES="${__PACKAGES} sudo"
4485+
__PACKAGES="yum-utils chkconfig procps-ng findutils sudo"
45224486

45234487
# shellcheck disable=SC2086
45244488
__yum_install_noinput ${__PACKAGES} || return 1
@@ -5619,10 +5583,7 @@ install_amazon_linux_ami_2_git_deps() {
56195583
# shellcheck disable=SC2119
56205584
__git_clone_and_checkout || return 1
56215585

5622-
__PACKAGES="python${PY_PKG_VER}-pip python${PY_PKG_VER}-setuptools python${PY_PKG_VER}-devel gcc"
5623-
5624-
# ensure sudo installed
5625-
__PACKAGES="${__PACKAGES} sudo"
5586+
__PACKAGES="python${PY_PKG_VER}-pip python${PY_PKG_VER}-setuptools python${PY_PKG_VER}-devel gcc sudo"
56265587

56275588
# shellcheck disable=SC2086
56285589
__yum_install_noinput ${__PACKAGES} || return 1
@@ -5644,10 +5605,7 @@ install_amazon_linux_ami_2_deps() {
56445605

56455606
# We need to install yum-utils before doing anything else when installing on
56465607
# Amazon Linux ECS-optimized images. See issue #974.
5647-
__PACKAGES="yum-utils"
5648-
5649-
# ensure sudo installed
5650-
__PACKAGES="${__PACKAGES} sudo"
5608+
__PACKAGES="yum-utils sudo"
56515609

56525610
__yum_install_noinput ${__PACKAGES}
56535611

@@ -5737,10 +5695,7 @@ install_amazon_linux_ami_2_onedir_deps() {
57375695

57385696
# We need to install yum-utils before doing anything else when installing on
57395697
# Amazon Linux ECS-optimized images. See issue #974.
5740-
__PACKAGES="yum-utils chkconfig procps-ng findutils"
5741-
5742-
# ensure sudo installed
5743-
__PACKAGES="${__PACKAGES} sudo"
5698+
__PACKAGES="yum-utils chkconfig procps-ng findutils sudo"
57445699

57455700
__yum_install_noinput ${__PACKAGES}
57465701

@@ -5897,10 +5852,7 @@ install_amazon_linux_ami_2023_git_deps() {
58975852
# shellcheck disable=SC2119
58985853
__git_clone_and_checkout || return 1
58995854

5900-
__PACKAGES="python${PY_PKG_VER}-pip python${PY_PKG_VER}-setuptools python${PY_PKG_VER}-devel gcc"
5901-
5902-
# ensure sudo installed
5903-
__PACKAGES="${__PACKAGES} sudo"
5855+
__PACKAGES="python${PY_PKG_VER}-pip python${PY_PKG_VER}-setuptools python${PY_PKG_VER}-devel gcc sudo"
59045856

59055857
# shellcheck disable=SC2086
59065858
__yum_install_noinput ${__PACKAGES} || return 1
@@ -5925,10 +5877,7 @@ install_amazon_linux_ami_2023_onedir_deps() {
59255877

59265878
# We need to install yum-utils before doing anything else when installing on
59275879
# Amazon Linux ECS-optimized images. See issue #974.
5928-
__PACKAGES="yum-utils chkconfig procps-ng findutils"
5929-
5930-
# ensure sudo installed
5931-
__PACKAGES="${__PACKAGES} sudo"
5880+
__PACKAGES="yum-utils chkconfig procps-ng findutils sudo"
59325881

59335882
__yum_install_noinput ${__PACKAGES}
59345883

‎tests/integration/test_installation.py‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,10 @@ def run_salt_call(cmd):
4646
result = subprocess.run(cmdl, capture_output=True, text=True)
4747
except TypeError:
4848
result = subprocess.run(
49-
cmdl, stdout=PIPE, stderr=PIPE, universal_newlines=True
49+
cmdl,
50+
stdout=subprocess.PIPE,
51+
stderr=subprocess.PIPE,
52+
universal_newlines=True,
5053
)
5154
print(f"DGM run_salt_call result '{result}'", flush=True)
5255
if 0 == result.returncode:

0 commit comments

Comments
 (0)