@@ -137,6 +137,7 @@ rubocop:
137137# OpenSUSE master branch will fail until zypperpkg module is back in salt core
138138# https://github.com/saltstack/great-module-migration/issues/14
139139#
140+ <<<<<<< before updating
140141# default-debian-12-master-py3: {extends: '.test_instance'}
141142# default-debian-11-master-py3: {extends: '.test_instance'}
142143# default-ubuntu-2404-master-py3: {extends: '.test_instance'}
@@ -155,12 +156,33 @@ rubocop:
155156# default-almalinux-8-master-py3: {extends: '.test_instance'}
156157# default-rockylinux-9-master-py3: {extends: '.test_instance'}
157158# default-rockylinux-8-master-py3: {extends: '.test_instance'}
159+ =======
160+ debian-12-master-py3 : {extends: '.test_instance'}
161+ debian-11-master-py3 : {extends: '.test_instance'}
162+ ubuntu-2404-master-py3 : {extends: '.test_instance'}
163+ ubuntu-2204-master-py3 : {extends: '.test_instance'}
164+ ubuntu-2004-master-py3 : {extends: '.test_instance'}
165+ centos-stream9-master-py3 : {extends: '.test_instance'}
166+ opensuse-leap-156-master-py3 : {extends: '.test_instance_failure_permitted'}
167+ opensuse-leap-155-master-py3 : {extends: '.test_instance'}
168+ opensuse-tmbl-latest-master-py3 : {extends: '.test_instance'}
169+ amazonlinux-2023-master-py3 : {extends: '.test_instance'}
170+ fedora-41-master-py3 : {extends: '.test_instance_failure_permitted'}
171+ fedora-40-master-py3 : {extends: '.test_instance'}
172+ oraclelinux-9-master-py3 : {extends: '.test_instance'}
173+ oraclelinux-8-master-py3 : {extends: '.test_instance'}
174+ almalinux-9-master-py3 : {extends: '.test_instance'}
175+ almalinux-8-master-py3 : {extends: '.test_instance'}
176+ rockylinux-9-master-py3 : {extends: '.test_instance'}
177+ rockylinux-8-master-py3 : {extends: '.test_instance'}
178+ >>>>>>> after updating
158179debian-12-3007-1-py3 : {extends: '.test_instance'}
159180debian-11-3007-1-py3 : {extends: '.test_instance'}
160181ubuntu-2404-3007-1-py3 : {extends: '.test_instance'}
161182ubuntu-2204-3007-1-py3 : {extends: '.test_instance'}
162183ubuntu-2004-3007-1-py3 : {extends: '.test_instance'}
163184centos-stream9-3007-1-py3 : {extends: '.test_instance'}
185+ <<<<<<< before updating
164186# default-opensuse-leap-156-3007-1-py3: {extends: '.test_instance'}
165187# default-opensuse-leap-155-3007-1-py3: {extends: '.test_instance'}
166188# default-opensuse-tmbl-latest-3007-1-py3: {extends: '.test_instance'}
@@ -174,12 +196,28 @@ centos-stream9-3007-1-py3: {extends: '.test_instance'}
174196# default-almalinux-8-3007-1-py3: {extends: '.test_instance'}
175197# default-rockylinux-9-3007-1-py3: {extends: '.test_instance'}
176198# default-rockylinux-8-3007-1-py3: {extends: '.test_instance'}
199+ =======
200+ opensuse-leap-156-3007-1-py3 : {extends: '.test_instance'}
201+ opensuse-leap-155-3007-1-py3 : {extends: '.test_instance'}
202+ opensuse-tmbl-latest-3007-1-py3 : {extends: '.test_instance'}
203+ fedora-41-3007-1-py3 : {extends: '.test_instance_failure_permitted'}
204+ fedora-40-3007-1-py3 : {extends: '.test_instance'}
205+ amazonlinux-2-3007-1-py3 : {extends: '.test_instance_failure_permitted'}
206+ amazonlinux-2023-3007-1-py3 : {extends: '.test_instance'}
207+ oraclelinux-9-3007-1-py3 : {extends: '.test_instance'}
208+ oraclelinux-8-3007-1-py3 : {extends: '.test_instance'}
209+ almalinux-9-3007-1-py3 : {extends: '.test_instance'}
210+ almalinux-8-3007-1-py3 : {extends: '.test_instance'}
211+ rockylinux-9-3007-1-py3 : {extends: '.test_instance'}
212+ rockylinux-8-3007-1-py3 : {extends: '.test_instance'}
213+ >>>>>>> after updating
177214debian-12-3006-10-py3 : {extends: '.test_instance'}
178215debian-11-3006-10-py3 : {extends: '.test_instance'}
179216ubuntu-2404-3006-10-py3 : {extends: '.test_instance'}
180217ubuntu-2204-3006-10-py3 : {extends: '.test_instance'}
181218ubuntu-2004-3006-10-py3 : {extends: '.test_instance'}
182219centos-stream9-3006-10-py3 : {extends: '.test_instance'}
220+ <<<<<<< before updating
183221# default-opensuse-leap-156-3006-10-py3: {extends: '.test_instance'}
184222# default-opensuse-leap-155-3006-10-py3: {extends: '.test_instance'}
185223# default-opensuse-tmbl-latest-3006-10-py3: {extends: '.test_instance'}
@@ -193,6 +231,21 @@ centos-stream9-3006-10-py3: {extends: '.test_instance'}
193231# default-almalinux-8-3006-10-py3: {extends: '.test_instance'}
194232# default-rockylinux-9-3006-10-py3: {extends: '.test_instance'}
195233# default-rockylinux-8-3006-10-py3: {extends: '.test_instance'}
234+ =======
235+ opensuse-leap-156-3006-10-py3 : {extends: '.test_instance'}
236+ opensuse-leap-155-3006-10-py3 : {extends: '.test_instance'}
237+ opensuse-tmbl-latest-3006-10-py3 : {extends: '.test_instance'}
238+ fedora-41-3006-10-py3 : {extends: '.test_instance_failure_permitted'}
239+ fedora-40-3006-10-py3 : {extends: '.test_instance'}
240+ amazonlinux-2-3006-10-py3 : {extends: '.test_instance_failure_permitted'}
241+ amazonlinux-2023-3006-10-py3 : {extends: '.test_instance'}
242+ oraclelinux-9-3006-10-py3 : {extends: '.test_instance'}
243+ oraclelinux-8-3006-10-py3 : {extends: '.test_instance'}
244+ almalinux-9-3006-10-py3 : {extends: '.test_instance'}
245+ almalinux-8-3006-10-py3 : {extends: '.test_instance'}
246+ rockylinux-9-3006-10-py3 : {extends: '.test_instance'}
247+ rockylinux-8-3006-10-py3 : {extends: '.test_instance'}
248+ >>>>>>> after updating
196249# yamllint enable rule:line-length
197250
198251# ##############################################################################
0 commit comments