Merge "Revert "Correctly checking out patches when needed in the VOLTHA tests" it's braking the gitPull"
diff --git a/jjb/pipeline/voltha-bbsim-tests.groovy b/jjb/pipeline/voltha-bbsim-tests.groovy
index 9fb741a..3d91c7b 100644
--- a/jjb/pipeline/voltha-bbsim-tests.groovy
+++ b/jjb/pipeline/voltha-bbsim-tests.groovy
@@ -42,6 +42,7 @@
$class: 'GitSCM',
userRemoteConfigs: [[
url: "https://gerrit.opencord.org/kind-voltha",
+ refspec: "${kindVolthaChange}"
]],
branches: [[ name: "master", ]],
extensions: [
@@ -50,10 +51,6 @@
[$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') {
@@ -62,6 +59,7 @@
$class: 'GitSCM',
userRemoteConfigs: [[
url: "https://gerrit.opencord.org/voltha-system-tests",
+ refspec: "${volthaSystemTestsChange}"
]],
branches: [[ name: "${branch}", ]],
extensions: [
@@ -70,10 +68,6 @@
[$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
@@ -89,6 +83,7 @@
$class: 'GitSCM',
userRemoteConfigs: [[
url: "https://gerrit.opencord.org/${gerritProject}",
+ refspec: "${gerritRefspec}"
]],
branches: [[ name: "${branch}", ]],
extensions: [
@@ -99,8 +94,6 @@
])
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 2eb282e..0b73874 100644
--- a/jjb/pipeline/voltha-dt-physical-functional-tests.groovy
+++ b/jjb/pipeline/voltha-dt-physical-functional-tests.groovy
@@ -40,6 +40,7 @@
$class: 'GitSCM',
userRemoteConfigs: [[
url: "https://gerrit.opencord.org/kind-voltha",
+ refspec: "${kindVolthaChange}"
]],
branches: [[ name: "master", ]],
extensions: [
@@ -48,10 +49,6 @@
[$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') {
@@ -60,6 +57,7 @@
$class: 'GitSCM',
userRemoteConfigs: [[
url: "https://gerrit.opencord.org/voltha-system-tests",
+ refspec: "${volthaSystemTestsChange}"
]],
branches: [[ name: "${branch}", ]],
extensions: [
@@ -68,10 +66,6 @@
[$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') {
@@ -80,6 +74,7 @@
$class: 'GitSCM',
userRemoteConfigs: [[
url: "https://gerrit.opencord.org/cord-tester",
+ refspec: "${cordTesterChange}"
]],
branches: [[ name: "master", ]],
extensions: [
@@ -88,10 +83,6 @@
[$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 56c6291..73346b9 100644
--- a/jjb/pipeline/voltha-nightly-tests-bbsim.groovy
+++ b/jjb/pipeline/voltha-nightly-tests-bbsim.groovy
@@ -49,6 +49,7 @@
$class: 'GitSCM',
userRemoteConfigs: [[
url: "https://gerrit.opencord.org/kind-voltha",
+ // refspec: "${kindVolthaChange}"
]],
branches: [[ name: "master", ]],
extensions: [
@@ -73,6 +74,7 @@
$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 2d11280..15eaad7 100644
--- a/jjb/pipeline/voltha-physical-functional-tests.groovy
+++ b/jjb/pipeline/voltha-physical-functional-tests.groovy
@@ -39,6 +39,7 @@
$class: 'GitSCM',
userRemoteConfigs: [[
url: "https://gerrit.opencord.org/kind-voltha",
+ refspec: "${kindVolthaChange}"
]],
branches: [[ name: "master", ]],
extensions: [
@@ -47,10 +48,6 @@
[$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,6 +56,7 @@
$class: 'GitSCM',
userRemoteConfigs: [[
url: "https://gerrit.opencord.org/voltha-system-tests",
+ refspec: "${volthaSystemTestsChange}"
]],
branches: [[ name: "${branch}", ]],
extensions: [
@@ -67,10 +65,6 @@
[$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') {
@@ -79,6 +73,7 @@
$class: 'GitSCM',
userRemoteConfigs: [[
url: "https://gerrit.opencord.org/cord-tester",
+ refspec: "${cordTesterChange}"
]],
branches: [[ name: "master", ]],
extensions: [
@@ -87,10 +82,6 @@
[$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 98571b6..46b0074 100644
--- a/jjb/pipeline/voltha-scale-test.groovy
+++ b/jjb/pipeline/voltha-scale-test.groovy
@@ -108,6 +108,7 @@
$class: 'GitSCM',
userRemoteConfigs: [[
url: "https://gerrit.opencord.org/kind-voltha",
+ refspec: "${kindVolthaChange}"
]],
branches: [[ name: "master", ]],
extensions: [
@@ -116,10 +117,6 @@
[$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') {
@@ -128,6 +125,7 @@
$class: 'GitSCM',
userRemoteConfigs: [[
url: "https://gerrit.opencord.org/voltha-system-tests",
+ refspec: "${volthaSystemTestsChange}"
]],
branches: [[ name: "${release}", ]],
extensions: [
@@ -136,10 +134,6 @@
[$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 dbc4009..687fb66 100644
--- a/jjb/pipeline/voltha-tt-physical-functional-tests.groovy
+++ b/jjb/pipeline/voltha-tt-physical-functional-tests.groovy
@@ -40,6 +40,7 @@
$class: 'GitSCM',
userRemoteConfigs: [[
url: "https://gerrit.opencord.org/kind-voltha",
+ refspec: "${kindVolthaChange}"
]],
branches: [[ name: "master", ]],
extensions: [
@@ -48,10 +49,6 @@
[$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') {
@@ -60,6 +57,7 @@
$class: 'GitSCM',
userRemoteConfigs: [[
url: "https://gerrit.opencord.org/voltha-system-tests",
+ refspec: "${volthaSystemTestsChange}"
]],
branches: [[ name: "${branch}", ]],
extensions: [
@@ -68,10 +66,6 @@
[$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') {
@@ -80,6 +74,7 @@
$class: 'GitSCM',
userRemoteConfigs: [[
url: "https://gerrit.opencord.org/cord-tester",
+ refspec: "${cordTesterChange}"
]],
branches: [[ name: "master", ]],
extensions: [
@@ -88,10 +83,6 @@
[$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