File tree Expand file tree Collapse file tree 3 files changed +0
-18
lines changed
deployments/ansible/molecule/config Expand file tree Collapse file tree 3 files changed +0
-18
lines changed Original file line number Diff line number Diff line change @@ -206,10 +206,6 @@ jobs:
206
206
continue-on-error : true
207
207
run : |
208
208
distro="${{ matrix.DISTRO }}"
209
- if [[ "$distro" = "amazonlinux-2" ]]; then
210
- # workaround for pytest substring matching
211
- distro="amazonlinux-2 and not amazonlinux-2023"
212
- fi
213
209
python3 -u -m pytest -s --verbose -m "${{ env.SYS_PACKAGE }}" \
214
210
-k "$distro and ${{ matrix.ARCH }}" \
215
211
packaging/tests/package_test.py
@@ -219,10 +215,6 @@ jobs:
219
215
if : ${{ steps.pytest.outcome == 'failure' }}
220
216
run : |
221
217
distro="${{ matrix.DISTRO }}"
222
- if [[ "$distro" = "amazonlinux-2" ]]; then
223
- # workaround for pytest substring matching
224
- distro="amazonlinux-2 and not amazonlinux-2023"
225
- fi
226
218
python3 -u -m pytest -s --verbose -m "${{ env.SYS_PACKAGE }}" \
227
219
-k "$distro and ${{ matrix.ARCH }}" \
228
220
--last-failed \
Original file line number Diff line number Diff line change @@ -109,10 +109,6 @@ jobs:
109
109
PUPPET_RELEASE : " ${{ matrix.PUPPET_RELEASE }}"
110
110
run : |
111
111
distro="${{ matrix.DISTRO }}"
112
- if [[ "$distro" = "amazonlinux-2" ]]; then
113
- # workaround for pytest substring matching
114
- distro="amazonlinux-2 and not amazonlinux-2023"
115
- fi
116
112
if [[ "${{ matrix.WITH_INSTRUMENTATION }}" = "true" ]]; then
117
113
tests="$distro and instrumentation"
118
114
else
@@ -128,10 +124,6 @@ jobs:
128
124
PUPPET_RELEASE : " ${{ matrix.PUPPET_RELEASE }}"
129
125
run : |
130
126
distro="${{ matrix.DISTRO }}"
131
- if [[ "$distro" = "amazonlinux-2" ]]; then
132
- # workaround for pytest substring matching
133
- distro="amazonlinux-2 and not amazonlinux-2023"
134
- fi
135
127
if [[ "${{ matrix.WITH_INSTRUMENTATION }}" = "true" ]]; then
136
128
tests="$distro and instrumentation"
137
129
else
Original file line number Diff line number Diff line change @@ -15,8 +15,6 @@ platforms:
15
15
box : centos/8
16
16
- name : bookworm64
17
17
box : debian/bookworm64
18
- - name : amazonlinux
19
- box : bento/amazonlinux-2
20
18
provisioner :
21
19
env :
22
20
ANSIBLE_ROLES_PATH : ../../roles
You can’t perform that action at this time.
0 commit comments