Show Gerrit changes in Jenkins
Change-Id: I709932d838889ad0ffe1054ecafd03127d3e8920
diff --git a/jjb/pipeline/voltha-physical-tests.groovy b/jjb/pipeline/voltha-physical-tests.groovy
index 44dfd26..01df605 100644
--- a/jjb/pipeline/voltha-physical-tests.groovy
+++ b/jjb/pipeline/voltha-physical-tests.groovy
@@ -60,35 +60,33 @@
localDeploymentConfigFile = "${env.localConfigDir}/${params.deploymentConfigFile}"
localKindVolthaValuesFile = "${env.localConfigDir}/${params.kindVolthaValuesFile}"
localSadisConfigFile = "${env.localConfigDir}/${params.sadisConfigFile}"
- if ( ! params.withPatchset ) {
- sh returnStdout: false, script: """
- mkdir -p voltha
- cd voltha
- git clone -b ${branch} ${cordRepoUrl}/voltha-system-tests
- """
- }
}
}
}
+ stage('Repo') {
+ steps {
+ checkout(changelog: true,
+ poll: false,
+ scm: [$class: 'RepoScm',
+ manifestRepositoryUrl: "${params.manifestUrl}",
+ manifestBranch: "${params.manifestBranch}",
+ currentBranch: true,
+ destinationDir: 'voltha',
+ forceSync: true,
+ resetFirst: true,
+ quiet: true,
+ jobs: 4,
+ showAllChanges: true]
+ )
+ }
+ }
+
stage('Get Patch') {
when {
expression { params.withPatchset }
}
steps {
- checkout(changelog: false, \
- poll: false,
- scm: [$class: 'RepoScm', \
- manifestRepositoryUrl: "${params.manifestUrl}", \
- manifestBranch: "${params.manifestBranch}", \
- currentBranch: true, \
- destinationDir: 'voltha', \
- forceSync: true,
- resetFirst: true, \
- quiet: true, \
- jobs: 4, \
- showAllChanges: true] \
- )
sh returnStdout: false, script: """
cd voltha
PROJECT_PATH=\$(xmllint --xpath "string(//project[@name=\\\"${gerritProject}\\\"]/@path)" .repo/manifest.xml)
diff --git a/jjb/voltha-e2e.yaml b/jjb/voltha-e2e.yaml
index 5f30bff..8046c28 100644
--- a/jjb/voltha-e2e.yaml
+++ b/jjb/voltha-e2e.yaml
@@ -352,8 +352,8 @@
- string:
name: manifestBranch
- default: '$GERRIT_BRANCH'
- description: 'Name of the repo branch to use'
+ default: 'master'
+ description: 'Name of the repo branch to use (change to $GERRIT_BRANCH if testing a patchset)'
- string:
name: gerritProject