From a69e1561b40fecce77e54dad4633c147251c2ecd Mon Sep 17 00:00:00 2001 From: mprahl Date: Jul 26 2018 19:36:01 +0000 Subject: Fix spacing in .cico-pr.pipeline --- diff --git a/.cico-pr.pipeline b/.cico-pr.pipeline index 8026f05..9537e9b 100644 --- a/.cico-pr.pipeline +++ b/.cico-pr.pipeline @@ -24,11 +24,11 @@ def onmyduffynode(script){ node('factory2'){ properties([ - parameters([ - string(defaultValue: "", description: "", name: "REPO"), - string(defaultValue: "", description: "", name: "BRANCH"), - ]) - ]) + parameters([ + string(defaultValue: "", description: "", name: "REPO"), + string(defaultValue: "", description: "", name: "BRANCH"), + ]) + ]) stage('Allocate Node'){ env.CICO_API_KEY = readFile("${env.HOME}/duffy.key").trim() @@ -42,13 +42,11 @@ node('factory2'){ try{ stage('Pre Setup Node'){ - // Install EPEL and the SCLs repo onmyduffynode 'yum -y install git docker && systemctl start docker' } stage('Clone Test Suite') { onmyduffynode "git clone --single-branch --depth 1 https://pagure.io/fm-orchestrator.git" - onmyduffynode "cd fm-orchestrator && git remote add proposed \"${env.REPO}\"" onmyduffynode "cd fm-orchestrator && git fetch proposed" onmyduffynode "cd fm-orchestrator && git checkout origin/master" @@ -56,8 +54,6 @@ node('factory2'){ onmyduffynode "cd fm-orchestrator && git config --global user.name CentOS CI" onmyduffynode "cd fm-orchestrator && git merge --no-ff \"proposed/${env.BRANCH}\" -m \'Merge PR\'" onmyduffynode "cd fm-orchestrator && git log -2" - - } stage('Build Docker Image') {