From 2c9db56e1fa66dbe437d8978916b74d9cb2c0e23 Mon Sep 17 00:00:00 2001 From: Brian Stinson Date: Mar 14 2018 14:21:50 +0000 Subject: [PATCH 1/3] fix envvar in the clone step --- diff --git a/.cico.pipeline b/.cico.pipeline index 5c35bd9..f96350b 100644 --- a/.cico.pipeline +++ b/.cico.pipeline @@ -36,7 +36,7 @@ node('pagure') { } stage('Clone Test Suite') { - onmyduffynode "git clone -b \"${env.BRANCH_NAME}\" --single-branch --depth 1 https://pagure.io/pagure.git" + onmyduffynode "git clone -b \"${env.BRANCH}\" --single-branch --depth 1 https://pagure.io/pagure.git" } stage('Run Test Suite') { From bad9cde8f0f5319edd1a92dceeefbfc0dd6ff164 Mon Sep 17 00:00:00 2001 From: Brian Stinson Date: Mar 14 2018 14:21:50 +0000 Subject: [PATCH 2/3] if this is a PR, we don't have a BRANCH_NAME so start from master --- diff --git a/.cico.pipeline b/.cico.pipeline index f96350b..f6a09f4 100644 --- a/.cico.pipeline +++ b/.cico.pipeline @@ -36,7 +36,11 @@ node('pagure') { } stage('Clone Test Suite') { - onmyduffynode "git clone -b \"${env.BRANCH}\" --single-branch --depth 1 https://pagure.io/pagure.git" + if (env.BRANCH_NAME}{ + onmyduffynode "git clone -b \"${env.BRANCH_NAME}\" --single-branch --depth 1 https://pagure.io/pagure.git" + } else { + onmyduffynode "git clone --single-branch --depth 1 https://pagure.io/pagure.git" + } } stage('Run Test Suite') { From edd124fca2aad5c9d98ffbc5a3a616d6e113b480 Mon Sep 17 00:00:00 2001 From: Brian Stinson Date: Mar 14 2018 14:25:23 +0000 Subject: [PATCH 3/3] bracket typo --- diff --git a/.cico.pipeline b/.cico.pipeline index f6a09f4..ae00242 100644 --- a/.cico.pipeline +++ b/.cico.pipeline @@ -36,7 +36,7 @@ node('pagure') { } stage('Clone Test Suite') { - if (env.BRANCH_NAME}{ + if (env.BRANCH_NAME){ onmyduffynode "git clone -b \"${env.BRANCH_NAME}\" --single-branch --depth 1 https://pagure.io/pagure.git" } else { onmyduffynode "git clone --single-branch --depth 1 https://pagure.io/pagure.git"