Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Handle HPC on-demand repos. #240

Merged
merged 1 commit into from
Mar 10, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
78 changes: 78 additions & 0 deletions usr/share/lib/img_proof/tests/SLES/conftest.py
Original file line number Diff line number Diff line change
Expand Up @@ -336,6 +336,40 @@
'SLE-Product-SLES_SAP15-SP1-Updates'
]

SLE_15_SP1_HPC = [
'SLE-Product-HPC-15-SP1-Pool',
'SLE-Product-HPC-15-SP1-Updates',
'SLE-Product-HPC15-SP1-Debuginfo-Pool',
'SLE-Product-HPC15-SP1-Debuginfo-Updates',
'SLE-Product-HPC15-SP1-Source-Pool',
'SLE-Module-Containers15-SP1-Debuginfo-Pool',
'SLE-Module-Containers15-SP1-Debuginfo-Updates',
'SLE-Module-Containers15-SP1-Pool',
'SLE-Module-Containers15-SP1-Updates',
'SLE-Module-Desktop-Applications15-SP1-Debuginfo-Pool',
'SLE-Module-Desktop-Applications15-SP1-Debuginfo-Updates',
'SLE-Module-Desktop-Applications15-SP1-Pool',
'SLE-Module-Desktop-Applications15-SP1-Updates',
'SLE-Module-DevTools15-SP1-Debuginfo-Pool',
'SLE-Module-DevTools15-SP1-Debuginfo-Updates',
'SLE-Module-DevTools15-SP1-Pool',
'SLE-Module-DevTools15-SP1-Updates',
'SLE-Module-Public-Cloud15-SP1-Debuginfo-Pool',
'SLE-Module-Public-Cloud15-SP1-Debuginfo-Updates',
'SLE-Module-Public-Cloud15-SP1-Pool',
'SLE-Module-Public-Cloud15-SP1-Updates',
'SLE-Module-Python2-15-SP1-Pool',
'SLE-Module-Python2-15-SP1-Updates',
'SLE-Module-Server-Applications15-SP1-Debuginfo-Pool',
'SLE-Module-Server-Applications15-SP1-Debuginfo-Updates',
'SLE-Module-Server-Applications15-SP1-Pool',
'SLE-Module-Server-Applications15-SP1-Updates',
'SLE-Module-Web-Scripting15-SP1-Debuginfo-Pool',
'SLE-Module-Web-Scripting15-SP1-Debuginfo-Updates',
'SLE-Module-Web-Scripting15-SP1-Pool',
'SLE-Module-Web-Scripting15-SP1-Updates'
]

SLE_15_SP2_BASE = [
'SLE-Module-Basesystem15-SP2-Debuginfo-Pool',
'SLE-Module-Basesystem15-SP2-Debuginfo-Updates',
Expand Down Expand Up @@ -403,32 +437,74 @@
'SLE-Product-SLES_SAP15-SP2-Updates'
]

SLE_15_SP2_HPC = [
'SLE-Product-HPC-15-SP2-Pool',
'SLE-Product-HPC-15-SP2-Updates',
'SLE-Product-HPC15-SP2-Debuginfo-Pool',
'SLE-Product-HPC15-SP2-Debuginfo-Updates',
'SLE-Product-HPC15-SP2-Source-Pool',
'SLE-Module-Containers15-SP2-Debuginfo-Pool',
'SLE-Module-Containers15-SP2-Debuginfo-Updates',
'SLE-Module-Containers15-SP2-Pool',
'SLE-Module-Containers15-SP2-Updates',
'SLE-Module-Desktop-Applications15-SP2-Debuginfo-Pool',
'SLE-Module-Desktop-Applications15-SP2-Debuginfo-Updates',
'SLE-Module-Desktop-Applications15-SP2-Pool',
'SLE-Module-Desktop-Applications15-SP2-Updates',
'SLE-Module-DevTools15-SP2-Debuginfo-Pool',
'SLE-Module-DevTools15-SP2-Debuginfo-Updates',
'SLE-Module-DevTools15-SP2-Pool',
'SLE-Module-DevTools15-SP2-Updates',
'SLE-Module-Public-Cloud15-SP2-Debuginfo-Pool',
'SLE-Module-Public-Cloud15-SP2-Debuginfo-Updates',
'SLE-Module-Public-Cloud15-SP2-Pool',
'SLE-Module-Public-Cloud15-SP2-Updates',
'SLE-Module-Python2-15-SP2-Pool',
'SLE-Module-Python2-15-SP2-Updates',
'SLE-Module-Server-Applications15-SP2-Debuginfo-Pool',
'SLE-Module-Server-Applications15-SP2-Debuginfo-Updates',
'SLE-Module-Server-Applications15-SP2-Pool',
'SLE-Module-Server-Applications15-SP2-Updates',
'SLE-Module-Web-Scripting15-SP2-Debuginfo-Pool',
'SLE-Module-Web-Scripting15-SP2-Debuginfo-Updates',
'SLE-Module-Web-Scripting15-SP2-Pool',
'SLE-Module-Web-Scripting15-SP2-Updates'
]

