Skip to content

Commit 03f138b

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

File tree

19 files changed

+141
-468
lines changed

19 files changed

+141
-468
lines changed

.gitlab-ci.yml

Lines changed: 25 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -131,31 +131,18 @@ rubocop:
131131
# Make sure the instances listed below match up with
132132
# the `platforms` defined in `kitchen.yml`
133133
# yamllint disable rule:line-length
134-
# default-debian-11-tiamat-py3: {extends: '.test_instance'}
135-
# default-debian-10-tiamat-py3: {extends: '.test_instance'}
136-
# default-debian-9-tiamat-py3: {extends: '.test_instance'}
137-
# default-ubuntu-2204-tiamat-py3: {extends: '.test_instance_failure_permitted'}
138-
# default-ubuntu-2004-tiamat-py3: {extends: '.test_instance'}
139-
# default-ubuntu-1804-tiamat-py3: {extends: '.test_instance'}
140-
# default-centos-stream8-tiamat-py3: {extends: '.test_instance_failure_permitted'}
141-
# default-centos-7-tiamat-py3: {extends: '.test_instance'}
142-
# default-amazonlinux-2-tiamat-py3: {extends: '.test_instance'}
143-
# default-oraclelinux-8-tiamat-py3: {extends: '.test_instance'}
144-
# default-oraclelinux-7-tiamat-py3: {extends: '.test_instance'}
145-
# default-almalinux-8-tiamat-py3: {extends: '.test_instance'}
146-
# default-rockylinux-8-tiamat-py3: {extends: '.test_instance'}
147134
default-debian-11-master-py3: {extends: '.test_instance'}
148135
default-debian-10-master-py3: {extends: '.test_instance'}
149136
# clean-debian-10-master-py3: {extends: '.test_instance'}
150137
# default-debian-9-master-py3: {extends: '.test_instance'}
151-
default-ubuntu-2204-master-py3: {extends: '.test_instance_failure_permitted'}
138+
default-ubuntu-2204-master-py3: {extends: '.test_instance'}
152139
default-ubuntu-2004-master-py3: {extends: '.test_instance'}
153-
default-ubuntu-1804-master-py3: {extends: '.test_instance'}
154-
default-centos-stream8-master-py3: {extends: '.test_instance_failure_permitted'}
140+
# default-ubuntu-1804-master-py3: {extends: '.test_instance'}
141+
default-centos-stream8-master-py3: {extends: '.test_instance'}
155142
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'}
143+
# default-fedora-36-master-py3: {extends: '.test_instance_failure_permitted'}
144+
# default-fedora-35-master-py3: {extends: '.test_instance'}
145+
# default-opensuse-leap-153-master-py3: {extends: '.test_instance'}
159146
# default-opensuse-tmbl-latest-master-py3: {extends: '.test_instance_failure_permitted'}
160147
# default-amazonlinux-2-master-py3: {extends: '.test_instance'}
161148
# default-oraclelinux-8-master-py3: {extends: '.test_instance'}
@@ -164,37 +151,25 @@ default-opensuse-leap-153-master-py3: {extends: '.test_instance'}
164151
# default-gentoo-stage3-latest-master-py3: {extends: '.test_instance'}
165152
# default-gentoo-stage3-systemd-master-py3: {extends: '.test_instance'}
166153
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'}
154+
# default-rockylinux-8-master-py3: {extends: '.test_instance'}
155+
default-debian-11-3006-5-py3: {extends: '.test_instance'}
156+
default-debian-10-3006-5-py3: {extends: '.test_instance'}
157+
# default-debian-9-3006-5-py3: {extends: '.test_instance'}
158+
default-ubuntu-2204-3006-5-py3: {extends: '.test_instance'}
159+
default-ubuntu-2004-3006-5-py3: {extends: '.test_instance'}
160+
# default-ubuntu-1804-3006-5-py3: {extends: '.test_instance'}
161+
default-centos-stream8-3006-5-py3: {extends: '.test_instance'}
162+
default-centos-7-3006-5-py3: {extends: '.test_instance'}
163+
# default-fedora-36-3006-5-py3: {extends: '.test_instance_failure_permitted'}
164+
# default-fedora-35-3006-5-py3: {extends: '.test_instance'}
165+
# default-amazonlinux-2-3006-5-py3: {extends: '.test_instance'}
166+
# default-oraclelinux-8-3006-5-py3: {extends: '.test_instance'}
167+
# default-oraclelinux-7-3006-5-py3: {extends: '.test_instance'}
168+
# default-arch-base-latest-3006-5-py3: {extends: '.test_instance'}
169+
# default-gentoo-stage3-latest-3006-5-py3: {extends: '.test_instance'}
170+
# default-gentoo-stage3-systemd-3006-5-py3: {extends: '.test_instance'}
171+
default-almalinux-8-3006-5-py3: {extends: '.test_instance'}
172+
# default-rockylinux-8-3006-5-py3: {extends: '.test_instance'}
198173
# yamllint enable rule:line-length
199174

