Merge pull request #393 from tmaeno/master

To allow mixture of upstream outputs and root inputs as workflow's secondaryDSs

Dockerfile

@@ -44,14 +44,11 @@ COPY . .
 
 # install panda-common first to prevent panda-client from installing redundant files
 RUN /opt/panda/bin/pip install --no-cache-dir panda-common
-RUN /opt/panda/bin/pip install --no-cache-dir .[postgres]
+RUN /opt/panda/bin/pip install --no-cache-dir .[postgres,oracle]
 RUN /opt/panda/bin/pip install --no-cache-dir rucio-clients
 RUN /opt/panda/bin/pip install --no-cache-dir "git+https://github.com/PanDAWMS/panda-cacheschedconfig.git"
 RUN ln -s /opt/panda/lib/python*/site-packages/mod_wsgi/server/mod_wsgi*.so /etc/httpd/modules/mod_wsgi.so
 
-# install the oracle client to be able to support Oracle
-RUN /opt/panda/bin/pip install --no-cache-dir oracledb
-
 # install Oracle Instant Client and tnsnames.ora
 RUN wget https://download.oracle.com/otn_software/linux/instantclient/oracle-instantclient-basic-linuxx64.rpm -P /tmp/ && \
     yum install /tmp/oracle-instantclient-basic-linuxx64.rpm -y && \

pandaserver/workflow/pcwl_utils.py

@@ -157,6 +157,7 @@ def resolve_nodes(node_list, root_inputs, data, serial_id, parent_ids, out_ds_na
                 tmp_sources = tmp_data["source"]
                 if "parent_id" in tmp_data:
                     tmp_parent_ids = tmp_data["parent_id"]
+                    tmp_parent_ids += [None] * (len(tmp_sources) - len(tmp_parent_ids))
                 else:
                     tmp_parent_ids = [None] * len(tmp_sources)
             else: