From 5362ad6897cf8765c21040f88245d4f065f20d5c Mon Sep 17 00:00:00 2001 From: Brian Stinson Date: Apr 12 2018 13:25:47 +0000 Subject: [PATCH 1/2] We were trying to have jenkins checkout the proper PR branch but the ci script already does this. The CI script just needs a copy of itself from master, and it will do the right thing. --- diff --git a/.cico.pipeline b/.cico.pipeline index 21e6419..3645904 100644 --- a/.cico.pipeline +++ b/.cico.pipeline @@ -27,6 +27,7 @@ node('pagure') { ).trim().tokenize(' ') env.DUFFY_NODE=duffy_rtn[0] env.SSID=duffy_rtn[1] + env.BRANCH=params.BRANCH } try { @@ -36,12 +37,7 @@ node('pagure') { } stage('Clone Test Suite') { - if (params.BRANCH){ - println "Checking out branch: ${params.BRANCH}" - onmyduffynode "git clone -b \"${params.BRANCH}\" --single-branch --depth 1 https://pagure.io/pagure.git" - } else { - onmyduffynode "git clone --single-branch --depth 1 https://pagure.io/pagure.git" - } + onmyduffynode "git clone --single-branch --depth 1 https://pagure.io/pagure.git" } stage('Run Test Suite') { From 5e29a9aebe6d1db159176b3f4798486e2c632e24 Mon Sep 17 00:00:00 2001 From: Brian Stinson Date: Apr 12 2018 13:25:47 +0000 Subject: [PATCH 2/2] add the REPO to the environment as well --- diff --git a/.cico.pipeline b/.cico.pipeline index 3645904..60023a8 100644 --- a/.cico.pipeline +++ b/.cico.pipeline @@ -28,6 +28,7 @@ node('pagure') { env.DUFFY_NODE=duffy_rtn[0] env.SSID=duffy_rtn[1] env.BRANCH=params.BRANCH + env.REPO=params.REPO } try {