Skip to content

Commit c06507f

Browse files
didiermfbdidiermfb
committed
fix(onedir): update for onedir salt package
[BREAKING CHANGE] update for onedir salt package
1 parent 3dc21ce commit c06507f

File tree

19 files changed

+106
-411
lines changed

19 files changed

+106
-411
lines changed

‎.gitlab-ci.yml‎

Lines changed: 23 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -150,12 +150,12 @@ default-debian-10-master-py3: {extends: '.test_instance'}
150150
# default-debian-9-master-py3: {extends: '.test_instance'}
151151
default-ubuntu-2204-master-py3: {extends: '.test_instance_failure_permitted'}
152152
default-ubuntu-2004-master-py3: {extends: '.test_instance'}
153-
default-ubuntu-1804-master-py3: {extends: '.test_instance'}
153+
# default-ubuntu-1804-master-py3: {extends: '.test_instance'}
154154
default-centos-stream8-master-py3: {extends: '.test_instance_failure_permitted'}
155155
default-centos-7-master-py3: {extends: '.test_instance'}
156-
default-fedora-36-master-py3: {extends: '.test_instance_failure_permitted'}
157-
default-fedora-35-master-py3: {extends: '.test_instance'}
158-
default-opensuse-leap-153-master-py3: {extends: '.test_instance'}
156+
# default-fedora-36-master-py3: {extends: '.test_instance_failure_permitted'}
157+
# default-fedora-35-master-py3: {extends: '.test_instance'}
158+
# default-opensuse-leap-153-master-py3: {extends: '.test_instance'}
159159
# default-opensuse-tmbl-latest-master-py3: {extends: '.test_instance_failure_permitted'}
160160
# default-amazonlinux-2-master-py3: {extends: '.test_instance'}
161161
# default-oraclelinux-8-master-py3: {extends: '.test_instance'}
@@ -164,37 +164,25 @@ default-opensuse-leap-153-master-py3: {extends: '.test_instance'}
164164
# default-gentoo-stage3-latest-master-py3: {extends: '.test_instance'}
165165
# default-gentoo-stage3-systemd-master-py3: {extends: '.test_instance'}
166166
default-almalinux-8-master-py3: {extends: '.test_instance'}
167-
default-rockylinux-8-master-py3: {extends: '.test_instance'}
168-
# default-debian-11-3004-1-py3: {extends: '.test_instance'}
169-
# default-debian-10-3004-1-py3: {extends: '.test_instance'}
170-
# default-debian-9-3004-1-py3: {extends: '.test_instance'}
171-
# default-ubuntu-2204-3004-1-py3: {extends: '.test_instance_failure_permitted'}
172-
# default-ubuntu-2004-3004-1-py3: {extends: '.test_instance'}
173-
# default-ubuntu-1804-3004-1-py3: {extends: '.test_instance'}
174-
# default-centos-stream8-3004-1-py3: {extends: '.test_instance_failure_permitted'}
175-
# default-centos-7-3004-1-py3: {extends: '.test_instance'}
176-
# default-fedora-36-3004-1-py3: {extends: '.test_instance_failure_permitted'}
177-
# default-fedora-35-3004-1-py3: {extends: '.test_instance'}
178-
# default-amazonlinux-2-3004-1-py3: {extends: '.test_instance'}
179-
# default-oraclelinux-8-3004-1-py3: {extends: '.test_instance'}
180-
# default-oraclelinux-7-3004-1-py3: {extends: '.test_instance'}
181-
# default-arch-base-latest-3004-1-py3: {extends: '.test_instance'}
182-
# default-gentoo-stage3-latest-3004-1-py3: {extends: '.test_instance'}
183-
# default-gentoo-stage3-systemd-3004-1-py3: {extends: '.test_instance'}
184-
# default-almalinux-8-3004-1-py3: {extends: '.test_instance'}
185-
# default-rockylinux-8-3004-1-py3: {extends: '.test_instance'}
186-
# default-opensuse-leap-153-3004-0-py3: {extends: '.test_instance'}
187-
# default-opensuse-tmbl-latest-3004-0-py3: {extends: '.test_instance_failure_permitted'}
188-
# default-debian-10-3003-4-py3: {extends: '.test_instance'}
189-
# default-debian-9-3003-4-py3: {extends: '.test_instance'}
190-
# default-ubuntu-2004-3003-4-py3: {extends: '.test_instance'}
191-
# default-ubuntu-1804-3003-4-py3: {extends: '.test_instance'}
192-
# default-centos-stream8-3003-4-py3: {extends: '.test_instance_failure_permitted'}
193-
# default-centos-7-3003-4-py3: {extends: '.test_instance'}
194-
# default-amazonlinux-2-3003-4-py3: {extends: '.test_instance'}
195-
# default-oraclelinux-8-3003-4-py3: {extends: '.test_instance'}
196-
# default-oraclelinux-7-3003-4-py3: {extends: '.test_instance'}
197-
# default-almalinux-8-3003-4-py3: {extends: '.test_instance'}
167+
# default-rockylinux-8-master-py3: {extends: '.test_instance'}
168+
default-debian-11-3006-5-py3: {extends: '.test_instance'}
169+
default-debian-10-3006-5-py3: {extends: '.test_instance'}
170+
# default-debian-9-3006-5-py3: {extends: '.test_instance'}
171+
default-ubuntu-2204-3006-5-py3: {extends: '.test_instance_failure_permitted'}
172+
default-ubuntu-2004-3006-5-py3: {extends: '.test_instance'}
173+
# default-ubuntu-1804-3006-5-py3: {extends: '.test_instance'}
174+
default-centos-stream8-3006-5-py3: {extends: '.test_instance_failure_permitted'}
175+
default-centos-7-3006-5-py3: {extends: '.test_instance'}
176+
# default-fedora-36-3006-5-py3: {extends: '.test_instance_failure_permitted'}
177+
# default-fedora-35-3006-5-py3: {extends: '.test_instance'}
178+
# default-amazonlinux-2-3006-5-py3: {extends: '.test_instance'}
179+
# default-oraclelinux-8-3006-5-py3: {extends: '.test_instance'}
180+
# default-oraclelinux-7-3006-5-py3: {extends: '.test_instance'}
181+
# default-arch-base-latest-3006-5-py3: {extends: '.test_instance'}
182+
# default-gentoo-stage3-latest-3006-5-py3: {extends: '.test_instance'}
183+
# default-gentoo-stage3-systemd-3006-5-py3: {extends: '.test_instance'}
184+
default-almalinux-8-3006-5-py3: {extends: '.test_instance'}
185+
# default-rockylinux-8-3006-5-py3: {extends: '.test_instance'}
198186
# yamllint enable rule:line-length
199187