200175
###############################################################################

.travis.yml

Lines changed: 27 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -83,31 +83,17 @@ jobs:
8383
## Define the rest of the matrix based on Kitchen testing
8484
# Make sure the instances listed below match up with
8585
# the `platforms` defined in `kitchen.yml`
86-
# - env: INSTANCE=default-debian-11-tiamat-py3
87-
# - env: INSTANCE=default-debian-10-tiamat-py3
88-
# - env: INSTANCE=default-debian-9-tiamat-py3
89-
# - env: INSTANCE=default-ubuntu-2204-tiamat-py3
90-
# - env: INSTANCE=default-ubuntu-2004-tiamat-py3
91-
# - env: INSTANCE=default-ubuntu-1804-tiamat-py3
92-
# - env: INSTANCE=default-centos-stream8-tiamat-py3
93-
# - env: INSTANCE=default-centos-7-tiamat-py3
94-
# - env: INSTANCE=default-amazonlinux-2-tiamat-py3
95-
# - env: INSTANCE=default-oraclelinux-8-tiamat-py3
96-
# - env: INSTANCE=default-oraclelinux-7-tiamat-py3
97-
# - env: INSTANCE=default-almalinux-8-tiamat-py3
98-
# - env: INSTANCE=default-rockylinux-8-tiamat-py3
99-
# - env: INSTANCE=default-debian-11-master-py3
86+
- env: INSTANCE=default-debian-11-master-py3
10087
- env: INSTANCE=default-debian-10-master-py3
101-
# - env: INSTANCE=clean-debian-10-master-py3
102-
- env: INSTANCE=default-debian-9-master-py3
88+
# - env: INSTANCE=default-debian-9-master-py3
10389
- env: INSTANCE=default-ubuntu-2204-master-py3
10490
- env: INSTANCE=default-ubuntu-2004-master-py3
105-
- env: INSTANCE=default-ubuntu-1804-master-py3
91+
# - env: INSTANCE=default-ubuntu-1804-master-py3
10692
- env: INSTANCE=default-centos-stream8-master-py3
10793
- 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
94+
# - env: INSTANCE=default-fedora-36-master-py3
95+
# - env: INSTANCE=default-fedora-35-master-py3
96+
# - env: INSTANCE=default-opensuse-leap-153-master-py3
11197
# - env: INSTANCE=default-opensuse-tmbl-latest-master-py3
11298
# - env: INSTANCE=default-amazonlinux-2-master-py3
11399
# - env: INSTANCE=default-oraclelinux-8-master-py3
@@ -116,37 +102,27 @@ jobs:
116102
# - env: INSTANCE=default-gentoo-stage3-latest-master-py3
117103
# - env: INSTANCE=default-gentoo-stage3-systemd-master-py3
118104
- 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
105+
# - env: INSTANCE=default-rockylinux-8-master-py3
106+
- env: INSTANCE=default-debian-11-3006-5-py3
107+
- env: INSTANCE=default-debian-10-3006-5-py3
108+
# - env: INSTANCE=default-debian-9-3006-5-py3
109+
- env: INSTANCE=default-ubuntu-2204-3006-5-py3
110+
- env: INSTANCE=default-ubuntu-2004-3006-5-py3
111+
# - env: INSTANCE=default-ubuntu-1804-3006-5-py3
112+
- env: INSTANCE=default-centos-stream8-3006-5-py3
113+
- env: INSTANCE=default-centos-7-3006-5-py3
114+
# - env: INSTANCE=default-fedora-36-3006-5-py3
115+
# - env: INSTANCE=default-fedora-35-3006-5-py3
116+
# - env: INSTANCE=default-opensuse-leap-153-3006-5-py3
117+
# - env: INSTANCE=default-opensuse-tmbl-latest-3006-5-py3
118+
# - env: INSTANCE=default-amazonlinux-2-3006-5-py3
119+
# - env: INSTANCE=default-oraclelinux-8-3006-5-py3
120+
# - env: INSTANCE=default-oraclelinux-7-3006-5-py3
121+
# - env: INSTANCE=default-arch-base-latest-3006-5-py3
122+
# - env: INSTANCE=default-gentoo-stage3-latest-3006-5-py3
123+
# - env: INSTANCE=default-gentoo-stage3-systemd-3006-5-py3
124+
- env: INSTANCE=default-almalinux-8-3006-5-py3
125+
# - env: INSTANCE=default-rockylinux-8-3006-5-py3
150126

151127
## Define the release stage that runs `semantic-release`
152128
- stage: 'release'

0 commit comments

Comments
 (0)