| |
@@ -27,6 +27,8 @@
|
| |
).trim().tokenize(' ')
|
| |
env.DUFFY_NODE=duffy_rtn[0]
|
| |
env.SSID=duffy_rtn[1]
|
| |
+ env.BRANCH=params.BRANCH
|
| |
+ env.REPO=params.REPO
|
| |
}
|
| |
|
| |
try {
|
| |
@@ -36,12 +38,7 @@
|
| |
}
|
| |
|
| |
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') {
|
| |
bstinson
commented 6 years ago
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.