Skip to content

Commit c234e00

Browse files
committed
HPCC4J-731 Baremetal tests unable to find platform images
- Fixed baremetal image URLs - Added hpcc-systems as a default allowed repo to K8s scripts - Changed repo matching logic to be case insensitive Signed-off-by: James McMullan [email protected]
1 parent 2e7945a commit c234e00

File tree

2 files changed

+15
-8
lines changed

2 files changed

+15
-8
lines changed

.github/workflows/baremetal-regression-suite.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -127,13 +127,13 @@ jobs:
127127
previousVersion = [latestVersion[0], latestVersion[1], latestVersion[2] - 2]
128128
129129
previousVersionStr = ".".join(map(str, previousVersion))
130-
previousVersionURL = 'https://cdn.hpccsystems.com/releases/CE-Candidate-' + previousVersionStr \
131-
+ '/bin/platform/hpccsystems-platform-community_' + previousVersionStr + '-1jammy_amd64_withsymbols.deb'
130+
previousVersionURL = 'https://github.com/hpcc-systems/HPCC-Platform/releases/download/community_' + previousVersionStr \
131+
+ '-1/hpccsystems-platform-community_' + previousVersionStr + '-1jammy_amd64_withsymbols.deb'
132132
133133
latestVersionStr = ".".join(map(str, latestVersion))
134-
latestVersionURL = 'https://cdn.hpccsystems.com/releases/CE-Candidate-' + latestVersionStr \
135-
+ '/bin/platform/hpccsystems-platform-community_' + latestVersionStr + '-1jammy_amd64_withsymbols.deb'
136-
134+
latestVersionURL = 'https://github.com/hpcc-systems/HPCC-Platform/releases/download/community_' + latestVersionStr \
135+
+ '-1/hpccsystems-platform-community_' + latestVersionStr + '-1jammy_amd64_withsymbols.deb'
136+
137137
github_output_path = os.getenv('GITHUB_OUTPUT')
138138
if github_output_path:
139139
with open(github_output_path, 'a') as output_file:

.github/workflows/k8s-regression-suite.yml

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -56,15 +56,22 @@ jobs:
5656
console.log(`Allowed repositories: ${allowedRepos.join(", ")}`);
5757
} else {
5858
console.log(`No fully qualified repository whitelist configured - no external repositories allowed`);
59+
allowedRepos.push("hpcc-systems/hpcc-platform"); // Default to HPCC-Platform if no whitelist is configured
5960
}
6061
6162
const repoMatch = body.match(/repository:\s*([^\n]+)/);
62-
if (repoMatch) repository = repoMatch[1].trim();
63+
if (repoMatch) repository = repoMatch[1].trim().toLowerCase();
64+
console.log(`Parsed repository: ${repository}`);
6365
6466
const branchMatch = body.match(/branch:\s*([^\n]+)/);
65-
if (branchMatch) branch = branchMatch[1].trim();
67+
if (branchMatch) branch = branchMatch[1].trim().toLowerCase();
68+
console.log(`Parsed branch: ${branch}`);
6669
67-
if (repository && !allowedRepos.includes(repository)) {
70+
// Lowercase allowed repository names to ensure case-insensitive matching
71+
const lowerCaseAllowedRepos = allowedRepos.map(repo => repo.toLowerCase());
72+
console.log(`Allowed repositories: ${lowerCaseAllowedRepos.join(", ")}`);
73+
74+
if (repository && !lowerCaseAllowedRepos.includes(repository)) {
6875
console.log(`Repository ${repository} is not allowed. Using default platform.`);
6976
repository = "";
7077
branch = "";

0 commit comments

Comments
 (0)