parallel ftw

Jenkinsfile.test

@@ -4,17 +4,23 @@ env.PWD_BIND = '/workspace'
 
 cleanNode('os-autoinst') {
   try {
-    stage('tree-wget') {
-      sh 'wget -q http://metadata.neon.kde.org/os-autoinst/${TYPE}.tar'
-      sh 'wget -q http://metadata.neon.kde.org/os-autoinst/${TYPE}.tar.sig'
+    stage('tree[wget]') {
+      sh "wget -q http://metadata.neon.kde.org/os-autoinst/${env.TYPE}.tar"
+      sh "wget -q http://metadata.neon.kde.org/os-autoinst/${env.TYPE}.tar.sig"
     }
-    stage('tree-verify') {
-      sh 'gpg2 --recv-keys "348C 8651 2066 33FD 983A  8FC4 DEAC EA00 075E 1D76"'
-      sh 'gpg2 --verify ${TYPE}.tar.sig'
-    }
-    stage('tree-untar') {
-        sh 'tar -xvf ${TYPE}.tar'
-      sh 'ls -lah'
+    parallel(
+      "tree[verify]": {
+        sh 'gpg2 --recv-keys "348C 8651 2066 33FD 983A  8FC4 DEAC EA00 075E 1D76"'
+        sh 'gpg2 --verify ${TYPE}.tar.sig'
+      },
+      "tree[untar]": {
+        sh 'tar -xf ${TYPE}.tar'
+        sh 'ls -lah'
+      }
+    )
+    stage('pull') {
+      sh 'git branch --set-upstream-to=origin/master master'
+      sh 'git pull'
     }
     stage('test-plasma_folder') {
       sh 'TESTS_TO_RUN=tests/plasma_folder.pm bin/contain.rb /workspace/bin/bootstrap.rb'
@@ -22,7 +28,7 @@ cleanNode('os-autoinst') {
   } finally {
     archiveArtifacts 'wok/testresults/*.png, wok/testresults/*.json, wok/ulogs/*, wok/video.ogv'
     junit 'junit/*'
-    sh 'bin/contain.rb chown -R jenkins .'
+    sh 'bin/contain.rb chown -R jenkins . || true'
   }
 }