Merge branch 'jenkins' into devel

Jenkinsfile

@@ -1,13 +1,25 @@
 def runStages() {
+	try {
 		stage("Clone") {
-		/* The Git repo seems to be cached in some Jenkins plugin, so this is not always a clean clone. */
+			// The Git repo seems to be cached in some Jenkins plugin, so this is not always a clean clone.
 			checkout scm
 			sh "make build-system-checks || true"
 		}
+
+		// caching doesn't work; extension probably not configured
+
+		//cache(maxCacheSize: 250, caches: [
+			//[$class: "ArbitraryFileCache", excludes: "", includes: "**/*", path: "${WORKSPACE}/vendor/nimbus-build-system/vendor/Nim/bin"],
+			//[$class: "ArbitraryFileCache", excludes: "", includes: "**/*", path: "${WORKSPACE}/vendor/go/bin"],
+			//[$class: "ArbitraryFileCache", excludes: "", includes: "**/*", path: "${WORKSPACE}/jsonTestsCache"]
+		//]) {
 			stage("Build") {
 				sh "make -j${env.NPROC} update" /* to allow a newer Nim version to be detected */
-		sh "make -j${env.NPROC} V=1 deps" /* to allow the following parallel stages */
+				sh "make -j${env.NPROC} deps" /* to allow the following parallel stages */
+				sh "scripts/setup_official_tests.sh jsonTestsCache"
 			}
+		//}
+
 		stage("Test") {
 			parallel(
 				"tools": {
@@ -17,11 +29,17 @@ def runStages() {
 				},
 				"test suite": {
 					stage("Test suite") {
-					sh "make -j${env.NPROC} test"
+						sh "make -j${env.NPROC} DISABLE_TEST_FIXTURES_SCRIPT=1 test"
 					}
 				}
 			)
 		}
+	} catch(e) {
+		echo "'${env.STAGE_NAME}' stage failed"
+		throw e
+	} finally {
+		cleanWs()
+	}
 }
 
 parallel(