From 65e4075f7763d772162e5facc21082a12937e528 Mon Sep 17 00:00:00 2001
From: AdamOsiowy123 <adaosi@st.amu.edu.pl>
Date: Wed, 4 May 2022 23:00:44 +0200
Subject: [PATCH] final

---
 Jenkins/Jenkinsfile.evaluation |  6 +++---
 Jenkins/Jenkinsfile.training   | 11 ++++++++++-
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/Jenkins/Jenkinsfile.evaluation b/Jenkins/Jenkinsfile.evaluation
index 766c5e3..4e1c6c0 100644
--- a/Jenkins/Jenkinsfile.evaluation
+++ b/Jenkins/Jenkinsfile.evaluation
@@ -33,12 +33,12 @@ node {
         stage('Copy artifacts') {
             copyArtifacts filter: 'train_data.csv', fingerprintArtifacts: true, projectName: 's444452-create-dataset'
             copyArtifacts filter: 'test_data.csv', fingerprintArtifacts: true, projectName: 's444452-create-dataset'
-            git branch: "${params.BRANCH}", url: 'https://git.wmi.amu.edu.pl/s444452/ium_444452.git'
-            copyArtifacts filter: 'neural_network_evaluation.csv', projectName: "s444452-evaluation/${BRANCH}/", optional: true
-            copyArtifacts filter: 'model/neural_net', projectName: "s444452-training/${BRANCH}/", selector: buildParameter('BUILD_SELECTOR')
+            copyArtifacts filter: 'neural_network_evaluation.csv', projectName: "s444452-evaluation/${params.BRANCH}", optional: true
+            copyArtifacts filter: 'model/neural_net', projectName: "s444452-training/${params.BRANCH}", selector: buildParameter('BUILD_SELECTOR')
         }
         stage('Run script') {
             withEnv(["TEST_PARAMS=${params.TEST_PARAMS}", "BUILD_NR=${params.BUILD_NR}"]) {
+                sh "rm neural_network_evaluation.csv"
                 sh "python3 Scripts/evaluate_neural_network.py $BUILD_NR $TEST_PARAMS"
             }
         }
diff --git a/Jenkins/Jenkinsfile.training b/Jenkins/Jenkinsfile.training
index 04be3e0..ea359f0 100644
--- a/Jenkins/Jenkinsfile.training
+++ b/Jenkins/Jenkinsfile.training
@@ -20,6 +20,7 @@ node {
         }
         stage('Run script') {
             withEnv(["TRAIN_PARAMS=${params.TRAIN_PARAMS}"]) {
+                sh "rm model/neural_net"
                 sh "python3 Scripts/train_neural_network.py $TRAIN_PARAMS"
             }
         }
@@ -41,7 +42,15 @@ def notifyBuild(String buildStatus = 'STARTED') {
     def details = "Build nr: ${env.BUILD_NUMBER}, status: ${buildStatus} \n url: ${env.BUILD_URL} \n build params: ${params.TRAIN_PARAMS}"
 
     if (buildStatus == 'SUCCESS') {
-        build job: "s444452-evaluation/${env.BRANCH_NAME}", parameters: [string(name: "TEST_PARAMS",  value: "${params.TRAIN_PARAMS}"), string(name: "BUILD_NR", value: "${env.BUILD_NUMBER}")], wait: false
+        build (
+            job: "s444452-evaluation/${env.BRANCH_NAME}",
+            parameters: [
+                gitParameter(name: "BRANCH", value: "${env.BRANCH_NAME}"),
+                string(name: "TEST_PARAMS",  value: "${params.TRAIN_PARAMS}"),
+                string(name: "BUILD_NR", value: "${env.BUILD_NUMBER}")
+            ],
+            wait: false
+        )
     }
 
     emailext (