From 6e172a4486ccdbd2547b011c6e15f276e4d53a83 Mon Sep 17 00:00:00 2001 From: s424714 Date: Mon, 22 May 2023 23:28:59 +0200 Subject: [PATCH] fix: jenkinsfile-dvc --- Dockerfile | 4 +++- Jenkinsfile-dvc | 27 +++++++++++---------------- 2 files changed, 14 insertions(+), 17 deletions(-) diff --git a/Dockerfile b/Dockerfile index 83cf00a..0cf7457 100644 --- a/Dockerfile +++ b/Dockerfile @@ -14,9 +14,11 @@ 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 useradd -r -u 111 jenkins COPY src ./src - #make dir for data RUN mkdir -p ./data; mkdir -p ./results diff --git a/Jenkinsfile-dvc b/Jenkinsfile-dvc index a13de31..56f5650 100644 --- a/Jenkinsfile-dvc +++ b/Jenkinsfile-dvc @@ -10,26 +10,21 @@ node { sh "chmod +x -R ${env.WORKSPACE}" - copyArtifacts fingerprintArtifacts: true, projectName: 's424714-create-dataset', selector: buildParameter('BUILD_SELECTOR') - - def dockerImage = docker.build("s424714-model") + def dockerImage = docker.build("s424714-model:latest") dockerImage.inside { - - withCredentials( - [sshUserPrivateKey(credentialsId: '48ac7004-216e-4260-abba-1fe5db753e18', keyFileVariable: 'IUM_SFTP_KEY', passphraseVariable: '', usernameVariable: '')]) { - - stage("Docker: DVC") - { - sh 'dvc remote add -d ium_ssh_remote ssh://ium-sftp@tzietkiewicz.vm.wmi.amu.edu.pl/ium-sftp' - sh 'dvc remote modify --local ium_ssh_remote keyfile $IUM_SFTP_KEY' - sh 'dvc pull' - sh 'dvc exp run' - } - } + + withCredentials([string(credentialsId: 'ium-sftp-password', variable: 'IUM_SFTP_PASS')]) { + + sh 'dvc remote add -d ium_ssh_remote ssh://ium-sftp@tzietkiewicz.vm.wmi.amu.edu.pl/ium-sftp' + sh 'dvc remote modify --local ium_ssh_remote password $IUM_SFTP_KEY' + sh 'dvc pull' + sh 'dvc exp run' + } + } } } -} +