200188
###############################################################################

‎.travis.yml‎

Lines changed: 6 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -99,15 +99,15 @@ jobs:
9999
# - env: INSTANCE=default-debian-11-master-py3
100100
- env: INSTANCE=default-debian-10-master-py3
101101
# - env: INSTANCE=clean-debian-10-master-py3
102-
- env: INSTANCE=default-debian-9-master-py3
102+
# - env: INSTANCE=default-debian-9-master-py3
103103
- env: INSTANCE=default-ubuntu-2204-master-py3
104104
- env: INSTANCE=default-ubuntu-2004-master-py3
105-
- env: INSTANCE=default-ubuntu-1804-master-py3
105+
# - env: INSTANCE=default-ubuntu-1804-master-py3
106106
- env: INSTANCE=default-centos-stream8-master-py3
107107
- env: INSTANCE=default-centos-7-master-py3
108-
- env: INSTANCE=default-fedora-36-master-py3
109-
- env: INSTANCE=default-fedora-35-master-py3
110-
- env: INSTANCE=default-opensuse-leap-153-master-py3
108+
# - env: INSTANCE=default-fedora-36-master-py3
109+
# - env: INSTANCE=default-fedora-35-master-py3
110+
# - env: INSTANCE=default-opensuse-leap-153-master-py3
111111
# - env: INSTANCE=default-opensuse-tmbl-latest-master-py3
112112
# - env: INSTANCE=default-amazonlinux-2-master-py3
113113
# - env: INSTANCE=default-oraclelinux-8-master-py3
@@ -116,37 +116,7 @@ jobs:
116116
# - env: INSTANCE=default-gentoo-stage3-latest-master-py3
117117
# - env: INSTANCE=default-gentoo-stage3-systemd-master-py3
118118
- env: INSTANCE=default-almalinux-8-master-py3
119-
- env: INSTANCE=default-rockylinux-8-master-py3
120-
# - env: INSTANCE=default-debian-11-3004-1-py3
121-
# - env: INSTANCE=default-debian-10-3004-1-py3
122-
# - env: INSTANCE=default-debian-9-3004-1-py3
123-
# - env: INSTANCE=default-ubuntu-2204-3004-1-py3
124-
# - env: INSTANCE=default-ubuntu-2004-3004-1-py3
125-
# - env: INSTANCE=default-ubuntu-1804-3004-1-py3
126-
# - env: INSTANCE=default-centos-stream8-3004-1-py3
127-
# - env: INSTANCE=default-centos-7-3004-1-py3
128-
# - env: INSTANCE=default-fedora-36-3004-1-py3
129-
# - env: INSTANCE=default-fedora-35-3004-1-py3
130-
# - env: INSTANCE=default-amazonlinux-2-3004-1-py3
131-
# - env: INSTANCE=default-oraclelinux-8-3004-1-py3
132-
# - env: INSTANCE=default-oraclelinux-7-3004-1-py3
133-
# - env: INSTANCE=default-arch-base-latest-3004-1-py3
134-
# - env: INSTANCE=default-gentoo-stage3-latest-3004-1-py3
135-
# - env: INSTANCE=default-gentoo-stage3-systemd-3004-1-py3
136-
# - env: INSTANCE=default-almalinux-8-3004-1-py3
137-
# - env: INSTANCE=default-rockylinux-8-3004-1-py3
138-
# - env: INSTANCE=default-opensuse-leap-153-3004-0-py3
139-
# - env: INSTANCE=default-opensuse-tmbl-latest-3004-0-py3
140-
# - env: INSTANCE=default-debian-10-3003-4-py3
141-
# - env: INSTANCE=default-debian-9-3003-4-py3
142-
# - env: INSTANCE=default-ubuntu-2004-3003-4-py3
143-
# - env: INSTANCE=default-ubuntu-1804-3003-4-py3
144-
# - env: INSTANCE=default-centos-stream8-3003-4-py3
145-
# - env: INSTANCE=default-centos-7-3003-4-py3
146-
# - env: INSTANCE=default-amazonlinux-2-3003-4-py3
147-
# - env: INSTANCE=default-oraclelinux-8-3003-4-py3
148-
# - env: INSTANCE=default-oraclelinux-7-3003-4-py3
149-
# - env: INSTANCE=default-almalinux-8-3003-4-py3
119+
# - env: INSTANCE=default-rockylinux-8-master-py3
150120

