Replace distribution git clone by wget distribution pom.xml

This patch will replace the method for finding out the distribution
version in integration-get-bundle-vars.sh script. After that we
can go ahead and remove all references to distribution except for
the integration-patch-test job that really needs to build the
distribution code with the patch change.

Change-Id: Ie4471ed2223f99a0631cf91ed96f45b194662e70
Signed-off-by: Luis Gomez <ecelgp@gmail.com>

diff --git a/jjb/integration/include-raw-integration-get-bundle-vars.sh b/jjb/integration/include-raw-integration-get-bundle-vars.sh
index 5da4603b02bae34f0fa7190fe22311a257a01f50..641503ebabbcfaff5ef11ff4ad101106b87274ee 100644 (file)
--- a/jjb/integration/include-raw-integration-get-bundle-vars.sh
+++ b/jjb/integration/include-raw-integration-get-bundle-vars.sh
@@ -5,11 +5,13 @@ echo "#################################################"
 NEXUSURL_PREFIX=${ODLNEXUSPROXY:-https://nexus.opendaylight.org}
 
 if [ ${BUNDLEURL} == 'last' ]; then
-    NEXUSPATH="${NEXUSURL_PREFIX}/content/repositories/opendaylight.snapshot/org/opendaylight/integration/distribution-karaf"
+    # Obtain current pom.xml of integration/distribution, correct branch.
+    wget "http://git.opendaylight.org/gerrit/gitweb?p=integration/distribution.git;a=blob_plain;f=pom.xml;hb=refs/heads/$BRANCH" -O "pom.xml"
     # Extract the BUNDLEVERSION from the pom.xml
-    BUNDLEVERSION=`xpath distribution/pom.xml '/project/version/text()' 2> /dev/null`
+    BUNDLEVERSION=`xpath pom.xml '/project/version/text()' 2> /dev/null`
     echo "Bundle version is ${BUNDLEVERSION}"
     # Acquire the timestamp information from maven-metadata.xml
+    NEXUSPATH="${NEXUSURL_PREFIX}/content/repositories/opendaylight.snapshot/org/opendaylight/integration/distribution-karaf"
     wget ${NEXUSPATH}/${BUNDLEVERSION}/maven-metadata.xml
     less maven-metadata.xml
     TIMESTAMP=`xpath maven-metadata.xml "//snapshotVersion[extension='zip'][1]/value/text()" 2>/dev/null`

diff --git a/jjb/integration/integration-templates.yaml b/jjb/integration/integration-templates.yaml
index 65645124e4b09b4cefd97ade2ef8c404097eafac..65b49d9a5c989d91ed1e353a96204cd91a26d888 100644 (file)
--- a/jjb/integration/integration-templates.yaml
+++ b/jjb/integration/integration-templates.yaml
@@ -15,7 +15,6 @@
 # Parameters:
 #
 # project-parameter: main project integration/test ($PROJECT)
-# integration-distribution-git-url: distribution GIT ($DISTROGITURL)
 # integration-branch: distribution branch ($BRANCH)
 # integration-controller-bundleurl: distribution URL ($BUNDLEURL)
 # integration-controller-scope: only or all features ($CONTROLLERSCOPE)
@@ -43,7 +42,6 @@
     parameters:
         - project-parameter:
             project: 'integration/test'
-        - integration-distribution-git-url
         - integration-branch:
             branch: 'master'
         - integration-bundleurl:
@@ -58,9 +56,6 @@
             test-plan: '{project}-{functionality}.txt'
 
     scm:
-        - integration-distribution-scm:
-            credentials-id: '{ssh-credentials}'
-            branch: 'master'
         - integration-gerrit-scm:
             credentials-id: '{ssh-credentials}'
             basedir: 'test'
@@ -116,7 +111,6 @@
     parameters:
         - project-parameter:
             project: 'integration/test'
-        - integration-distribution-git-url
         - integration-branch:
             branch: '{branch}'
         - integration-bundleurl:
@@ -133,9 +127,6 @@
             branch: 'stable/helium'
 
     scm:
-        - integration-distribution-scm:
-            credentials-id: '{ssh-credentials}'
-            branch: '{branch}'
         - integration-gerrit-scm:
             credentials-id: '{ssh-credentials}'
             basedir: 'test'
@@ -219,7 +210,6 @@
     parameters:
         - project-parameter:
             project: 'integration/test'
-        - integration-distribution-git-url
         - integration-branch:
             branch: 'master'
         - integration-bundleurl:
@@ -234,9 +224,6 @@
             test-plan: '{project}-{functionality}.txt'
 
     scm:
-        - integration-distribution-scm:
-            credentials-id: '{ssh-credentials}'
-            branch: 'master'
         - integration-gerrit-scm:
             credentials-id: '{ssh-credentials}'
             basedir: 'test'
@@ -292,7 +279,6 @@
     parameters:
         - project-parameter:
             project: 'integration/test'
-        - integration-distribution-git-url
         - integration-branch:
             branch: '{branch}'
         - integration-bundleurl:
@@ -309,9 +295,6 @@
             branch: 'master'
 
     scm:
-        - integration-distribution-scm:
-            credentials-id: '{ssh-credentials}'
-            branch: '{branch}'
         - integration-gerrit-scm:
             credentials-id: '{ssh-credentials}'
             basedir: 'test'
@@ -391,7 +374,6 @@
     parameters:
         - project-parameter:
             project: 'integration/test'
-        - integration-distribution-git-url
         - integration-branch:
             branch: '{branch}'
         - integration-bundleurl:
@@ -408,9 +390,6 @@
             branch: 'master'
 
     scm:
-        - integration-distribution-scm:
-            credentials-id: '{ssh-credentials}'
-            branch: '{branch}'
         - integration-gerrit-scm:
             credentials-id: '{ssh-credentials}'
             basedir: 'test'
@@ -487,7 +466,6 @@
     parameters:
         - project-parameter:
             project: 'integration/test'
-        - integration-distribution-git-url
         - integration-branch:
             branch: 'master'
         - integration-bundleurl:
@@ -502,9 +480,6 @@
             test-plan: '{project}-{functionality}.txt'
 
     scm:
-        - integration-distribution-scm:
-            credentials-id: '{ssh-credentials}'
-            branch: 'master'
         - integration-gerrit-scm:
             credentials-id: '{ssh-credentials}'
             basedir: 'test'
@@ -561,7 +536,6 @@
     parameters:
         - project-parameter:
             project: 'integration/test'
-        - integration-distribution-git-url
         - integration-branch:
             branch: '{branch}'
         - integration-bundleurl:
@@ -578,9 +552,6 @@
             branch: 'master'
 
     scm:
-        - integration-distribution-scm:
-            credentials-id: '{ssh-credentials}'
-            branch: '{branch}'
         - integration-gerrit-scm:
             credentials-id: '{ssh-credentials}'
             basedir: 'test'
@@ -662,7 +633,6 @@
     parameters:
         - project-parameter:
             project: 'integration/test'
-        - integration-distribution-git-url
         - integration-branch:
             branch: '{branch}'
         - integration-bundleurl:
@@ -679,9 +649,6 @@
             branch: 'master'
 
     scm:
-        - integration-distribution-scm:
-            credentials-id: '{ssh-credentials}'
-            branch: '{branch}'
         - integration-gerrit-scm:
             credentials-id: '{ssh-credentials}'
             basedir: 'test'

diff --git a/jjb/integration/integration-test-jobs.yaml b/jjb/integration/integration-test-jobs.yaml
index 0aed4db9ec6eb592517b7c9df3084a9d3c8ddc6e..3b5d47772cb4aa12c7a5f67fe3c7aa2e6a3d81c6 100644 (file)
--- a/jjb/integration/integration-test-jobs.yaml
+++ b/jjb/integration/integration-test-jobs.yaml
@@ -204,7 +204,6 @@
     parameters:
         - project-parameter:
             project: 'integration/test'
-        - integration-distribution-git-url
         - integration-branch:
             branch: 'master'
         - integration-bundleurl:
@@ -219,9 +218,6 @@
             test-plan: 'openflowplugin-flow-services.txt'
 
     scm:
-        - integration-distribution-scm:
-            credentials-id: '{ssh-credentials}'
-            branch: 'master'
         - integration-gerrit-scm:
             credentials-id: '{ssh-credentials}'
             basedir: 'test'
@@ -282,17 +278,11 @@
     parameters:
         - project-parameter:
             project: 'integration/distribution'
-        - integration-distribution-git-url
         - integration-branch:
             branch: '{branch}'
         - integration-bundleurl:
             bundleurl: 'last'
 
-    scm:
-        - integration-distribution-scm:
-            credentials-id: '{ssh-credentials}'
-            branch: '{branch}'
-
     wrappers:
         - build-timeout
         - ssh-agent-credentials: