Skip to content

Commit

Permalink
Add really ugly workaround for new release workflow
Browse files Browse the repository at this point in the history
CMK-20930

Change-Id: Id8e683e788744e9c8f3055b4405502b7626ef3f0
  • Loading branch information
JonasScharpf committed Jan 21, 2025
1 parent 8f78196 commit 064251d
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 2 deletions.
2 changes: 1 addition & 1 deletion buildscripts/scripts/assert-release-build-artifacts.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ def main() {

def safe_branch_name = versioning.safe_branch_name(scm);
def branch_version = versioning.get_branch_version(checkout_dir);
def cmk_version_rc_aware = versioning.get_cmk_version(safe_branch_name, branch_version, VERSION);
def cmk_version_rc_aware = versioning.get_cmk_version_deploy(safe_branch_name, branch_version, VERSION);
def cmk_version = versioning.strip_rc_number_from_version(cmk_version_rc_aware);

print(
Expand Down
2 changes: 1 addition & 1 deletion buildscripts/scripts/deploy-to-website.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ def main() {
def versioning = load("${checkout_dir}/buildscripts/scripts/utils/versioning.groovy");
def artifacts_helper = load("${checkout_dir}/buildscripts/scripts/utils/upload_artifacts.groovy");

def cmk_version_rc_aware = versioning.get_cmk_version(
def cmk_version_rc_aware = versioning.get_cmk_version_deploy(
versioning.safe_branch_name(scm),
versioning.get_branch_version(checkout_dir),
params.VERSION
Expand Down
10 changes: 10 additions & 0 deletions buildscripts/scripts/utils/versioning.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,16 @@ def get_cmk_version(branch, version) {
// else
"${version}");
}

def get_cmk_version_deploy(branch_name, branch_version, version) {
return (
// Experimental builds
(branch_name.startsWith('sandbox') && version in ['daily', 'git']) ? "${build_date}-${branch_name}" :
// Daily builds
(version in ['daily', 'git']) ? "${branch_version}-${build_date}" :
// else
"${version}");
}
/* groovylint-enable DuplicateListLiteral */

def configured_or_overridden_distros(edition, distros, use_case="daily") {
Expand Down

0 comments on commit 064251d

Please sign in to comment.