Merge remote-tracking branch 'origin/candidate-9.2.x' into candidate-…

…9.4.x Signed-off-by: Jake Smith <[email protected]> # Conflicts: # commons-hpcc/pom.xml # dfsclient/pom.xml # pom.xml # wsclient/pom.xml
hpcc-systems · Jan 9, 2025 · 05c334e · 05c334e
2 parents 3fbc5ae + d6a3975
commit 05c334e
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 18 deletions.
diff --git a/.github/workflows/JirabotMerge.yml b/.github/workflows/JirabotMerge.yml
@@ -13,15 +13,23 @@ jobs:
     if: github.event.pull_request.merged == true
     steps:
       - name: "Debug Vars"
+        env:
+          JIRA_URL : ${{ vars.JIRA_URL }}
+          PULL_REQUEST_NUMBER : ${{ github.event.pull_request.number }}
+          PULL_REQUEST_TITLE : ${{ github.event.pull_request.title }}
+          PULL_REQUEST_AUTHOR_NAME : ${{ github.event.pull_request.user.login }}
+          PULL_URL: ${{ github.event.pull_request.html_url }}
+          COMMENTS_URL: ${{ github.event.pull_request.comments_url }}
+          BRANCH_NAME: ${{ github.ref_name }}
         run: |
-          echo "JIRA_URL: ${{ vars.JIRA_URL }}"
-          echo "Pull Request Number: ${{ github.event.pull_request.number }}"
-          echo "Pull Request Title: ${{ github.event.pull_request.title }}"
-          echo "Pull Request Author Name: ${{ github.event.pull_request.user.login }}"
-          echo "Pull Request URL: ${{ github.event.pull_request.html_url }}"
-          echo "Comments URL: ${{ github.event.pull_request.comments_url }}"
-          echo "Branch Name: ${{ github.ref_name }}"
-      - uses: "actions/setup-python@v2"
+          echo "JIRA_URL: $JIRA_URL"
+          echo "Pull Request Number: $PULL_REQUEST_NUMBER"
+          echo "Pull Request Title: $PULL_REQUEST_TITLE"
+          echo "Pull Request Author Name: $PULL_REQUEST_AUTHOR_NAME"
+          echo "Pull Request URL: $PULL_URL"
+          echo "Comments URL: $COMMENTS_URL"
+          echo "Branch Name: $BRANCH_NAME"
+      - uses: "actions/setup-python@v5"
         with:
           python-version: "3.8"
       - name: "Install dependencies"
@@ -33,7 +41,7 @@ jobs:
           python -m pip install --upgrade atlassian-python-api
           python -m pip install --upgrade jira
       - name: "Checkout"
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
         with:
           ref: ${{ github.event.pull_request.base.ref }}
           fetch-depth: 0
@@ -51,6 +59,7 @@ jobs:
           COMMENTS_URL: ${{ github.event.pull_request.comments_url }}
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           BRANCH_NAME: ${{ github.ref_name }}
+        shell: python
         run: |
             import os
             import re
@@ -255,7 +264,7 @@ jobs:
                 sys.exit(1)
 
             project_prefixes = projectConfig.get('projectPrefixes')
-            if not project_prefixes:
+            if project_prefixes is None:
                 print('Error: PROJECT_CONFIG is missing required field: projectPrefixes. Add a "projectPrefixes" JSON array of project prefix strings to the PROJECT_CONFIG.')
                 sys.exit(1)
 
@@ -291,5 +300,4 @@ jobs:
             else:
                 print('Unable to find Jira issue name in title')
 
-            print(result)
-        shell: python
+            print(result)
diff --git a/.github/workflows/baremetal-regression-suite.yml b/.github/workflows/baremetal-regression-suite.yml
@@ -129,11 +129,16 @@ jobs:
         latestVersionStr = ".".join(map(str, latestVersion))
         latestVersionURL = 'https://cdn.hpccsystems.com/releases/CE-Candidate-' + latestVersionStr \
                          + '/bin/platform/hpccsystems-platform-community_' + latestVersionStr + '-1jammy_amd64_withsymbols.deb'
-
-        print(f"::set-output name=previousVersion::{previousVersionStr}")
-        print(f"::set-output name=previousVersionURL::{previousVersionURL}")
-        print(f"::set-output name=latestVersion::{latestVersionStr}")
-        print(f"::set-output name=latestVersionURL::{latestVersionURL}")
+        
+        github_output_path = os.getenv('GITHUB_OUTPUT')
+        if github_output_path:
+          with open(github_output_path, 'a') as output_file:
+            output_file.write(f"previousVersion={previousVersionStr}\n")
+            output_file.write(f"previousVersionURL={previousVersionURL}\n")
+            output_file.write(f"latestVersion={latestVersionStr}\n")
+            output_file.write(f"latestVersionURL={latestVersionURL}\n")
+        else:
+          print('GITHUB_OUTPUT environment variable is not set.')
 
     - name: Install latest version
       run: |

diff --git a/dfsclient/src/test/java/org/hpccsystems/dfs/client/DFSIndexTest.java b/dfsclient/src/test/java/org/hpccsystems/dfs/client/DFSIndexTest.java
@@ -18,6 +18,7 @@
 import org.junit.Assert;
 import org.junit.Assume;
 import org.junit.Before;
+import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
 
@@ -114,7 +115,8 @@ public void setup() throws Exception
         }
     }
 
-    @Test
+    // Ignoring this test until underlying TLK support changes have been made
+    @Ignore @Test
     public void hpccTLKFilterTest() throws Exception
     {
         for (int i = 0; i < datasetNames.length; i++)