Correctly checking out patches when needed in the VOLTHA tests
Change-Id: I595cf3b43dee5b0d19abe14b9335c7dff59249e9
diff --git a/jjb/pipeline/voltha-bbsim-tests.groovy b/jjb/pipeline/voltha-bbsim-tests.groovy
index 3d91c7b..9fb741a 100644
--- a/jjb/pipeline/voltha-bbsim-tests.groovy
+++ b/jjb/pipeline/voltha-bbsim-tests.groovy
@@ -42,7 +42,6 @@
$class: 'GitSCM',
userRemoteConfigs: [[
url: "https://gerrit.opencord.org/kind-voltha",
- refspec: "${kindVolthaChange}"
]],
branches: [[ name: "master", ]],
extensions: [
@@ -51,6 +50,10 @@
[$class: 'CloneOption', depth: 0, noTags: false, reference: '', shallow: false],
],
])
+ sh """
+ cd $WORKSPACE/kind-voltha
+ git fetch https://gerrit.opencord.org/kind-voltha ${gerritRefspec} && git checkout FETCH_HEAD
+ """
}
}
stage('Clone voltha-system-tests') {
@@ -59,7 +62,6 @@
$class: 'GitSCM',
userRemoteConfigs: [[
url: "https://gerrit.opencord.org/voltha-system-tests",
- refspec: "${volthaSystemTestsChange}"
]],
branches: [[ name: "${branch}", ]],
extensions: [
@@ -68,6 +70,10 @@
[$class: 'CloneOption', depth: 0, noTags: false, reference: '', shallow: false],
],
])
+ sh """
+ cd $WORKSPACE/voltha-system-tests
+ git fetch https://gerrit.opencord.org/voltha-system-tests ${volthaSystemTestsChange} && git checkout FETCH_HEAD
+ """
}
}
// If the repo under test is not kind-voltha
@@ -83,7 +89,6 @@
$class: 'GitSCM',
userRemoteConfigs: [[
url: "https://gerrit.opencord.org/${gerritProject}",
- refspec: "${gerritRefspec}"
]],
branches: [[ name: "${branch}", ]],
extensions: [
@@ -94,6 +99,8 @@
])
sh """
pushd $WORKSPACE/${gerritProject}
+ git fetch https://gerrit.opencord.org/${gerritProject} ${gerritRefspec} && git checkout FETCH_HEAD
+
echo "Currently on commit: \n"
git log -1 --oneline
popd
diff --git a/jjb/pipeline/voltha-dt-physical-functional-tests.groovy b/jjb/pipeline/voltha-dt-physical-functional-tests.groovy
index 0b73874..2eb282e 100644
--- a/jjb/pipeline/voltha-dt-physical-functional-tests.groovy
+++ b/jjb/pipeline/voltha-dt-physical-functional-tests.groovy
@@ -40,7 +40,6 @@
$class: 'GitSCM',
userRemoteConfigs: [[
url: "https://gerrit.opencord.org/kind-voltha",
- refspec: "${kindVolthaChange}"
]],
branches: [[ name: "master", ]],
extensions: [
@@ -49,6 +48,10 @@
[$class: 'CloneOption', depth: 0, noTags: false, reference: '', shallow: false],
],
])
+ sh """
+ cd $WORKSPACE/kind-voltha
+ git fetch https://gerrit.opencord.org/kind-voltha ${gerritRefspec} && git checkout FETCH_HEAD
+ """
}
}
stage('Clone voltha-system-tests') {
@@ -57,7 +60,6 @@
$class: 'GitSCM',
userRemoteConfigs: [[
url: "https://gerrit.opencord.org/voltha-system-tests",
- refspec: "${volthaSystemTestsChange}"
]],
branches: [[ name: "${branch}", ]],
extensions: [
@@ -66,6 +68,10 @@
[$class: 'CloneOption', depth: 0, noTags: false, reference: '', shallow: false],
],
])
+ sh """
+ cd $WORKSPACE/voltha-system-tests
+ git fetch https://gerrit.opencord.org/voltha-system-tests ${volthaSystemTestsChange} && git checkout FETCH_HEAD
+ """
}
}
stage('Clone cord-tester') {
@@ -74,7 +80,6 @@
$class: 'GitSCM',
userRemoteConfigs: [[
url: "https://gerrit.opencord.org/cord-tester",
- refspec: "${cordTesterChange}"
]],
branches: [[ name: "master", ]],
extensions: [
@@ -83,6 +88,10 @@
[$class: 'CloneOption', depth: 0, noTags: false, reference: '', shallow: false],
],
])
+ sh """
+ cd $WORKSPACE/cord-tester
+ git fetch https://gerrit.opencord.org/voltha-system-tests ${cordTesterChange} && git checkout FETCH_HEAD
+ """
}
}
// This checkout allows us to show changes in Jenkins
diff --git a/jjb/pipeline/voltha-nightly-tests-bbsim.groovy b/jjb/pipeline/voltha-nightly-tests-bbsim.groovy
index 73346b9..56c6291 100644
--- a/jjb/pipeline/voltha-nightly-tests-bbsim.groovy
+++ b/jjb/pipeline/voltha-nightly-tests-bbsim.groovy
@@ -49,7 +49,6 @@
$class: 'GitSCM',
userRemoteConfigs: [[
url: "https://gerrit.opencord.org/kind-voltha",
- // refspec: "${kindVolthaChange}"
]],
branches: [[ name: "master", ]],
extensions: [
@@ -74,7 +73,6 @@
$class: 'GitSCM',
userRemoteConfigs: [[
url: "https://gerrit.opencord.org/voltha-system-tests",
- // refspec: "${volthaSystemTestsChange}"
]],
branches: [[ name: "${branch}", ]],
extensions: [
diff --git a/jjb/pipeline/voltha-physical-functional-tests.groovy b/jjb/pipeline/voltha-physical-functional-tests.groovy
index 15eaad7..2d11280 100644
--- a/jjb/pipeline/voltha-physical-functional-tests.groovy
+++ b/jjb/pipeline/voltha-physical-functional-tests.groovy
@@ -39,7 +39,6 @@
$class: 'GitSCM',
userRemoteConfigs: [[
url: "https://gerrit.opencord.org/kind-voltha",
- refspec: "${kindVolthaChange}"
]],
branches: [[ name: "master", ]],
extensions: [
@@ -48,6 +47,10 @@
[$class: 'CloneOption', depth: 0, noTags: false, reference: '', shallow: false],
],
])
+ sh """
+ cd $WORKSPACE/kind-voltha
+ git fetch https://gerrit.opencord.org/kind-voltha ${gerritRefspec} && git checkout FETCH_HEAD
+ """
}
}
stage('Clone voltha-system-tests') {
@@ -56,7 +59,6 @@
$class: 'GitSCM',
userRemoteConfigs: [[
url: "https://gerrit.opencord.org/voltha-system-tests",
- refspec: "${volthaSystemTestsChange}"
]],
branches: [[ name: "${branch}", ]],
extensions: [
@@ -65,6 +67,10 @@
[$class: 'CloneOption', depth: 0, noTags: false, reference: '', shallow: false],
],
])
+ sh """
+ cd $WORKSPACE/voltha-system-tests
+ git fetch https://gerrit.opencord.org/voltha-system-tests ${volthaSystemTestsChange} && git checkout FETCH_HEAD
+ """
}
}
stage('Clone cord-tester') {
@@ -73,7 +79,6 @@
$class: 'GitSCM',
userRemoteConfigs: [[
url: "https://gerrit.opencord.org/cord-tester",
- refspec: "${cordTesterChange}"
]],
branches: [[ name: "master", ]],
extensions: [
@@ -82,6 +87,10 @@
[$class: 'CloneOption', depth: 0, noTags: false, reference: '', shallow: false],
],
])
+ sh """
+ cd $WORKSPACE/cord-tester
+ git fetch https://gerrit.opencord.org/voltha-system-tests ${cordTesterChange} && git checkout FETCH_HEAD
+ """
}
}
stage('Download All the VOLTHA repos') {
diff --git a/jjb/pipeline/voltha-scale-test.groovy b/jjb/pipeline/voltha-scale-test.groovy
index 46b0074..98571b6 100644
--- a/jjb/pipeline/voltha-scale-test.groovy
+++ b/jjb/pipeline/voltha-scale-test.groovy
@@ -108,7 +108,6 @@
$class: 'GitSCM',
userRemoteConfigs: [[
url: "https://gerrit.opencord.org/kind-voltha",
- refspec: "${kindVolthaChange}"
]],
branches: [[ name: "master", ]],
extensions: [
@@ -117,6 +116,10 @@
[$class: 'CloneOption', depth: 0, noTags: false, reference: '', shallow: false],
],
])
+ sh """
+ cd $WORKSPACE/kind-voltha
+ git fetch https://gerrit.opencord.org/kind-voltha ${gerritRefspec} && git checkout FETCH_HEAD
+ """
}
}
stage('Clone voltha-system-tests') {
@@ -125,7 +128,6 @@
$class: 'GitSCM',
userRemoteConfigs: [[
url: "https://gerrit.opencord.org/voltha-system-tests",
- refspec: "${volthaSystemTestsChange}"
]],
branches: [[ name: "${release}", ]],
extensions: [
@@ -134,6 +136,10 @@
[$class: 'CloneOption', depth: 0, noTags: false, reference: '', shallow: false],
],
])
+ sh """
+ cd $WORKSPACE/voltha-system-tests
+ git fetch https://gerrit.opencord.org/voltha-system-tests ${volthaSystemTestsChange} && git checkout FETCH_HEAD
+ """
}
}
stage('Deploy common infrastructure') {
diff --git a/jjb/pipeline/voltha-tt-physical-functional-tests.groovy b/jjb/pipeline/voltha-tt-physical-functional-tests.groovy
index 687fb66..dbc4009 100644
--- a/jjb/pipeline/voltha-tt-physical-functional-tests.groovy
+++ b/jjb/pipeline/voltha-tt-physical-functional-tests.groovy
@@ -40,7 +40,6 @@
$class: 'GitSCM',
userRemoteConfigs: [[
url: "https://gerrit.opencord.org/kind-voltha",
- refspec: "${kindVolthaChange}"
]],
branches: [[ name: "master", ]],
extensions: [
@@ -49,6 +48,10 @@
[$class: 'CloneOption', depth: 0, noTags: false, reference: '', shallow: false],
],
])
+ sh """
+ cd $WORKSPACE/kind-voltha
+ git fetch https://gerrit.opencord.org/kind-voltha ${gerritRefspec} && git checkout FETCH_HEAD
+ """
}
}
stage('Clone voltha-system-tests') {
@@ -57,7 +60,6 @@
$class: 'GitSCM',
userRemoteConfigs: [[
url: "https://gerrit.opencord.org/voltha-system-tests",
- refspec: "${volthaSystemTestsChange}"
]],
branches: [[ name: "${branch}", ]],
extensions: [
@@ -66,6 +68,10 @@
[$class: 'CloneOption', depth: 0, noTags: false, reference: '', shallow: false],
],
])
+ sh """
+ cd $WORKSPACE/voltha-system-tests
+ git fetch https://gerrit.opencord.org/voltha-system-tests ${volthaSystemTestsChange} && git checkout FETCH_HEAD
+ """
}
}
stage('Clone cord-tester') {
@@ -74,7 +80,6 @@
$class: 'GitSCM',
userRemoteConfigs: [[
url: "https://gerrit.opencord.org/cord-tester",
- refspec: "${cordTesterChange}"
]],
branches: [[ name: "master", ]],
extensions: [
@@ -83,6 +88,10 @@
[$class: 'CloneOption', depth: 0, noTags: false, reference: '', shallow: false],
],
])
+ sh """
+ cd $WORKSPACE/cord-tester
+ git fetch https://gerrit.opencord.org/voltha-system-tests ${cordTesterChange} && git checkout FETCH_HEAD
+ """
}
}
// This checkout allows us to show changes in Jenkins