Allow topic branches to use distribution-check

The current distribution-check job assumes that the gerrit branch is known
to the integration/distribution branch, i.e. a patch on stable/boron
would build a distribution for stable/boron. This fails when using a topic branch
where integration/distribution only has the upstream branches, stable/boron and master.

This patch adds a variable: distribution_branch and sets the default to GERRIT_BRANCH.
For topic branches, they can set distribution_branch in their project.yamls to be
the right branch.

Change-Id: Icb39a2de15d66f3998daa68d3a40b95362029ae6
Signed-off-by: Sam Hague <shague@redhat.com>

diff --git a/jjb/netvirt/netvirt.yaml b/jjb/netvirt/netvirt.yaml
index 6cfc53b1990c68f09b86ab577088e7e13b9be259..39418c895d120a4abe2da998e2f265184cfb8070 100644 (file)
--- a/jjb/netvirt/netvirt.yaml
+++ b/jjb/netvirt/netvirt.yaml
@@ -91,6 +91,7 @@
     project: 'netvirt'
     project-name: 'netvirt'
     branch: 'topic/vpp'
+    distribution_branch: 'master'
     jdk: openjdk8
     jdks:
         - openjdk8

diff --git a/jjb/releng-defaults.yaml b/jjb/releng-defaults.yaml
index 8f68f5ee847d5d0810bd3b603449221d1d1bf1c6..7d57ddc384709e0c4edd954acd925877ff02c532 100644 (file)
--- a/jjb/releng-defaults.yaml
+++ b/jjb/releng-defaults.yaml
@@ -17,6 +17,7 @@
     # openstack-infra-parameters defaults
     archive-artifacts: ''
     branch: master
+    distribution_branch: '$GERRIT_BRANCH'
 
     # Distribution bundle URL
     bundleurl: 'last'

diff --git a/jjb/releng-templates-java.yaml b/jjb/releng-templates-java.yaml
index aa6caa13c92870785d88ee5ea68f53d11d7620cc..16047537cc1532572b96d71ae1394168e8247b26 100644 (file)
--- a/jjb/releng-templates-java.yaml
+++ b/jjb/releng-templates-java.yaml
@@ -94,7 +94,7 @@
             refspec: '$GERRIT_REFSPEC'
             branch: '{branch}'
         - integration-distribution-scm:
-            branch: '{branch}'
+            branch: '{distribution_branch}'
 
     wrappers:
         - opendaylight-infra-wrappers: