Skip to content

Commit 4d096d6

Browse files
GordonSmithGordonSmith
committed
Merge remote-tracking branch 'origin/candidate-9.8.x' into candidate-9.10.x
Signed-off-by: Gordon Smith <[email protected]> # Conflicts: # commons-hpcc/pom.xml # dfsclient/pom.xml # pom.xml # wsclient/pom.xml
2 parents 98a9717 + 7fd4f4c commit 4d096d6

File tree

5 files changed

+48
-27
lines changed

5 files changed

+48
-27
lines changed

‎.github/workflows/JirabotMerge.yml

Lines changed: 20 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,23 @@ jobs:
1313
if: github.event.pull_request.merged == true
1414
steps:
1515
- name: "Debug Vars"
16+
env:
17+
JIRA_URL : ${{ vars.JIRA_URL }}
18+
PULL_REQUEST_NUMBER : ${{ github.event.pull_request.number }}
19+
PULL_REQUEST_TITLE : ${{ github.event.pull_request.title }}
20+
PULL_REQUEST_AUTHOR_NAME : ${{ github.event.pull_request.user.login }}
21+
PULL_URL: ${{ github.event.pull_request.html_url }}
22+
COMMENTS_URL: ${{ github.event.pull_request.comments_url }}
23+
BRANCH_NAME: ${{ github.ref_name }}
1624
run: |
17-
echo "JIRA_URL: ${{ vars.JIRA_URL }}"
18-
echo "Pull Request Number: ${{ github.event.pull_request.number }}"
19-
echo "Pull Request Title: ${{ github.event.pull_request.title }}"
20-
echo "Pull Request Author Name: ${{ github.event.pull_request.user.login }}"
21-
echo "Pull Request URL: ${{ github.event.pull_request.html_url }}"
22-
echo "Comments URL: ${{ github.event.pull_request.comments_url }}"
23-
echo "Branch Name: ${{ github.ref_name }}"
24-
- uses: "actions/setup-python@v2"
25+
echo "JIRA_URL: $JIRA_URL"
26+
echo "Pull Request Number: $PULL_REQUEST_NUMBER"
27+
echo "Pull Request Title: $PULL_REQUEST_TITLE"
28+
echo "Pull Request Author Name: $PULL_REQUEST_AUTHOR_NAME"
29+
echo "Pull Request URL: $PULL_URL"
30+
echo "Comments URL: $COMMENTS_URL"
31+
echo "Branch Name: $BRANCH_NAME"
32+
- uses: "actions/setup-python@v5"
2533
with:
2634
python-version: "3.8"
2735
- name: "Install dependencies"
@@ -33,7 +41,7 @@ jobs:
3341
python -m pip install --upgrade atlassian-python-api
3442
python -m pip install --upgrade jira
3543
- name: "Checkout"
36-
uses: actions/checkout@v2
44+
uses: actions/checkout@v4
3745
with:
3846
ref: ${{ github.event.pull_request.base.ref }}
3947
fetch-depth: 0
@@ -51,6 +59,7 @@ jobs:
5159
COMMENTS_URL: ${{ github.event.pull_request.comments_url }}
5260
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
5361
BRANCH_NAME: ${{ github.ref_name }}
62+
shell: python
5463
run: |
5564
import os
5665
import re
@@ -255,7 +264,7 @@ jobs:
255264
sys.exit(1)
256265
257266
project_prefixes = projectConfig.get('projectPrefixes')
258-
if not project_prefixes:
267+
if project_prefixes is None:
259268
print('Error: PROJECT_CONFIG is missing required field: projectPrefixes. Add a "projectPrefixes" JSON array of project prefix strings to the PROJECT_CONFIG.')
260269
sys.exit(1)
261270
@@ -291,5 +300,4 @@ jobs:
291300
else:
292301
print('Unable to find Jira issue name in title')
293302
294-
print(result)
295-
shell: python
303+
print(result)

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

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -129,11 +129,16 @@ jobs:
129129
latestVersionStr = ".".join(map(str, latestVersion))
130130
latestVersionURL = 'https://cdn.hpccsystems.com/releases/CE-Candidate-' + latestVersionStr \
131131
+ '/bin/platform/hpccsystems-platform-community_' + latestVersionStr + '-1jammy_amd64_withsymbols.deb'
132-
133-
print(f"::set-output name=previousVersion::{previousVersionStr}")
134-
print(f"::set-output name=previousVersionURL::{previousVersionURL}")
135-
print(f"::set-output name=latestVersion::{latestVersionStr}")
136-
print(f"::set-output name=latestVersionURL::{latestVersionURL}")
132+
133+
github_output_path = os.getenv('GITHUB_OUTPUT')
134+
if github_output_path:
135+
with open(github_output_path, 'a') as output_file:
136+
output_file.write(f"previousVersion={previousVersionStr}\n")
137+
output_file.write(f"previousVersionURL={previousVersionURL}\n")
138+
output_file.write(f"latestVersion={latestVersionStr}\n")
139+
output_file.write(f"latestVersionURL={latestVersionURL}\n")
140+
else:
141+
print('GITHUB_OUTPUT environment variable is not set.')
137142
138143
- name: Install latest version
139144
run: |

‎dfsclient/src/main/java/org/hpccsystems/dfs/client/FileUtility.java

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -335,17 +335,19 @@ private static String[] getCredentials(CommandLine cmd)
335335
{
336336
Console console = System.console();
337337

338+
boolean nonInteractive = cmd.hasOption("non_interactive");
339+
338340
String user = cmd.getOptionValue("user");
339341
boolean userIsEmpty = user == null || user.isEmpty();
340-
if (userIsEmpty)
342+
if (userIsEmpty && !nonInteractive)
341343
{
342344
user = new String(console.readLine("Enter username: "));
343345
userIsEmpty = user == null || user.isEmpty();
344346
}
345347

346348
String pass = cmd.getOptionValue("pass");
347349
boolean passIsEmpty = pass == null || pass.isEmpty();
348-
if (!userIsEmpty && passIsEmpty)
350+
if (!userIsEmpty && passIsEmpty & !nonInteractive)
349351
{
350352
pass = new String(console.readPassword("Enter password for " + user + ": "));
351353
}
@@ -642,6 +644,7 @@ private static Options getReadOptions()
642644
options.addOption("socket_timeout_seconds", true, "Sets the socket operation timeout in seconds.");
643645
options.addOption("connection_startup_limit", true, "Specifies the maximum number of connections to startup concurrently."
644646
+ " useful in cases where starting up connections too quickly can overwhelm intermediate processes.");
647+
options.addOption("non_interactive", false, "Disables prompting for credentials if they are not provided.");
645648

646649
options.addOption(Option.builder("read")
647650
.argName("files")
@@ -672,6 +675,7 @@ private static Options getReadTestOptions()
672675
options.addOption("socket_timeout_seconds", true, "Sets the socket operation timeout in seconds.");
673676
options.addOption("connection_startup_limit", true, "Specifies the maximum number of connections to startup concurrently."
674677
+ " useful in cases where starting up connections too quickly can overwhelm intermediate processes.");
678+
options.addOption("non_interactive", false, "Disables prompting for credentials if they are not provided.");
675679

676680
options.addOption(Option.builder("file_parts")
677681
.argName("_file_parts")
@@ -697,6 +701,7 @@ private static Options getCopyOptions()
697701
options.addOption("socket_timeout_seconds", true, "Sets the socket operation timeout in seconds.");
698702
options.addOption("connection_startup_limit", true, "Specifies the maximum number of connections to startup concurrently."
699703
+ " useful in cases where starting up connections too quickly can overwhelm intermediate processes.");
704+
options.addOption("non_interactive", false, "Disables prompting for credentials if they are not provided.");
700705

701706
options.addOption(Option.builder("copy")
702707
.argName("files")
@@ -721,6 +726,7 @@ private static Options getWriteOptions()
721726
options.addOption("socket_timeout_seconds", true, "Sets the socket operation timeout in seconds.");
722727
options.addOption("connection_startup_limit", true, "Specifies the maximum number of connections to startup concurrently."
723728
+ " useful in cases where starting up connections too quickly can overwhelm intermediate processes.");
729+
options.addOption("non_interactive", false, "Disables prompting for credentials if they are not provided.");
724730

725731
options.addOption(Option.builder("write")
726732
.argName("files")
@@ -1962,14 +1968,14 @@ private static void performCopy(String[] args, TaskContext context)
19621968
{
19631969
String readArgs[] = {"-read", srcFile, "-url", srcURL,
19641970
"-format", "thor", "-user", user, "-pass", pass,
1965-
"-out", "tmp-read"};
1971+
"-out", "tmp-read", "-non_interactive"};
19661972

19671973
performRead(readArgs, context);
19681974

19691975
String writeArgs[] = {"-write", "tmp-read" + File.separator + srcFile.replace(':', '_') + "*" + " " + destFile,
19701976
"-url", srcURL, "-dest_url", destURL,
19711977
"-dest_cluster", destClusterName,
1972-
"-user", user, "-pass", pass };
1978+
"-user", user, "-pass", pass, "-non_interactive"};
19731979

19741980
performWrite(writeArgs, context);
19751981
}
@@ -2280,4 +2286,4 @@ public static void main(String[] args)
22802286

22812287
return;
22822288
}
2283-
}
2289+
}

