Merge branch 'master' into integration-test-ci

AcademySoftwareFoundation · Dec 4, 2024 · 5213959 · 5213959
2 parents d0c0e40 + 33bde08
commit 5213959
Show file tree

Hide file tree

Showing 43 changed files with 791 additions and 331 deletions.
diff --git a/.github/workflows/testing-pipeline.yml b/.github/workflows/testing-pipeline.yml
@@ -7,20 +7,6 @@ on:
     branches: [ master ]
 
 jobs:
-  test_cuebot_2022:
-    name: Build Cuebot and Run Unit Tests (CY2022)
-    runs-on: ubuntu-22.04
-    container:
-      image: aswf/ci-opencue:2022
-    env:
-      ACTIONS_ALLOW_USE_UNSECURE_NODE_VERSION: true
-    steps:
-      - uses: actions/checkout@v3
-      - name: Build with Gradle
-        run: |
-          chown -R aswfuser:aswfgroup .
-          su -c "cd cuebot && ./gradlew build --stacktrace --info" aswfuser
-
   test_python_2023:
     name: Run Python Unit Tests (CY2023)
     runs-on: ubuntu-22.04
@@ -83,7 +69,7 @@ jobs:
   lint_python:
     name: Lint Python Code
     runs-on: ubuntu-22.04
-    container: aswf/ci-opencue:2022
+    container: aswf/ci-opencue:2024.1
     env:
       ACTIONS_ALLOW_USE_UNSECURE_NODE_VERSION: true
     steps:

diff --git a/ci/pylintrc_test b/ci/pylintrc_test
@@ -67,7 +67,6 @@ disable=arguments-differ,
         locally-disabled,
         missing-class-docstring,
         missing-function-docstring,
-        no-self-use,
         protected-access,
         raise-missing-from,
         too-many-arguments,

diff --git a/ci/run_python_lint.sh b/ci/run_python_lint.sh
@@ -37,14 +37,14 @@ cd ..
 
 echo "Running lint for cuegui/..."
 cd cuegui
-PYTHONPATH=../pycue python -m pylint --rcfile=../ci/pylintrc_main cuegui --ignore=cuegui/images,cuegui/images/crystal
-PYTHONPATH=../pycue python -m pylint --rcfile=../ci/pylintrc_test tests
+PYTHONPATH=../pycue python -m pylint --rcfile=../ci/pylintrc_main cuegui --ignore=cuegui/images,cuegui/images/crystal --disable=no-member
+PYTHONPATH=../pycue python -m pylint --rcfile=../ci/pylintrc_test tests --disable=no-member
 cd ..
 
 echo "Running lint for cuesubmit/..."
 cd cuesubmit
-PYTHONPATH=../pycue:../pyoutline python -m pylint --rcfile=../ci/pylintrc_main cuesubmit
-PYTHONPATH=../pycue:../pyoutline python -m pylint --rcfile=../ci/pylintrc_test tests
+PYTHONPATH=../pycue:../pyoutline python -m pylint --rcfile=../ci/pylintrc_main cuesubmit --disable=no-member
+PYTHONPATH=../pycue:../pyoutline python -m pylint --rcfile=../ci/pylintrc_test tests --disable=no-member
 cd ..
 
 echo "Running lint for rqd/..."

diff --git a/cuebot/src/main/java/com/imageworks/spcue/dao/postgres/DispatchQuery.java b/cuebot/src/main/java/com/imageworks/spcue/dao/postgres/DispatchQuery.java
@@ -530,7 +530,7 @@ private static final String replaceQueryForFifo(String query) {
         "str_user, " +
         "int_uid, " +
         "str_log_dir, " +
-        "str_os, " +
+        "COALESCE(str_os, '') AS str_os, " +
         "frame_name, " +
         "frame_state, " +
         "pk_frame, " +

diff --git a/cuebot/src/main/java/com/imageworks/spcue/dao/postgres/FrameDaoJdbc.java b/cuebot/src/main/java/com/imageworks/spcue/dao/postgres/FrameDaoJdbc.java
@@ -348,7 +348,7 @@ public DispatchFrame mapRow(ResultSet rs, int rowNum) throws SQLException {
             "job.str_user,"+
             "job.int_uid,"+
             "job.str_log_dir,"+
-            "job.str_os,"+
+            "COALESCE(str_os, '') AS str_os, " +
             "frame.str_name AS frame_name, "+
             "frame.str_state AS frame_state, "+
             "frame.pk_frame, "+

diff --git a/cuebot/src/main/java/com/imageworks/spcue/dao/postgres/NestedWhiteboardDaoJdbc.java b/cuebot/src/main/java/com/imageworks/spcue/dao/postgres/NestedWhiteboardDaoJdbc.java
@@ -94,7 +94,7 @@ public CachedJobWhiteboardMapper(NestedJobWhiteboardMapper result) {
             "job.b_paused, " +
             "job.b_autoeat, " +
             "job.b_comment, " +
-            "job.str_os, " +
+            "COALESCE(str_os, '') AS str_os, " +
             "job.int_frame_count, " +
             "job.int_layer_count, " +
             "job_stat.int_waiting_count, " +

diff --git a/cuebot/src/main/java/com/imageworks/spcue/dao/postgres/ProcDaoJdbc.java b/cuebot/src/main/java/com/imageworks/spcue/dao/postgres/ProcDaoJdbc.java
@@ -356,7 +356,7 @@ public VirtualProc mapRow(ResultSet rs, int rowNum) throws SQLException {
             "proc.int_virt_max_used,"+
             "proc.int_virt_used,"+
             "host.str_name AS host_name, " +
-            "job.str_os " +
+            "COALESCE(job.str_os, '') AS str_os " +
         "FROM " +
             "proc, " +
             "job, " +
@@ -389,7 +389,7 @@ public VirtualProc findVirtualProc(FrameInterface frame) {
               "proc.*, " +
               "host.str_name AS host_name, " +
               "host.pk_alloc, " +
-              "job.str_os, " +
+              "COALESCE(job.str_os, '') AS str_os, " +
               "alloc.pk_facility " +
           "FROM " +
               "proc, " +
@@ -530,7 +530,7 @@ public String getCurrentFrameId(ProcInterface p) {
           "SELECT " +
               "proc.*, " +
               "host.str_name AS host_name, " +
-              "job.str_os, " +
+              "COALESCE(job.str_os, '') AS str_os, " +
               "host.pk_alloc, " +
               "alloc.pk_facility " +
           "FROM " +