Merge remote-tracking branch 'origin/TMSS-190' into TMSS-259

Docker/lofar-ci/Dockerfile_ci_mac

@@ -11,7 +11,7 @@ ARG BASE_VERSION=latest
 FROM ci_base:$BASE_VERSION
 
 RUN echo "Installing packages for MAC..." && \
-    yum -y install readline-devel boost-python36-devel hdf5-devel blas-devel lapack-devel cfitsio-devel wcslib-devel autogen postgresql-devel cmake3 libpqxx-devel qpid-cpp-server qpid-cpp-client-devel qpid-tools unittest-cpp-devel jsoncpp-devel jsoncpp libcurl-devel libcurl && \
+    yum -y install readline-devel boost-python36-devel hdf5-devel blas-devel lapack-devel cfitsio-devel wcslib-devel autogen postgresql-devel cmake3 libpqxx-devel qpid-cpp-server qpid-cpp-client-devel unittest-cpp-devel jsoncpp-devel jsoncpp libcurl-devel libcurl && \
     pip3 install psycopg2 testing.postgresql lxml mock numpy kombu requests python-dateutil fabric
 
 RUN echo "Installing WinCC3.14 build and Demo App from Nexus repo..." && \

SAS/TMSS/client/lib/populate.py

@@ -84,7 +84,13 @@ def populate_schemas(schema_dir: str=None, templates_filename: str=None):
                 except Exception as e:
                     logger.error(e)
 
+            # TODO: make parallel upload work. Right now it fails sometimes do to interdependencies and non-determistic upload order.
             # do parallel upload
-            with ThreadPoolExecutor() as executor:
-                executor.map(upload_template, templates)
+            # with ThreadPoolExecutor() as executor:
+            #    executor.map(upload_template, templates)
+
+            # for now, do sequeltial upload
+            for template in templates:
+                upload_template(template)
+