Merge remote-tracking branch 'origin/master' into loki-loggerv2

# Conflicts:
#	VERSION.in
#	cuebot/src/main/java/com/imageworks/spcue/DispatchFrame.java
#	cuebot/src/main/java/com/imageworks/spcue/dao/postgres/DispatchQuery.java
#	cuebot/src/main/java/com/imageworks/spcue/dao/postgres/FrameDaoJdbc.java
#	proto/rqd.proto
#	requirements.txt
#	rqd/rqd/rqcore.py

.dockerignore

@@ -1,4 +1,5 @@
 ci
+!ci/fix_compiled_proto.py
 cuebot/src/compiled_protobuf
 images
 samples

.github/workflows/testing-pipeline.yml

@@ -7,17 +7,6 @@ on:
     branches: [ master ]
 
 jobs:
-  test_python_2022:
-    name: Run Python Unit Tests (CY2022)
-    runs-on: ubuntu-22.04
-    container: aswf/ci-opencue:2022
-    env:
-      ACTIONS_ALLOW_USE_UNSECURE_NODE_VERSION: true
-    steps:
-      - uses: actions/checkout@v3
-      - name: Run Python Tests
-        run: ci/run_python_tests.sh --no-gui
-
   test_cuebot_2022:
     name: Build Cuebot and Run Unit Tests (CY2022)
     runs-on: ubuntu-22.04

.gitignore

@@ -9,6 +9,7 @@ venv*/
 .coverage
 coverage.xml
 htmlcov/
+rest_gateway/*.tar\.gz
 /.env
 .envrc
 .vscode

VERSION.in

@@ -1 +1 @@
-1.1
+1.2

ci/run_python_tests.sh

@@ -29,7 +29,6 @@ PYTHONPATH=pycue:pyoutline python -m unittest discover -s cuesubmit/tests -t cue
 python -m pytest rqd/tests
 python -m pytest rqd/pytests
 
-
 # Xvfb no longer supports Python 2.
 if [[ "$python_version" =~ "Python 3" && ${args[0]} != "--no-gui" ]]; then
   ci/run_gui_test.sh

cueadmin/Dockerfile

@@ -24,6 +24,7 @@ RUN python3 -m grpc_tools.protoc \
 
 # Fix imports to work in both Python 2 and 3. See
 # <https://github.com/protocolbuffers/protobuf/issues/1491> for more info.
+COPY ci/fix_compiled_proto.py ./ci/
 RUN python3 ci/fix_compiled_proto.py pycue/opencue/compiled_proto
 
 COPY cueadmin/README.md ./cueadmin/

cuebot/src/main/java/com/imageworks/spcue/DispatchFrame.java

@@ -50,6 +50,9 @@ public class DispatchFrame extends FrameEntity implements FrameInterface {
     // A comma separated list of services
     public String services;
 
+    // The Operational System this frame is expected to run in
+    public String os;
+
     public boolean lokiEnabled;
     public String lokiURL;
 }

cuebot/src/main/java/com/imageworks/spcue/DispatchHost.java

@@ -51,7 +51,7 @@ public class DispatchHost extends Entity
     public long gpuMemory;
     public long idleGpuMemory;
     public String tags;
-    public String os;
+    private String os;
 
     public boolean isNimby;
     public boolean isLocalDispatch = false;
@@ -81,6 +81,14 @@ public String getFacilityId() {
         return facilityId;
     }
 
+    public String[] getOs() {
+        return this.os.split(",");
+    }
+
+    public void setOs(String os) {
+        this.os = os;
+    }
+
     public boolean canHandleNegativeCoresRequest(int requestedCores) {
         // Request is positive, no need to test further.
         if (requestedCores > 0) {

cuebot/src/main/java/com/imageworks/spcue/VirtualProc.java

@@ -85,7 +85,9 @@ public String getName() {
      * @param frame
      * @return
      */
-    public static final VirtualProc build(DispatchHost host, DispatchFrame frame, String... selfishServices) {
+    public static final VirtualProc build(DispatchHost host,
+                                          DispatchFrame frame,
+                                          String... selfishServices) {
         VirtualProc proc = new VirtualProc();
         proc.allocationId = host.getAllocationId();
         proc.hostId = host.getHostId();
@@ -94,7 +96,7 @@ public static final VirtualProc build(DispatchHost host, DispatchFrame frame, St
         proc.jobId = frame.getJobId();
         proc.showId = frame.getShowId();
         proc.facilityId = frame.getFacilityId();
-        proc.os = host.os;
+        proc.os = frame.os;
 
         proc.hostName = host.getName();
         proc.unbooked = false;
@@ -238,7 +240,7 @@ public static final VirtualProc build(DispatchHost host,
         proc.jobId = frame.getJobId();
         proc.showId = frame.getShowId();
         proc.facilityId = frame.getFacilityId();
-        proc.os = host.os;
+        proc.os = frame.os;
 
         proc.hostName = host.getName();
         proc.unbooked = false;