Skip to content

Commit db5eadc

Browse files
authored
HMS-5923: add support for rhel10 (#510)
* HMS-5923: add support for rhel10 * fix popular repo pw tests * fix formatting
1 parent 1254725 commit db5eadc

File tree

4 files changed

+46
-6
lines changed

4 files changed

+46
-6
lines changed

_playwright-tests/UI/PopularRepo.spec.ts

Lines changed: 34 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ import { navigateToRepositories } from './helpers/navHelpers';
33
import { closePopupsIfExist, getRowByNameOrUrl } from './helpers/helpers';
44
import { deleteAllPopularRepos } from './helpers/deletePopularRepositories';
55

6+
const repoName10 = 'EPEL 10 Everything x86_64';
67
const repoName9 = 'EPEL 9 Everything x86_64';
78
const repoName8 = 'EPEL 8 Everything x86_64';
89

@@ -21,25 +22,40 @@ test.describe('Popular Repositories', () => {
2122
await expect(page.getByRole('button', { name: 'Add selected repositories' })).toBeVisible();
2223
});
2324

24-
await test.step('Select EPEL 9', async () => {
25+
await test.step('Select EPEL 10', async () => {
2526
await page
26-
.getByRole('row', { name: repoName9 })
27+
.getByRole('row', { name: repoName10 })
2728
.getByLabel('Select row 0', { exact: true })
2829
.click();
2930
await page.getByTestId('add-selected-dropdown-toggle-no-snap');
3031
await page.getByRole('menuitem', { name: 'Add 1 repositories without snapshotting' });
3132
});
3233

34+
await test.step('Select EPEL 9', async () => {
35+
await page
36+
.getByRole('row', { name: repoName9 })
37+
.getByLabel('Select row 1', { exact: true })
38+
.click();
39+
await page.getByTestId('add-selected-dropdown-toggle-no-snap');
40+
await page.getByRole('menuitem', { name: 'Add 2 repositories without snapshotting' });
41+
});
42+
3343
await test.step('Select EPEL 8 and add both repos', async () => {
3444
await page
3545
.getByRole('row', { name: repoName8 })
36-
.getByLabel('Select row 1', { exact: true })
46+
.getByLabel('Select row 2', { exact: true })
3747
.click();
3848
await page.getByTestId('add-selected-dropdown-toggle-no-snap').click();
39-
await page.getByRole('menuitem', { name: 'Add 2 repositories without snapshotting' }).click();
49+
await page.getByRole('menuitem', { name: 'Add 3 repositories without snapshotting' }).click();
4050
});
4151

4252
await test.step('Check buttons have changed from Add to Remove', async () => {
53+
await expect(
54+
page
55+
.getByRole('row', { name: repoName10 })
56+
.getByTestId('remove_popular_repo')
57+
.getByText('Remove'),
58+
).toBeVisible();
4359
await expect(
4460
page
4561
.getByRole('row', { name: repoName8 })
@@ -83,6 +99,20 @@ test.describe('Popular Repositories', () => {
8399
await test.step('Use kebab menu to delete a repo', async () => {
84100
const row = await getRowByNameOrUrl(page, repoName9);
85101
await row.getByRole('checkbox', { name: 'Select row' }).check();
102+
103+
await page.getByTestId('custom_repositories_kebab_toggle').click();
104+
await page.getByRole('menuitem', { name: 'Remove 1 repositories' }).click();
105+
// Confirm the removal in the pop-up
106+
await page
107+
.getByRole('dialog', { name: 'Remove repositories?' })
108+
.getByRole('button', { name: 'Remove' })
109+
.click();
110+
});
111+
112+
await test.step('Use kebab menu to delete a repo', async () => {
113+
const row = await getRowByNameOrUrl(page, repoName10);
114+
await row.getByRole('checkbox', { name: 'Select row' }).check();
115+
86116
await page.getByTestId('custom_repositories_kebab_toggle').click();
87117
await page.getByRole('menuitem', { name: 'Remove 1 repositories' }).click();
88118
// Confirm the removal in the pop-up

src/Pages/Templates/TemplatesTable/components/AddTemplate/AddTemplate.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ const AddTemplateBase = () => {
143143
</WizardStep>,
144144
<WizardStep
145145
isDisabled={checkIfCurrentStepValid(2)}
146-
name='Custom Repositories'
146+
name='Custom repositories'
147147
id='custom_repositories'
148148
key='custom_repositories_key'
149149
footer={{ ...sharedFooterProps, isNextDisabled: checkIfCurrentStepValid(3) }}

src/Pages/Templates/TemplatesTable/components/AddTemplate/steps/DefineContentStep.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ export default function DefineContentStep() {
4545
.map(({ label, name }) => ({ value: label, children: name }));
4646

4747
const allowedDistributionVersions = distribution_versions
48-
.filter(({ label }) => ['8', '9'].includes(label))
48+
.filter(({ label }) => ['8', '9', '10'].includes(label))
4949
.map(({ label, name }) => ({ value: label, children: name }));
5050

5151
return (

src/Pages/Templates/TemplatesTable/components/templateHelpers.ts

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,11 @@ export const hardcodeRedHatReposByArchAndVersion = (
1616
'https://cdn.redhat.com/content/dist/rhel9/9/x86_64/appstream/os',
1717
'https://cdn.redhat.com/content/dist/rhel9/9/x86_64/baseos/os',
1818
];
19+
case arch === 'x86_64' && version === '10':
20+
return [
21+
'https://cdn.redhat.com/content/dist/rhel10/10/x86_64/appstream/os',
22+
'https://cdn.redhat.com/content/dist/rhel10/10/x86_64/baseos/os',
23+
];
1924
case arch === 'aarch64' && version === '8':
2025
return [
2126
'https://cdn.redhat.com/content/dist/rhel8/8/aarch64/appstream/os',
@@ -26,6 +31,11 @@ export const hardcodeRedHatReposByArchAndVersion = (
2631
'https://cdn.redhat.com/content/dist/rhel9/9/aarch64/appstream/os',
2732
'https://cdn.redhat.com/content/dist/rhel9/9/aarch64/baseos/os',
2833
];
34+
case arch === 'aarch64' && version === '10':
35+
return [
36+
'https://cdn.redhat.com/content/dist/rhel10/10/aarch64/appstream/os',
37+
'https://cdn.redhat.com/content/dist/rhel10/10/aarch64/baseos/os',
38+
];
2939

3040
default:
3141
return;

0 commit comments

Comments
 (0)