From 97e9f584e7a0536094c5a50d7bff17cd876e0734 Mon Sep 17 00:00:00 2001
From: s424714 <filpat@st.amu.edu.pl>
Date: Tue, 23 May 2023 12:41:48 +0200
Subject: [PATCH] fix: jenkinsfile-dvc

---
 Dockerfile      |  2 +-
 Jenkinsfile-dvc | 15 ++++++---------
 2 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 0cf7457..8193d72 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -14,7 +14,7 @@ COPY environment.yml /tmp/environment.yml
 RUN mamba env create -f /tmp/environment.yml && mamba clean -ya
 RUN echo "mamba activate ium" >> ~/.bashrc
 ENV PATH /opt/conda/envs/ium/bin:$PATH
-RUN pip install dvc[ssh] paramiko
+RUN pip install 'dvc[ssh]' paramiko
 
 RUN useradd -r -u 111 jenkins
 
diff --git a/Jenkinsfile-dvc b/Jenkinsfile-dvc
index c70629b..b42a0c3 100644
--- a/Jenkinsfile-dvc
+++ b/Jenkinsfile-dvc
@@ -5,22 +5,19 @@ node {
         checkout([$class: 'GitSCM', branches: [[name: '*/master']], extensions: [], userRemoteConfigs: [[credentialsId: 's424714', url: 'https://git.wmi.amu.edu.pl/s424714/ium_424714']]])
     }
 
-
     stage('Dockerfile build') {
-
-
             sh "chmod +x -R ${env.WORKSPACE}"
             def dockerImage = docker.build("s424714-model:latest")
 
             dockerImage.inside {
 
-            withCredentials([string(credentialsId: 'ium-sftp-password', variable: 'IUM_SFTP_PASS')]) {
-                                sh 'dvc remote modify --local ium_ssh_remote password $IUM_SFTP_PASS'
-                                sh 'dvc pull'
-                                sh 'dvc exp run'
-                                }
+                withCredentials([string(credentialsId: 'ium-sftp-password', variable: 'IUM_SFTP_PASS')]) {
+                    sh 'dvc remote modify --local ium_ssh_remote password $IUM_SFTP_PASS'
+                    sh 'dvc pull'
+                    sh 'dvc repro'
+                    }
 
-                                }
+        }
     }
 }