‎dfsclient/src/test/java/org/hpccsystems/dfs/client/DFSIndexTest.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
import org.junit.Assert;
1919
import org.junit.Assume;
2020
import org.junit.Before;
21+
import org.junit.Ignore;
2122
import org.junit.Test;
2223
import org.junit.experimental.categories.Category;
2324

@@ -114,7 +115,8 @@ public void setup() throws Exception
114115
}
115116
}
116117

117-
@Test
118+
// Ignoring this test until underlying TLK support changes have been made
119+
@Ignore @Test
118120
public void hpccTLKFilterTest() throws Exception
119121
{
120122
for (int i = 0; i < datasetNames.length; i++)

‎dfsclient/src/test/java/org/hpccsystems/dfs/client/FileUtilityTest.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ public void thorFileTests()
4646
{
4747
{
4848
String readArgs[] = {"-read", "benchmark::integer::20kb", "-url", this.connString,
49-
"-format", "thor", "-user", this.hpccUser, "-pass", this.hpccPass };
49+
"-format", "thor", "-user", this.hpccUser, "-pass", this.hpccPass, "-non_interactive" };
5050

5151
JSONArray results = FileUtility.run(readArgs);
5252
JSONObject result = results.optJSONObject(0);
@@ -58,7 +58,7 @@ public void thorFileTests()
5858

5959
{
6060
String readArgs[] = {"-read_test", "benchmark::integer::20kb", "-url", this.connString,
61-
"-user", this.hpccUser, "-pass", this.hpccPass, "-file_parts", "1" };
61+
"-user", this.hpccUser, "-pass", this.hpccPass, "-file_parts", "1", "-non_interactive" };
6262

6363
JSONArray results = FileUtility.run(readArgs);
6464
JSONObject result = results.optJSONObject(0);
@@ -72,7 +72,7 @@ public void thorFileTests()
7272
String copyArgs[] = {"-copy", "benchmark::integer::20kb benchmark::integer::20kb-copy",
7373
"-url", this.connString, "-dest_url", this.connString,
7474
"-dest_cluster", this.thorClusterFileGroup,
75-
"-user", this.hpccUser, "-pass", this.hpccPass };
75+
"-user", this.hpccUser, "-pass", this.hpccPass, "-non_interactive" };
7676

7777
JSONArray results = FileUtility.run(copyArgs);
7878
JSONObject result = results.optJSONObject(0);
@@ -87,7 +87,7 @@ public void thorFileTests()
8787
String writeArgs[] = {"-write", localDir + "benchmark__integer__20kb* benchmark::integer::20kb_write",
8888
"-url", this.connString, "-dest_url", this.connString,
8989
"-dest_cluster", this.thorClusterFileGroup,
90-
"-user", this.hpccUser, "-pass", this.hpccPass };
90+
"-user", this.hpccUser, "-pass", this.hpccPass, "-non_interactive" };
9191

9292
JSONArray results = FileUtility.run(writeArgs);
9393
JSONObject result = results.optJSONObject(0);

0 commit comments

Comments
 (0)