From 2e58b878a9de5508d57fa045e078a88dcea9f22a Mon Sep 17 00:00:00 2001
From: Filip Gralinski <filipg@amu.edu.pl>
Date: Mon, 2 Dec 2019 20:25:31 +0100
Subject: [PATCH] Fix Jenkinsfile

---
 .../.gitignore                                |  1 +
 .../Jenkinsfile                               | 19 ++++++++++++-------
 2 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/{{cookiecutter.thesis_type}}-{{cookiecutter.thesis_surname}}/.gitignore b/{{cookiecutter.thesis_type}}-{{cookiecutter.thesis_surname}}/.gitignore
index 82e710b..019e7c1 100644
--- a/{{cookiecutter.thesis_type}}-{{cookiecutter.thesis_surname}}/.gitignore
+++ b/{{cookiecutter.thesis_type}}-{{cookiecutter.thesis_surname}}/.gitignore
@@ -145,6 +145,7 @@ vcs.xml
 *.idx
 *.lof
 *.lot
+*.brf
 /auto
 {{cookiecutter.thesis_surname}}.pdf
 {{cookiecutter.thesis_surname}}.zip
diff --git a/{{cookiecutter.thesis_type}}-{{cookiecutter.thesis_surname}}/Jenkinsfile b/{{cookiecutter.thesis_type}}-{{cookiecutter.thesis_surname}}/Jenkinsfile
index 682b2a4..12ee10b 100644
--- a/{{cookiecutter.thesis_type}}-{{cookiecutter.thesis_surname}}/Jenkinsfile
+++ b/{{cookiecutter.thesis_type}}-{{cookiecutter.thesis_surname}}/Jenkinsfile
@@ -1,13 +1,23 @@
 pipeline {
 
-    node ('tau2013z') {
+    agent { label 'tau2013z' }
 
-        checkout([$class: 'GitSCM', branches: [[name: '*/master']], doGenerateSubmoduleConfigurations: false, extensions: [[$class: 'RelativeTargetDirectory', relativeTargetDir: 'autozoil']], submoduleCfg: [], userRemoteConfigs: [[url: 'https://gitlab.com/filipg/autozoil.git']]])
+    stages {
+
+        stage ('get-autozoil') {
+            checkout([$class: 'GitSCM', branches: [[name: '*/master']], doGenerateSubmoduleConfigurations: false, extensions: [[$class: 'RelativeTargetDirectory', relativeTargetDir: 'autozoil']], submoduleCfg: [], userRemoteConfigs: [[url: 'https://gitlab.com/filipg/autozoil.git']]])
+        }
 
 	stage ('build-pdf') {
             sh """
 bash build.sh
 """
+            post {
+                always {
+                    archiveArtifacts artifacts: '{{cookiecutter.thesis_surname}}.pdf', fingerprint: true
+                }
+            }
+
 	}
 
 	stage ('autozoil') {
@@ -16,10 +26,5 @@ AUTOZOIL_DIR=autozoil bash check.sh
 """
 	}
 
-        post {
-            always {
-                archiveArtifacts artifacts: '{{cookiecutter.thesis_surname}}.pdf', fingerprint: true
-            }
-        }
     }
 }