From 539308654f657023f3418a58967d1bb558d12b1c Mon Sep 17 00:00:00 2001 From: ProCodec <43810146+error9098x@users.noreply.github.com> Date: Wed, 31 Jan 2024 03:25:12 +0530 Subject: [PATCH 1/4] Update baremetal-regression-suite.yml Signed-off-by: ProCodec <43810146+error9098x@users.noreply.github.com> --- .github/workflows/baremetal-regression-suite.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/baremetal-regression-suite.yml b/.github/workflows/baremetal-regression-suite.yml index 57c5c74bd..517c04366 100644 --- a/.github/workflows/baremetal-regression-suite.yml +++ b/.github/workflows/baremetal-regression-suite.yml @@ -117,8 +117,8 @@ jobs: print('Latest version is a new minor. Setting previous version to latest version') previousVersion = latestVersion else: - previousVersion = [latestVersion[0], latestVersion[1], latestVersion[2] - 2] - + previousVersion = [latestVersion[0], latestVersion[1], int(latestVersion[2]) - 2] + previousVersionStr = ".".join(map(str, previousVersion)) previousVersionURL = 'https://cdn.hpccsystems.com/releases/CE-Candidate-' + previousVersionStr \ + '/bin/platform/hpccsystems-platform-community_' + previousVersionStr + '-1jammy_amd64_withsymbols.deb' From e2331c85aa19b7f64edad606731adab742b0734b Mon Sep 17 00:00:00 2001 From: ProCodec <43810146+error9098x@users.noreply.github.com> Date: Wed, 31 Jan 2024 06:00:18 +0530 Subject: [PATCH 2/4] Update baremetal-regression-suite.yml Signed-off-by: ProCodec <43810146+error9098x@users.noreply.github.com> --- .github/workflows/baremetal-regression-suite.yml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/.github/workflows/baremetal-regression-suite.yml b/.github/workflows/baremetal-regression-suite.yml index 517c04366..bf5177248 100644 --- a/.github/workflows/baremetal-regression-suite.yml +++ b/.github/workflows/baremetal-regression-suite.yml @@ -109,15 +109,17 @@ jobs: findLatestBranchVer = "git tag --list 'hpcc4j_" + str(branchVersion[0]) + "." + str(branchVersion[1]) + "*-release' --sort=-v:refname | head -n 1" return getTagVersionForCmd(findLatestBranchVer) - branch_name = os.environ['BRANCH_NAME'] + branch_name = 'master' latestVersion = getLatestBranchVersion(branch_name) - + if latestVersion[2] == 0: print('Latest version is a new minor. Setting previous version to latest version') previousVersion = latestVersion else: - previousVersion = [latestVersion[0], latestVersion[1], int(latestVersion[2]) - 2] + latestVersion = list(map(int, latestVersion.split('.'))) + previousVersion = [latestVersion[0], latestVersion[1]-2, latestVersion[2] ] + print(f"{previousVersion}") previousVersionStr = ".".join(map(str, previousVersion)) previousVersionURL = 'https://cdn.hpccsystems.com/releases/CE-Candidate-' + previousVersionStr \ From aaaa36c6f47839e87d0b1104113b96ce3dcb10a2 Mon Sep 17 00:00:00 2001 From: ProCodec <43810146+error9098x@users.noreply.github.com> Date: Wed, 31 Jan 2024 06:00:49 +0530 Subject: [PATCH 3/4] Update baremetal-regression-suite.yml Signed-off-by: ProCodec <43810146+error9098x@users.noreply.github.com> --- .github/workflows/baremetal-regression-suite.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/baremetal-regression-suite.yml b/.github/workflows/baremetal-regression-suite.yml index bf5177248..035d400bd 100644 --- a/.github/workflows/baremetal-regression-suite.yml +++ b/.github/workflows/baremetal-regression-suite.yml @@ -109,7 +109,7 @@ jobs: findLatestBranchVer = "git tag --list 'hpcc4j_" + str(branchVersion[0]) + "." + str(branchVersion[1]) + "*-release' --sort=-v:refname | head -n 1" return getTagVersionForCmd(findLatestBranchVer) - branch_name = 'master' + branch_name = os.environ['BRANCH_NAME'] latestVersion = getLatestBranchVersion(branch_name) From a39a23ce918add574e1b39bf69890f070b501c6f Mon Sep 17 00:00:00 2001 From: ProCodec <43810146+error9098x@users.noreply.github.com> Date: Wed, 31 Jan 2024 06:05:55 +0530 Subject: [PATCH 4/4] Update baremetal-regression-suite.yml Signed-off-by: ProCodec <43810146+error9098x@users.noreply.github.com> --- .github/workflows/baremetal-regression-suite.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/baremetal-regression-suite.yml b/.github/workflows/baremetal-regression-suite.yml index 035d400bd..648578f42 100644 --- a/.github/workflows/baremetal-regression-suite.yml +++ b/.github/workflows/baremetal-regression-suite.yml @@ -110,7 +110,6 @@ jobs: return getTagVersionForCmd(findLatestBranchVer) branch_name = os.environ['BRANCH_NAME'] - latestVersion = getLatestBranchVersion(branch_name) if latestVersion[2] == 0: @@ -118,8 +117,7 @@ jobs: previousVersion = latestVersion else: latestVersion = list(map(int, latestVersion.split('.'))) - previousVersion = [latestVersion[0], latestVersion[1]-2, latestVersion[2] ] - print(f"{previousVersion}") + previousVersion = [latestVersion[0], latestVersion[1]-2, latestVersion[2]] previousVersionStr = ".".join(map(str, previousVersion)) previousVersionURL = 'https://cdn.hpccsystems.com/releases/CE-Candidate-' + previousVersionStr \