From 87de8083bfb9e5a38509c1fc00eaaeac02750af1 Mon Sep 17 00:00:00 2001 From: Filip Valder Date: Mar 12 2019 15:03:35 +0000 Subject: Fix scm checkout --- diff --git a/Jenkinsfile b/Jenkinsfile index ed26d4c..9a749f6 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -43,8 +43,8 @@ node('master'){ timestamps { node('fedora-29') { - checkout scm stage('Prepare') { + checkout scm sh 'sudo rm -f rpmbuild-output/*.src.rpm' sh 'mkdir -p rpmbuild-output' sh 'make -f .copr/Makefile srpm outdir=./rpmbuild-output/' @@ -87,8 +87,8 @@ node('fedora-29') { } if ("${env.JOB_NAME}" != 'freshmaker-prs') { node('docker') { - checkout scm stage('Build Docker container') { + checkout scm unarchive mapping: ['mock-result/f29/': '.'] def f29_rpm = findFiles(glob: 'mock-result/f29/**/*.noarch.rpm')[0] def appversion = sh(returnStdout: true, script: """ @@ -127,9 +127,9 @@ node('docker') { } } node('docker') { - checkout scm if (scmVars.GIT_BRANCH == 'origin/master') { stage('Tag "latest".') { + checkout scm unarchive mapping: ['appversion': 'appversion'] def appversion = readFile('appversion').trim() docker.withRegistry(