|
24 | 24 | matrix = [
|
25 | 25 | 'matrix={',
|
26 | 26 | '"platforms":[',
|
27 |
| - '{"label":"Ubuntu-18.04","provider":"docker","arch":"x86_64","image":"litmusimage/ubuntu:18.04"},', |
28 |
| - '{"label":"Ubuntu-22.04","provider":"docker","arch":"x86_64","image":"litmusimage/ubuntu:22.04"}', |
| 27 | + '{"label":"AmazonLinux-2","provider":"docker","arch":"x86_64","image":"litmusimage/amazonlinux:2","runner":"ubuntu-20.04"},', |
| 28 | + '{"label":"AmazonLinux-2023","provider":"docker","arch":"x86_64","image":"litmusimage/amazonlinux:2023","runner":"ubuntu-20.04"},', |
| 29 | + '{"label":"Ubuntu-18.04","provider":"docker","arch":"x86_64","image":"litmusimage/ubuntu:18.04","runner":"ubuntu-20.04"},', |
| 30 | + '{"label":"Ubuntu-22.04","provider":"docker","arch":"x86_64","image":"litmusimage/ubuntu:22.04","runner":"ubuntu-latest"}', |
29 | 31 | '],',
|
30 | 32 | '"collection":[',
|
31 | 33 | '"puppet7-nightly","puppet8-nightly"',
|
|
91 | 93 | [
|
92 | 94 | 'matrix={',
|
93 | 95 | '"platforms":[',
|
94 |
| - '{"label":"RedHat-8","provider":"provision_service","arch":"x86_64","image":"rhel-8"},', |
95 |
| - '{"label":"RedHat-9","provider":"provision_service","arch":"x86_64","image":"rhel-9"},', |
96 |
| - '{"label":"RedHat-9-arm","provider":"provision_service","arch":"arm","image":"rhel-9-arm64"},', |
97 |
| - '{"label":"Ubuntu-18.04","provider":"docker","arch":"x86_64","image":"litmusimage/ubuntu:18.04"},', |
98 |
| - '{"label":"Ubuntu-22.04","provider":"docker","arch":"x86_64","image":"litmusimage/ubuntu:22.04"},', |
99 |
| - '{"label":"Ubuntu-22.04-arm","provider":"provision_service","arch":"arm","image":"ubuntu-2204-lts-arm64"}', |
| 96 | + '{"label":"AmazonLinux-2","provider":"docker","arch":"x86_64","image":"litmusimage/amazonlinux:2","runner":"ubuntu-20.04"},', |
| 97 | + '{"label":"AmazonLinux-2023","provider":"docker","arch":"x86_64","image":"litmusimage/amazonlinux:2023","runner":"ubuntu-20.04"},', |
| 98 | + '{"label":"RedHat-8","provider":"provision_service","arch":"x86_64","image":"rhel-8","runner":"ubuntu-latest"},', |
| 99 | + '{"label":"RedHat-9","provider":"provision_service","arch":"x86_64","image":"rhel-9","runner":"ubuntu-latest"},', |
| 100 | + '{"label":"RedHat-9-arm","provider":"provision_service","arch":"arm","image":"rhel-9-arm64","runner":"ubuntu-latest"},', |
| 101 | + '{"label":"Ubuntu-18.04","provider":"docker","arch":"x86_64","image":"litmusimage/ubuntu:18.04","runner":"ubuntu-20.04"},', |
| 102 | + '{"label":"Ubuntu-22.04","provider":"docker","arch":"x86_64","image":"litmusimage/ubuntu:22.04","runner":"ubuntu-latest"},', |
| 103 | + '{"label":"Ubuntu-22.04-arm","provider":"provision_service","arch":"arm","image":"ubuntu-2204-lts-arm64","runner":"ubuntu-latest"}', |
100 | 104 | '],',
|
101 | 105 | '"collection":[',
|
102 | 106 | '"puppet7-nightly","puppet8-nightly"',
|
|
129 | 133 | [
|
130 | 134 | 'matrix={',
|
131 | 135 | '"platforms":[',
|
132 |
| - '{"label":"RedHat-8","provider":"provision_service","arch":"x86_64","image":"rhel-8"},', |
133 |
| - '{"label":"RedHat-9","provider":"provision_service","arch":"x86_64","image":"rhel-9"},', |
134 |
| - '{"label":"RedHat-9-arm","provider":"provision_service","arch":"arm","image":"rhel-9-arm64"},', |
135 |
| - '{"label":"Ubuntu-22.04","provider":"docker","arch":"x86_64","image":"litmusimage/ubuntu:22.04"},', |
136 |
| - '{"label":"Ubuntu-22.04-arm","provider":"provision_service","arch":"arm","image":"ubuntu-2204-lts-arm64"}', |
| 136 | + '{"label":"AmazonLinux-2","provider":"docker","arch":"x86_64","image":"litmusimage/amazonlinux:2","runner":"ubuntu-20.04"},', |
| 137 | + '{"label":"AmazonLinux-2023","provider":"docker","arch":"x86_64","image":"litmusimage/amazonlinux:2023","runner":"ubuntu-20.04"},', |
| 138 | + '{"label":"RedHat-8","provider":"provision_service","arch":"x86_64","image":"rhel-8","runner":"ubuntu-latest"},', |
| 139 | + '{"label":"RedHat-9","provider":"provision_service","arch":"x86_64","image":"rhel-9","runner":"ubuntu-latest"},', |
| 140 | + '{"label":"RedHat-9-arm","provider":"provision_service","arch":"arm","image":"rhel-9-arm64","runner":"ubuntu-latest"},', |
| 141 | + '{"label":"Ubuntu-22.04","provider":"docker","arch":"x86_64","image":"litmusimage/ubuntu:22.04","runner":"ubuntu-latest"},', |
| 142 | + '{"label":"Ubuntu-22.04-arm","provider":"provision_service","arch":"arm","image":"ubuntu-2204-lts-arm64","runner":"ubuntu-latest"}', |
137 | 143 | '],',
|
138 | 144 | '"collection":[',
|
139 | 145 | '"puppet7-nightly","puppet8-nightly"',
|
|
162 | 168 | end
|
163 | 169 |
|
164 | 170 | context 'with --platform-exclude "ubuntu-(18.04|22.04)" --platform-exclude "redhat-[89]"' do
|
165 |
| - let(:result) { run_matrix_from_metadata_v3(['--puppetlabs', '--platform-exclude', 'ubuntu-(18.04|22.04)', '--platform-exclude', 'redhat-[89]']) } |
| 171 | + let(:result) { run_matrix_from_metadata_v3(['--puppetlabs', '--platform-exclude', '(amazonlinux|ubuntu)-(2|18.04|22.04|2023)', '--platform-exclude', 'redhat-[89]']) } |
166 | 172 | let(:matrix) do
|
167 | 173 | [
|
168 | 174 | 'matrix={',
|
|
0 commit comments