do not fail if is already linked (#184)

adrpo · web-flow · commit 3b2e71d27d4f · 2024-11-23T22:26:07.000+01:00
* do not fail if is already linked

* fix bad key in template
diff --git a/.CI/Jenkinsfile b/.CI/Jenkinsfile
@@ -804,7 +804,8 @@ def runRegressiontest(branch, name, extraFlags, omsHash, dbPrefix, sshConfig, om
   export PREVIOUSHOME="${env.HOME}"
   export HOME="${libraryPath}"
   # we need to do some crap magic here to make sure python3 finds fmpy as we change the HOME here
-  ln -s -t \${HOME} \${PREVIOUSHOME}/.local .local
+  # too bad if we cannot do it, just continue
+  ln -s -t \${HOME} \${PREVIOUSHOME}/.local .local || true
 
   cd OpenModelicaLibraryTesting
   # Force /usr/bin/omc as being used for generating the mos-files. Ensures consistent behavior among all tested OMC versions
diff --git a/test.py b/test.py
@@ -1075,7 +1075,7 @@ def cpu_name():
   replacements = (
     (u"#sysInfo#", html.escape(sysInfo)),
     (u"#omcVersion#", html.escape(omc_version)),
-    (u"#fmiVersion#", ("<p>"+html.escape("FMI tool: %s" % fmisimulatorversion)+"</p>") if fmisimulatorversion else ""),
+    (u"#fmiToolVersion#", ("<p>"+html.escape("FMI tool: %s" % fmisimulatorversion)+"</p>") if fmisimulatorversion else ""),
     (u"#fmi#", ("<p>"+html.escape("FMI version: %s" % conf.get("fmi"))+"</p>") if conf.get("fmi") else ""),
     (u"#optlevel#", html.escape(conf.get("optlevel")) if (canChangeOptLevel and conf.get("optlevel")) else "Tool default"),
     (u"#timeStart#", html.escape(time.strftime('%Y-%m-%d %H:%M:%S', start_as_time))),
