Revert "Correctly checking out patches when needed in the VOLTHA tests"
it's braking the gitPull
This reverts commit 01d596c4a0a1c1df3d5ba88bb77864f16133a90b.
Reason for revert: <INSERT REASONING HERE>
Change-Id: Ic72a9e9e5d74a0eb7d560a7c488d42c3dccba509
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