Skip to content

Add SLES 15.7 support #490

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.

Sign up for GitHub

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

Draft
jzarzycki wants to merge 1 commit into
base: master
Choose a base branch
from
+13 −2
Draft

Add SLES 15.7 support #490

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 3 additions & 0 deletions vars/distroVersion.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,9 @@ String call(String distro, String branch) {
'leap15': ['master': '15.6',
'2.4': '15.6',
'2.6': '15.6'],
'sles15': ['master': '15.7',
'2.4': '15.7',
'2.6': '15.7'],
'ubuntu20': ['master': '20.04']][distro][branch]
}

Expand Down
10 changes: 8 additions & 2 deletions vars/parseStageInfo.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,10 @@ Map call(Map config = [:]) {
result['target'] = 'leap15'
result['distro_version'] = cachedCommitPragma('LEAP15-version', '15.3')
new_ci_target = cachedCommitPragma('LEAP15-target', result['target'])
} else if (stage_name.contains('SLES 15.7')) {
result['target'] = 'sles15'
result['distro_version'] = cachedCommitPragma('SLES15-version', '15.7')
new_ci_target = cachedCommitPragma('SLES15-target', result['target'])
} else if (stage_name.contains('Leap 15.4')) {
result['target'] = 'leap15'
result['distro_version'] = cachedCommitPragma('LEAP15-version', '15.4')
Expand All @@ -107,8 +111,9 @@ Map call(Map config = [:]) {
new_ci_target = cachedCommitPragma('LEAP15-target', result['target'])
} else if (stage_name.contains('Leap 15.6')) {
result['target'] = 'leap15'
// TODO: address this comment!!!
// Until a mock opensuse-leap-15.6-x86-64.cfg is available provision with 15.5
result['distro_version'] = cachedCommitPragma('LEAP15-version', '15.5')
result['distro_version'] = cachedCommitPragma('LEAP15-version', '15.6')
new_ci_target = cachedCommitPragma('LEAP15-target', result['target'])
} else if (stage_name.contains('Leap 15')) {
result['target'] = 'leap15'
Expand Down Expand Up @@ -155,7 +160,8 @@ Map call(Map config = [:]) {
result['java_pkg'] = 'java-1.8.0-openjdk'
} else if (result['ci_target'].startsWith('ubuntu')) {
result['java_pkg'] = 'openjdk-8-jdk'
} else if (result['ci_target'].startsWith('leap')) {
} else if (result['ci_target'].startsWith('leap') ||
result['ci_target'].startsWith('sles')) {
result['java_pkg'] = 'java-1_8_0-openjdk'
} else {
error 'Java package not known for ' + result['ci_target']
Expand Down
2 changes: 2 additions & 0 deletions vars/skipStage.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -427,6 +427,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 @@ -529,6 +530,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 Leap 15.7':
return !paramsValue('CI_RPMS_leap15_TEST', true) ||
target_branch =~ branchTypeRE('weekly') ||
skip_stage_pragma('build-leap15-rpm') ||
Expand Down