151121
## Define the release stage that runs `semantic-release`
152122
- stage: 'release'

‎kitchen.yml‎

Lines changed: 37 additions & 135 deletions
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,6 @@ platforms:
2828
driver:
2929
image: saltimages/salt-tiamat-py3:debian-10
3030
run_command: /lib/systemd/systemd
31-
- name: debian-9-tiamat-py3
32-
driver:
33-
image: saltimages/salt-tiamat-py3:debian-9
34-
run_command: /lib/systemd/systemd
3531
- name: ubuntu-2204-tiamat-py3
3632
driver:
3733
image: saltimages/salt-tiamat-py3:ubuntu-22.04
@@ -40,10 +36,6 @@ platforms:
4036
driver:
4137
image: saltimages/salt-tiamat-py3:ubuntu-20.04
4238
run_command: /lib/systemd/systemd
43-
- name: ubuntu-1804-tiamat-py3
44-
driver:
45-
image: saltimages/salt-tiamat-py3:ubuntu-18.04
46-
run_command: /lib/systemd/systemd
4739
- name: centos-stream8-tiamat-py3
4840
driver:
4941
image: saltimages/salt-tiamat-py3:centos-stream8
@@ -75,10 +67,6 @@ platforms:
7567
driver:
7668
image: saltimages/salt-master-py3:debian-10
7769
run_command: /lib/systemd/systemd
78-
- name: debian-9-master-py3
79-
driver:
80-
image: saltimages/salt-master-py3:debian-9
81-
run_command: /lib/systemd/systemd
8270
- name: ubuntu-2204-master-py3
8371
driver:
8472
image: saltimages/salt-master-py3:ubuntu-22.04
@@ -87,36 +75,12 @@ platforms:
8775
driver:
8876
image: saltimages/salt-master-py3:ubuntu-20.04
8977
run_command: /lib/systemd/systemd
90-
- name: ubuntu-1804-master-py3
91-
driver:
92-
image: saltimages/salt-master-py3:ubuntu-18.04
93-
run_command: /lib/systemd/systemd
9478
- name: centos-stream8-master-py3
9579
driver:
9680
image: saltimages/salt-master-py3:centos-stream8
9781
- name: centos-7-master-py3
9882
driver:
9983
image: saltimages/salt-master-py3:centos-7
100-
- name: fedora-36-master-py3
101-
driver:
102-
image: saltimages/salt-master-py3:fedora-36
103-
- name: fedora-35-master-py3
104-
driver:
105-
image: saltimages/salt-master-py3:fedora-35
106-
- name: opensuse-leap-153-master-py3
107-
driver:
108-
image: saltimages/salt-master-py3:opensuse-leap-15.3
109-
# Workaround to avoid intermittent failures on `opensuse-leap-15.3`:
110-
# => SCP did not finish successfully (255): (Net::SCP::Error)
111-
transport:
112-
max_ssh_sessions: 1
113-
- name: opensuse-tmbl-latest-master-py3
114-
driver:
115-
image: saltimages/salt-master-py3:opensuse-tumbleweed-latest
116-
# Workaround to avoid intermittent failures on `opensuse-tumbleweed`:
117-
# => SCP did not finish successfully (255): (Net::SCP::Error)
118-
transport:
119-
max_ssh_sessions: 1
12084
- name: amazonlinux-2-master-py3
12185
driver:
12286
image: saltimages/salt-master-py3:amazonlinux-2
@@ -129,134 +93,72 @@ platforms:
12993
- name: arch-base-latest-master-py3
13094
driver:
13195
image: saltimages/salt-master-py3:arch-base-latest
132-
- name: gentoo-stage3-latest-master-py3
133-
driver:
134-
image: saltimages/salt-master-py3:gentoo-stage3-latest
135-
run_command: /sbin/init
136-
- name: gentoo-stage3-systemd-master-py3
137-
driver:
138-
image: saltimages/salt-master-py3:gentoo-stage3-systemd
13996
- name: almalinux-8-master-py3
14097
driver:
14198
image: saltimages/salt-master-py3:almalinux-8
142-
- name: rockylinux-8-master-py3
143-
driver:
144-
image: saltimages/salt-master-py3:rockylinux-8
14599

