Skip to content
Open
Show file tree
Hide file tree
Changes from 4 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
6 changes: 4 additions & 2 deletions vars/distroVersion.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,10 @@ String call(String distro, String branch) {
'2.8': '9.7'],
'leap15': ['master': '15.6',
'2.4': '15.6',
'2.6': '15.6',
'2.8': '15.6'],
'2.6': '15.6'],
Comment thread
jzarzycki marked this conversation as resolved.
Outdated
'sles15': ['master': '15.7',
'2.4': '15.7',
'2.6': '15.7'],
Comment thread
jzarzycki marked this conversation as resolved.
Outdated
'ubuntu20': ['master': '20.04']][distro][branch]
}

Expand Down
2 changes: 1 addition & 1 deletion vars/functionalPackages.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ String call(String distro, Integer client_ver, String next_version, String add_d
'Hopefully the daos-tests packages have the dependencies configured.'
}

if (distro.startsWith('leap') ||
if (distro.startsWith('leap') || distro.startsWith('sles') ||
distro.startsWith('el') || distro.startsWith('centos') ||
distro.startsWith('rocky') || distro.startsWith('almalinux') ||
distro.startsWith('rhel') || distro.startsWith('ubuntu')) {
Expand Down
2 changes: 2 additions & 0 deletions vars/prRepos.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,8 @@ String call(String distro=null) {
_distro.startsWith('rocky9') || _distro.startsWith('almalinux9') ||
_distro.startsWith('rhel9')) {
repos = cachedCommitPragma('PR-repos-el9')
} else if (_distro.startsWith('sles15')) {
repos = cachedCommitPragma('PR-repos-sles15')
} else if (_distro.startsWith('leap15')) {
repos = cachedCommitPragma('PR-repos-leap15')
} else if (_distro.startsWith('ubuntu20')) {
Expand Down
2 changes: 2 additions & 0 deletions vars/skipStage.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -439,6 +439,7 @@ boolean call(Map config = [:]) {
case 'Functional on Leap 15.4':
case 'Functional on Leap 15.5':
case 'Functional on Leap 15.6':
case 'Functional on SLES 15.7':
return skip_ftest('leap15', target_branch, tags)
case 'Functional on Ubuntu 20.04':
/* we don't do any testing on Ubuntu yet
Expand Down Expand Up @@ -561,6 +562,7 @@ boolean call(Map config = [:]) {
case 'Test RPMs on Leap 15.4':
case 'Test RPMs on Leap 15.5':
case 'Test RPMs on Leap 15.6':
case 'Test RPMs on SLES 15.7':
return !paramsValue('CI_RPMS_leap15_TEST', true) ||
target_branch =~ branchTypeRE('weekly') ||
skip_stage_pragma('build-leap15-rpm') ||
Expand Down