Changeset fc664b9 in OpenModelica

Timestamp:

2018-08-09T13:40:14+02:00 (6 years ago)

Author:

Martin Sjölund <martin+github@…>

Branches:

Added-citation-metadata, maintenance/v1.13, maintenance/v1.14, maintenance/v1.15, maintenance/v1.16, maintenance/v1.17, maintenance/v1.18, maintenance/v1.19, maintenance/v1.20, maintenance/v1.21, maintenance/v1.22, maintenance/v1.23, master, omlib-staging

Children:

5e22e1b4

Parents:

9207981

git-author:

Martin Sjölund <martin.sjolund@…> (08/09/18 13:09:43)

git-committer:

Martin Sjölund <martin+github@…> (08/09/18 13:40:14)

Message:

Jenkins does not inherit env.vars

Use a function instead of env.variable to calculate the name of the
branch instead of using a top-level environment variable since it
might not be inherited properly.

File:

• Jenkinsfile (modified) (4 diffs)

Jenkinsfile

@@ -6 +6 @@
   environment {
     LC_ALL = 'C.UTF-8'
-    CACHE_BRANCH = "${env.CHANGE_TARGET ?: env.GIT_BRANCH}"
   }
   // stages are ordered according to execution time; highest time first
@@ -431 +430 @@
 void makeLibsAndCache(libs='core') {
   // If we don't have any result, copy to the master to get a somewhat decent cache
-  sh "cp -f ${env.RUNTESTDB}/${env.CACHE_BRANCH}/runtest.db.* testsuite/ || " +
+  sh "cp -f ${env.RUNTESTDB}/${cacheBranch()}/runtest.db.* testsuite/ || " +
      "cp -f ${env.RUNTESTDB}/master/runtest.db.* testsuite/ || true"
   // env.WORKSPACE is null in the docker agent, so link the svn/git cache afterwards
@@ -478 +477 @@
   sh "test -f ${env.COMPLIANCEPREFIX}.xml"
   // Only publish openmodelica-current.html if we are running master
-  sh "cp -p ${env.COMPLIANCEPREFIX}-current.html ${env.COMPLIANCEPREFIX}${env.CACHE_BRANCH=='master' ? '' : ('-' + env.CACHE_BRANCH).replace('/','-')}-${getVersion()}.html"
-  sh "test ! '${env.CACHE_BRANCH}' = 'master' || rm -f ${env.COMPLIANCEPREFIX}-current.html"
+  sh "cp -p ${env.COMPLIANCEPREFIX}-current.html ${env.COMPLIANCEPREFIX}${cacheBranch()=='master' ? '' : ('-' + cacheBranch()).replace('/','-')}-${getVersion()}.html"
+  sh "test ! '${cacheBranch()}' = 'master' || rm -f ${env.COMPLIANCEPREFIX}-current.html"
   stash name: "${env.COMPLIANCEPREFIX}", includes: "${env.COMPLIANCEPREFIX}-*.html"
   archiveArtifacts "${env.COMPLIANCEPREFIX}*${getVersion()}.html, ${env.COMPLIANCEPREFIX}.failures"
@@ -487 +486 @@
 }
 
+def cacheBranch() {
+  return "${env.CHANGE_TARGET ?: env.GIT_BRANCH}"
+}
+
 /* Note: If getting "Unexpected end of /proc/mounts line" , flatten the docker image:
  * https://stackoverflow.com/questions/46138549/docker-openmpi-and-unexpected-end-of-proc-mounts-line