146-
## SALT `3004.1`
147-
- name: debian-11-3004-1-py3
100+
## SALT `3006.5`
101+
- name: debian-11-3006-5-py3
148102
driver:
149-
image: saltimages/salt-3004.1-py3:debian-11
103+
image: saltimages/salt-3006.5-py3:debian-11
150104
run_command: /lib/systemd/systemd
151-
- name: debian-10-3004-1-py3
105+
- name: debian-10-3006-5-py3
152106
driver:
153-
image: saltimages/salt-3004.1-py3:debian-10
107+
image: saltimages/salt-3006.5-py3:debian-10
154108
run_command: /lib/systemd/systemd
155-
- name: debian-9-3004-1-py3
109+
- name: debian-9-3006-5-py3
156110
driver:
157-
image: saltimages/salt-3004.1-py3:debian-9
111+
image: saltimages/salt-3006.5-py3:debian-9
158112
run_command: /lib/systemd/systemd
159-
- name: ubuntu-2204-3004-1-py3
113+
- name: ubuntu-2204-3006-5-py3
160114
driver:
161-
image: saltimages/salt-3004.1-py3:ubuntu-22.04
115+
image: saltimages/salt-3006.5-py3:ubuntu-22.04
162116
run_command: /lib/systemd/systemd
163-
- name: ubuntu-2004-3004-1-py3
117+
- name: ubuntu-2004-3006-5-py3
164118
driver:
165-
image: saltimages/salt-3004.1-py3:ubuntu-20.04
119+
image: saltimages/salt-3006.5-py3:ubuntu-20.04
166120
run_command: /lib/systemd/systemd
167-
- name: ubuntu-1804-3004-1-py3
121+
- name: ubuntu-1804-3006-5-py3
168122
driver:
169-
image: saltimages/salt-3004.1-py3:ubuntu-18.04
123+
image: saltimages/salt-3006.5-py3:ubuntu-18.04
170124
run_command: /lib/systemd/systemd
171-
- name: centos-stream8-3004-1-py3
125+
- name: centos-stream8-3006-5-py3
172126
driver:
173-
image: saltimages/salt-3004.1-py3:centos-stream8
174-
- name: centos-7-3004-1-py3
127+
image: saltimages/salt-3006.5-py3:centos-stream8
128+
- name: centos-7-3006-5-py3
175129
driver:
176-
image: saltimages/salt-3004.1-py3:centos-7
177-
- name: fedora-36-3004-1-py3
130+
image: saltimages/salt-3006.5-py3:centos-7
131+
- name: fedora-36-3006-5-py3
178132
driver:
179-
image: saltimages/salt-3004.1-py3:fedora-36
180-
- name: fedora-35-3004-1-py3
133+
image: saltimages/salt-3006.5-py3:fedora-36
134+
- name: fedora-35-3006-5-py3
181135
driver:
182-
image: saltimages/salt-3004.1-py3:fedora-35
183-
- name: amazonlinux-2-3004-1-py3
136+
image: saltimages/salt-3006.5-py3:fedora-35
137+
- name: amazonlinux-2-3006-5-py3
184138
driver:
185-
image: saltimages/salt-3004.1-py3:amazonlinux-2
186-
- name: oraclelinux-8-3004-1-py3
139+
image: saltimages/salt-3006.5-py3:amazonlinux-2
140+
- name: oraclelinux-8-3006-5-py3
187141
driver:
188-
image: saltimages/salt-3004.1-py3:oraclelinux-8
189-
- name: oraclelinux-7-3004-1-py3
142+
image: saltimages/salt-3006.5-py3:oraclelinux-8
143+
- name: oraclelinux-7-3006-5-py3
190144
driver:
191-
image: saltimages/salt-3004.1-py3:oraclelinux-7
192-
- name: arch-base-latest-3004-1-py3
145+
image: saltimages/salt-3006.5-py3:oraclelinux-7
146+
- name: arch-base-latest-3006-5-py3
193147
driver:
194-
image: saltimages/salt-3004.1-py3:arch-base-latest
195-
- name: gentoo-stage3-latest-3004-1-py3
148+
image: saltimages/salt-3006.5-py3:arch-base-latest
149+
- name: gentoo-stage3-latest-3006-5-py3
196150
driver:
197-
image: saltimages/salt-3004.1-py3:gentoo-stage3-latest
151+
image: saltimages/salt-3006.5-py3:gentoo-stage3-latest
198152
run_command: /sbin/init
199-
- name: gentoo-stage3-systemd-3004-1-py3
200-
driver:
201-
image: saltimages/salt-3004.1-py3:gentoo-stage3-systemd
202-
- name: almalinux-8-3004-1-py3
203-
driver:
204-
image: saltimages/salt-3004.1-py3:almalinux-8
205-
- name: rockylinux-8-3004-1-py3
206-
driver:
207-
image: saltimages/salt-3004.1-py3:rockylinux-8
208-
209-
## SALT `3004.0`
210-
- name: opensuse-leap-153-3004-0-py3
211-
driver:
212-
image: saltimages/salt-3004.0-py3:opensuse-leap-15.3
213-
# Workaround to avoid intermittent failures on `opensuse-leap-15.3`:
214-
# => SCP did not finish successfully (255): (Net::SCP::Error)
215-
transport:
216-
max_ssh_sessions: 1
217-
- name: opensuse-tmbl-latest-3004-0-py3
218-
driver:
219-
image: saltimages/salt-3004.0-py3:opensuse-tumbleweed-latest
220-
# Workaround to avoid intermittent failures on `opensuse-tumbleweed`:
221-
# => SCP did not finish successfully (255): (Net::SCP::Error)
222-
transport:
223-
max_ssh_sessions: 1
224-
225-
## SALT `3003.4`
226-
- name: debian-10-3003-4-py3
227-
driver:
228-
image: saltimages/salt-3003.4-py3:debian-10
229-
run_command: /lib/systemd/systemd
230-
- name: debian-9-3003-4-py3
231-
driver:
232-
image: saltimages/salt-3003.4-py3:debian-9
233-
run_command: /lib/systemd/systemd
234-
- name: ubuntu-2004-3003-4-py3
235-
driver:
236-
image: saltimages/salt-3003.4-py3:ubuntu-20.04
237-
run_command: /lib/systemd/systemd
238-
- name: ubuntu-1804-3003-4-py3
239-
driver:
240-
image: saltimages/salt-3003.4-py3:ubuntu-18.04
241-
run_command: /lib/systemd/systemd
242-
- name: centos-stream8-3003-4-py3
243-
driver:
244-
image: saltimages/salt-3003.4-py3:centos-stream8
245-
- name: centos-7-3003-4-py3
246-
driver:
247-
image: saltimages/salt-3003.4-py3:centos-7
248-
- name: amazonlinux-2-3003-4-py3
249-
driver:
250-
image: saltimages/salt-3003.4-py3:amazonlinux-2
251-
- name: oraclelinux-8-3003-4-py3
153+
- name: gentoo-stage3-systemd-3006-5-py3
252154
driver:
253-
image: saltimages/salt-3003.4-py3:oraclelinux-8
254-
- name: oraclelinux-7-3003-4-py3
155+
image: saltimages/salt-3006.5-py3:gentoo-stage3-systemd
156+
- name: almalinux-8-3006-5-py3
255157
driver:
256-
image: saltimages/salt-3003.4-py3:oraclelinux-7
257-
- name: almalinux-8-3003-4-py3
158+
image: saltimages/salt-3006.5-py3:almalinux-8
159+
- name: rockylinux-8-3006-5-py3
258160
driver:
259-
image: saltimages/salt-3003.4-py3:almalinux-8
161+
image: saltimages/salt-3006.5-py3:rockylinux-8
260162

261163
verifier:
262164
# https://www.inspec.io/

‎libvirt/parameters/defaults.yaml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,7 @@ values:
1414
- id
1515
libvirt_pkg: libvirt
1616
qemu_pkg: qemu
17-
python2_pkg: libvirt-python
18-
python3_pkg: python3-libvirt
17+
pip_pkg: libvirt-python
1918
libvirt_service: libvirtd
2019
libvirtd_config: /etc/libvirt/libvirtd.conf
2120
daemon_config_path: {}

‎libvirt/parameters/os/AlmaLinux.yaml‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,5 +10,11 @@
1010
# values: {}
1111
---
1212
values:
13-
python2_pkg: ~
13+
qemu_pkg: qemu-kvm
14+
extra_pkgs:
15+
- python3-devel
16+
- libguestfs
17+
- libvirt-devel
18+
- pkgconf
19+
daemon_config_path: /etc/sysconfig
1420
...

0 commit comments

Comments
 (0)