From 066d25cdd28712438984c0a4672fcea30b18a768 Mon Sep 17 00:00:00 2001
From: Kacper <kacperdudzic@wp.pl>
Date: Thu, 12 May 2022 23:17:24 +0200
Subject: [PATCH] further fixes

---
 lab5/Jenkinsfile                  | 6 ++++--
 lab5/Jenkinsfile1                 | 2 +-
 lab6/Jenkinsfile_dataset_for_LAB6 | 2 +-
 lab6/Jenkinsfile_eval             | 2 +-
 lab6/Jenkinsfile_train            | 2 +-
 lab7/Jenkinsfile_eval             | 2 +-
 lab7/Jenkinsfile_train            | 2 +-
 lab8/Jenkinsfile_eval             | 2 +-
 lab8/Jenkinsfile_train            | 2 +-
 9 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/lab5/Jenkinsfile b/lab5/Jenkinsfile
index a848f9d..9eb5df1 100644
--- a/lab5/Jenkinsfile
+++ b/lab5/Jenkinsfile
@@ -1,6 +1,8 @@
 pipeline {
     agent {
-        dockerfile true
+        dockerfile {
+            dir 'lab5'
+        }
         }
 	parameters {
         string(
@@ -13,7 +15,7 @@ pipeline {
         stage('Stage 1') {
             steps {
                     sh 'cd lab5/'
-				    sh 'chmod u+x ./process_dataset.py ./simple_regression.py'
+				    sh 'chmod u+x process_dataset.py simple_regression.py'
                     echo 'Processing dataset...'
                     sh 'python3 process_dataset.py'
 					echo 'Dataset processed'
diff --git a/lab5/Jenkinsfile1 b/lab5/Jenkinsfile1
index 1eb31a8..8053e20 100644
--- a/lab5/Jenkinsfile1
+++ b/lab5/Jenkinsfile1
@@ -6,7 +6,7 @@ pipeline {
         stage('Stage 1') {
             steps {
                     sh 'cd lab5/'
-				    sh 'chmod u+x ./process_dataset.py ./simple_regression.py'
+				    sh 'chmod u+x process_dataset.py simple_regression.py'
                     echo 'Processing dataset...'
                     sh 'python3 process_dataset.py'
 					echo 'Dataset processed'
diff --git a/lab6/Jenkinsfile_dataset_for_LAB6 b/lab6/Jenkinsfile_dataset_for_LAB6
index a2e7573..c4f3663 100644
--- a/lab6/Jenkinsfile_dataset_for_LAB6
+++ b/lab6/Jenkinsfile_dataset_for_LAB6
@@ -8,7 +8,7 @@ pipeline {
         stage('Stage 1') {
             steps {
                     sh 'cd lab6/'
-				    sh 'chmod u+x ./process_dataset.py'
+				    sh 'chmod u+x process_dataset.py'
                     echo 'Processing dataset...'
                     sh 'python3 process_dataset.py'
 					echo 'Dataset processed'
diff --git a/lab6/Jenkinsfile_eval b/lab6/Jenkinsfile_eval
index 556642a..3007971 100644
--- a/lab6/Jenkinsfile_eval
+++ b/lab6/Jenkinsfile_eval
@@ -17,7 +17,7 @@ pipeline {
             steps {
                     git branch: "${params.BRANCH}", url: 'https://git.wmi.amu.edu.pl/s449288/ium_s449288.git'
                     sh 'cd lab6/'
-				    sh 'chmod u+x ./evaluate.py'
+				    sh 'chmod u+x evaluate.py'
 					echo 'Copying datasets from the create-dataset job...'
 					copyArtifacts filter: 'lego_sets_clean_test.csv', projectName: 's449288-create-dataset'
 					echo 'Datasets copied'					
diff --git a/lab6/Jenkinsfile_train b/lab6/Jenkinsfile_train
index 745bfb1..469aab6 100644
--- a/lab6/Jenkinsfile_train
+++ b/lab6/Jenkinsfile_train
@@ -15,7 +15,7 @@ pipeline {
         stage('Stage 1') {
             steps {
                     sh 'cd lab6/'
-				    sh 'chmod u+x ./simple_regression.py'
+				    sh 'chmod u+x simple_regression.py'
 					echo 'Copying datasets from create-dataset...'
 					copyArtifacts filter: '*', projectName: 's449288-create-dataset'
 					echo 'Datasets copied'
diff --git a/lab7/Jenkinsfile_eval b/lab7/Jenkinsfile_eval
index 4cf6dbd..200f42a 100644
--- a/lab7/Jenkinsfile_eval
+++ b/lab7/Jenkinsfile_eval
@@ -17,7 +17,7 @@ pipeline {
             steps {
                     sh 'cd lab7/'
                     git branch: "${params.BRANCH}", url: 'https://git.wmi.amu.edu.pl/s449288/ium_s449288.git'
-				    sh 'chmod u+x ./evaluate.py'
+				    sh 'chmod u+x evaluate.py'
 					echo 'Copying datasets from the create-dataset job...'
 					copyArtifacts filter: 'lego_sets_clean_test.csv', projectName: 's449288-create-dataset'
 					echo 'Datasets copied'					
diff --git a/lab7/Jenkinsfile_train b/lab7/Jenkinsfile_train
index 41e8d15..8ea1b99 100644
--- a/lab7/Jenkinsfile_train
+++ b/lab7/Jenkinsfile_train
@@ -8,7 +8,7 @@ pipeline {
         stage('Stage 1') {
             steps {
                     sh 'cd lab7/'
-				    sh 'chmod u+x ./simple_regression_lab7.py'
+				    sh 'chmod u+x simple_regression_lab7.py'
 					echo 'Copying datasets from create-dataset...'
 					copyArtifacts filter: '*', projectName: 's449288-create-dataset'
 					echo 'Datasets copied'
diff --git a/lab8/Jenkinsfile_eval b/lab8/Jenkinsfile_eval
index af7389e..cd4db6d 100644
--- a/lab8/Jenkinsfile_eval
+++ b/lab8/Jenkinsfile_eval
@@ -17,7 +17,7 @@ pipeline {
             steps {
                     git branch: "${params.BRANCH}", url: 'https://git.wmi.amu.edu.pl/s449288/ium_s449288.git'
                     cd 'lab8/'
-				    sh 'chmod u+x ./evaluate.py'
+				    sh 'chmod u+x evaluate.py'
 					echo 'Copying datasets from the create-dataset job...'
 					copyArtifacts filter: 'lego_sets_clean_test.csv', projectName: 's449288-create-dataset'
 					echo 'Datasets copied'					
diff --git a/lab8/Jenkinsfile_train b/lab8/Jenkinsfile_train
index 8b22aa1..88e09aa 100644
--- a/lab8/Jenkinsfile_train
+++ b/lab8/Jenkinsfile_train
@@ -8,7 +8,7 @@ pipeline {
         stage('Stage 1') {
             steps {
                     sh 'cd lab8/'
-				    sh 'chmod u+x ./simple_regression_lab8.py'
+				    sh 'chmod u+x simple_regression_lab8.py'
 					echo 'Copying datasets from create-dataset...'
 					copyArtifacts filter: '*', projectName: 's449288-create-dataset'
 					echo 'Datasets copied'