From b1a03b41b0e623d62290b6f7b35d34dea168e2b2 Mon Sep 17 00:00:00 2001
From: Mateusz <matpiw1@st.amu.edu.pl>
Date: Sat, 4 May 2024 15:59:35 +0200
Subject: [PATCH] IUM_06

---
 Jenkinsfile | 9 ++++++++-
 predict.py  | 1 -
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 1f8b990..37d6928 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -13,6 +13,7 @@ pipeline {
       description: 'Which build to use for copying artifacts',
       name: 'BUILD_SELECTOR'
     )
+    gitParameter branchFilter: 'origin/(.*)', defaultValue: 'training', name: 'BRANCH', type: 'PT_BRANCH'
   }
 
   stages {
@@ -30,7 +31,13 @@ pipeline {
 
     stage('Copy Artifacts from training job') {
       steps {
-        copyArtifacts filter: 'model/*', projectName: 's464913-training/training', selector: buildParameter('BUILD_SELECTOR')
+        copyArtifacts filter: 'model/*', projectName: 's464913-training/' + params.BRANCH, selector: buildParameter('BUILD_SELECTOR')
+      }
+    }
+
+    stage('Copy Artifacts from training job') {
+      steps {
+        copyArtifacts filter: 'evaluation/*', projectName: 's464913-evaluation/evaluation', selector: buildParameter('BUILD_SELECTOR'), optional: true
       }
     }
 
diff --git a/predict.py b/predict.py
index 0f83334..c1f476b 100644
--- a/predict.py
+++ b/predict.py
@@ -11,7 +11,6 @@ import numpy as np
 def main():
     model = load_model("model/model.keras")
     X_test = pd.read_csv("data/X_test.csv")
-    y_test = pd.read_csv("data/y_test.csv")
 
     y_pred = model.predict(X_test)
     y_pred = y_pred >= 0.5