Skip to content

Commit f6bea3d

Browse files
authored
[chore][ci] Removing leftovers of Amazon Linux 2 in CI (#6097)
1 parent 52368cc commit f6bea3d

File tree

3 files changed

+0
-18
lines changed

3 files changed

+0
-18
lines changed

.github/workflows/linux-package-test.yml

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -206,10 +206,6 @@ jobs:
206206
continue-on-error: true
207207
run: |
208208
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
213209
python3 -u -m pytest -s --verbose -m "${{ env.SYS_PACKAGE }}" \
214210
-k "$distro and ${{ matrix.ARCH }}" \
215211
packaging/tests/package_test.py
@@ -219,10 +215,6 @@ jobs:
219215
if: ${{ steps.pytest.outcome == 'failure' }}
220216
run: |
221217
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
226218
python3 -u -m pytest -s --verbose -m "${{ env.SYS_PACKAGE }}" \
227219
-k "$distro and ${{ matrix.ARCH }}" \
228220
--last-failed \

.github/workflows/puppet-test.yml

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -109,10 +109,6 @@ jobs:
109109
PUPPET_RELEASE: "${{ matrix.PUPPET_RELEASE }}"
110110
run: |
111111
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
116112
if [[ "${{ matrix.WITH_INSTRUMENTATION }}" = "true" ]]; then
117113
tests="$distro and instrumentation"
118114
else
@@ -128,10 +124,6 @@ jobs:
128124
PUPPET_RELEASE: "${{ matrix.PUPPET_RELEASE }}"
129125
run: |
130126
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
135127
if [[ "${{ matrix.WITH_INSTRUMENTATION }}" = "true" ]]; then
136128
tests="$distro and instrumentation"
137129
else

deployments/ansible/molecule/config/vagrant.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,6 @@ platforms:
1515
box: centos/8
1616
- name: bookworm64
1717
box: debian/bookworm64
18-
- name: amazonlinux
19-
box: bento/amazonlinux-2
2018
provisioner:
2119
env:
2220
ANSIBLE_ROLES_PATH: ../../roles

0 commit comments

Comments
 (0)