Merge branch 'v2.x/master' into reboot/dependencies-2025-01-14

Signed-off-by: Pavel Jareš <58428711+pj892031@users.noreply.github.com>
zowe · Jan 14, 2025 · b564074 · b564074
2 parents df1777b + bd82a37
commit b564074
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/.github/workflows/ci-tests.yml b/.github/workflows/ci-tests.yml
@@ -1,5 +1,9 @@
 name: CI Testing
 
+permissions:
+  contents: write
+  pull-requests: write
+
 on:
   push:
     branches:
@@ -35,7 +39,7 @@ jobs:
         run: ./gradlew coverage
 
       - name: Store test results
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         if: always()
         with:
           name: UnitTestResults
@@ -151,7 +155,7 @@ jobs:
         run: docker compose -f .apiml/docker-compose.yml logs
 
       - name: Store test results
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         if: always()
         with:
           name: IntegrationTestResults

diff --git a/jobs-tests/src/test/java/org/zowe/jobs/tests/JobFilesIntegrationTest.java b/jobs-tests/src/test/java/org/zowe/jobs/tests/JobFilesIntegrationTest.java
@@ -36,7 +36,7 @@ public class JobFilesIntegrationTest extends AbstractJobsIntegrationTest {
     private static Job job;
     private static String expectedContentRegexJESMSGLG = ".*J E S 2  J O B  L O G.*------ JES2 JOB STATISTICS ------.*3 CARDS READ.*"
             + "-           .* SYSOUT PRINT RECORDS.*-            0 SYSOUT PUNCH RECORDS.*"
-            + "-            5 SYSOUT SPOOL KBYTES.*-         0.00 MINUTES EXECUTION TIME.*";
+            + "-            6 SYSOUT SPOOL KBYTES.*-         0.00 MINUTES EXECUTION TIME.*";
 
     @BeforeClass
     public static void submitJob() throws Exception {