Skip to content
Merged
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
6 changes: 2 additions & 4 deletions vars/parseStageInfo.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -97,10 +97,8 @@ Map call(Map config = [:]) {
String pointRelease = leapPart.split('\\.')[0]
String version = "15.${pointRelease}"
result['target'] = 'leap15'
// Special handling for 15.6: provision with 15.5 until mock config is available
// Leap 15.7+ doesn't exist, use sles15.7 instead
String defaultVersion = (pointRelease == '6') ? '15.5' :
(pointRelease.toInteger() >= 7) ? '15.6' : version
// Leap 15.7+ doesn't exist, use sles15.6 instead
String defaultVersion = (pointRelease.toInteger() >= 7) ? '15.6' : version
result['distro_version'] = cachedCommitPragma('LEAP15-version', defaultVersion)
new_ci_target = cachedCommitPragma('LEAP15-target', result['target'])
} else if (stage_name.contains('Leap 15')) {
Expand Down