BASE_15 = SLE_15_BASE + SLE_15_MODULES + SLE_15_PRODUCTS
BASE_15_SAP = SLE_15_SAP + SLE_15_BASE + SLE_15_MODULES
BASE_15_SP1 = SLE_15_SP1_BASE + SLE_15_SP1_MODULES + SLE_15_SP1_PRODUCTS
BASE_15_SP1_SAP = SLE_15_SP1_SAP + SLE_15_SP1_BASE + SLE_15_SP1_MODULES
BASE_15_SP1_HPC = SLE_15_SP1_BASE + SLE_15_SP1_HPC
BASE_15_SP2 = SLE_15_SP2_BASE + SLE_15_SP2_MODULES + SLE_15_SP2_PRODUCTS
BASE_15_SP2_SAP = SLE_15_SP2_SAP + SLE_15_SP2_BASE + SLE_15_SP2_MODULES
BASE_15_SP2_HPC = SLE_15_SP2_BASE + SLE_15_SP2_HPC

SLES_REPOS = {
'11.4-X86_64': SLE_11_SP4_BASE + SLE_11_SP4_MODULES,
'12-X86_64': SLE_12_BASE + SLE_12_MODULES,
'12-X86_64-SAP': SLE_12_SAP + SLE_12_BASE + SLE_12_MODULES,
'12-X86_64-HPC': SLE_12_BASE + SLE_12_MODULES,
'12-SP1-X86_64': SLE_12_SP1_BASE + SLE_12_SP1_MODULES,
'12-SP1-X86_64-SAP':
SLE_12_SP1_SAP + SLE_12_SP1_BASE + SLE_12_SP1_MODULES,
'12-SP1-X86_64-HPC': SLE_12_SP1_BASE + SLE_12_SP1_MODULES,
'12-SP2-X86_64': SLE_12_SP2_BASE + SLE_12_SP2_MODULES,
'12-SP2-X86_64-SAP':
SLE_12_SP2_SAP + SLE_12_SP2_BASE + SLE_12_SP2_MODULES,
'12-SP2-X86_64-HPC': SLE_12_SP2_BASE + SLE_12_SP2_MODULES,
'12-SP3-X86_64': SLE_12_SP3_BASE + SLE_12_SP3_MODULES,
'12-SP3-X86_64-SAP':
SLE_12_SP3_SAP + SLE_12_SP3_BASE + SLE_12_SP3_MODULES,
'12-SP3-X86_64-HPC': SLE_12_SP3_BASE + SLE_12_SP3_MODULES,
'12-SP4-X86_64': SLE_12_SP4_BASE + SLE_12_SP4_MODULES,
'12-SP4-X86_64-SAP':
SLE_12_SP4_SAP + SLE_12_SP4_BASE + SLE_12_SP4_MODULES,
'12-SP4-X86_64-HPC': SLE_12_SP4_BASE + SLE_12_SP4_MODULES,
'12-SP5-X86_64': SLE_12_SP5_BASE + SLE_12_SP5_MODULES,
'12-SP5-X86_64-SAP':
SLE_12_SP5_SAP + SLE_12_SP5_BASE + SLE_12_SP5_MODULES,
'12-SP5-X86_64-HPC': SLE_12_SP5_BASE + SLE_12_SP5_MODULES,
'15-AARCH64': BASE_15,
'15-AARCH64-SAP': BASE_15_SAP,
'15-X86_64': BASE_15 + SLE_15_X86_64_MODULES,
Expand All @@ -437,10 +513,12 @@
'15-SP1-AARCH64-SAP': BASE_15_SP1_SAP,
'15-SP1-X86_64': BASE_15_SP1 + SLE_15_SP1_X86_64_MODULES,
'15-SP1-X86_64-SAP': BASE_15_SP1_SAP + SLE_15_SP1_X86_64_MODULES,
'15-SP1-X86_64-HPC': BASE_15_SP1_HPC,
'15-SP2-AARCH64': BASE_15_SP2,
'15-SP2-AARCH64-SAP': BASE_15_SP2_SAP,
'15-SP2-X86_64': BASE_15_SP2 + SLE_15_SP2_X86_64_MODULES,
'15-SP2-X86_64-SAP': BASE_15_SP2_SAP + SLE_15_SP2_X86_64_MODULES,
'15-SP2-X86_64-HPC': BASE_15_SP2_HPC,
}


Expand Down
8 changes: 5 additions & 3 deletions usr/share/lib/img_proof/tests/SLES/test_sles_repos.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,16 @@ def test_sles_repos(
get_instance_repos,
get_release_value,
get_sles_repos,
is_sles_sap,
get_baseproduct,
determine_architecture
):
version = [get_release_value('VERSION'), determine_architecture()]

sap = is_sles_sap()
if sap:
product = get_baseproduct()
if 'sap' in product.lower():
version.append('SAP')
if 'hpc' in product.lower():
version.append('HPC')

version = '-'.join(version)

Expand Down