Allow to clear OMParser result dictionary (#123)

Use two different docker containers
Run CI in parallel, cache the omc install

Author: adeas31

.jenkins/Dockerfile .jenkins/python2/Dockerfile.jenkins/Dockerfile renamed to .jenkins/python2/Dockerfile

@@ -6,6 +6,5 @@ RUN apt-get update \
   && wget https://build.openmodelica.org/apt/openmodelica.asc -O- | apt-key add - \
   && apt-get update \
   && apt-get install -qy --no-install-recommends omc \
-  && pip2 install pytest \
-  && pip3 install pytest \
   && rm -rf /var/lib/apt/lists/*
+RUN pip2 install --no-cache pytest

.jenkins/python3/Dockerfile

@@ -0,0 +1,10 @@
+FROM docker.openmodelica.org/build-deps
+
+RUN apt-get update \
+  && apt-get install -qy gnupg wget ca-certificates apt-transport-https sudo \
+  && echo "deb https://build.openmodelica.org/apt `lsb_release -sc`  release" > /etc/apt/sources.list.d/openmodelica.list \
+  && wget https://build.openmodelica.org/apt/openmodelica.asc -O- | apt-key add - \
+  && apt-get update \
+  && apt-get install -qy --no-install-recommends omc \
+  && rm -rf /var/lib/apt/lists/*
+RUN pip3 install --no-cache pytest

Jenkinsfile

@@ -1,16 +1,17 @@
 pipeline {
-  agent {
-    dockerfile {
-      // Large image with full OpenModelica build dependencies; lacks omc and OMPython
-      label 'linux'
-      dir '.jenkins'
-      additionalBuildArgs  '--pull'
-    }
-  }
+  agent none
   stages {
-    stage('build') {
+    stage('test') {
       parallel {
         stage('python2') {
+          agent {
+            dockerfile {
+              // Large image with full OpenModelica build dependencies; lacks omc and OMPython
+              label 'linux'
+              dir '.jenkins/python2'
+              additionalBuildArgs '--pull'
+            }
+          }
           steps {
             sh 'python2 setup.py build'
             timeout(3) {
@@ -21,6 +22,14 @@ pipeline {
           }
         }
         stage('python3') {
+          agent {
+            dockerfile {
+              // Large image with full OpenModelica build dependencies; lacks omc and OMPython
+              label 'linux'
+              dir '.jenkins/python3'
+              additionalBuildArgs '--pull'
+            }
+          }
           steps {
             sh 'python3 setup.py build'
             timeout(3) {

OMPython/__init__.py

@@ -212,6 +212,9 @@ def _connect_to_omc(self, timeout):
     def execute(self, command):
         pass
 
+    def clearOMParserResult(self):
+        OMParser.result = {}
+
     # FIXME: we should have one function which interacts with OMC. Either execute OR sendExpression.
     # Execute uses OMParser.check_for_values and sendExpression uses OMTypedParser.parseString.
     # We should have one parser. Then we can get rid of one of these functions.