Change testsuite to use dublin for all repos
Change testsuite docker job to use specified
branch for all repos instead of a mix of branch
and master.
Also clean up jobs for heatbridge.
Change-Id: Icc1d3aa8703fc6c949e1b7dc243676b1263a5048
Issue-ID: INT-1070
Signed-off-by: Gary Wu <gary.i.wu@huawei.com>
diff --git a/jjb/testsuite/testsuite.yaml b/jjb/testsuite/testsuite.yaml
index d41cc6d..0b1e6cb 100644
--- a/jjb/testsuite/testsuite.yaml
+++ b/jjb/testsuite/testsuite.yaml
@@ -16,13 +16,13 @@
project: 'testsuite'
extra-project1: 'testsuite/python-testing-utils'
- extra-branch1: 'master'
- extra-refspec1: 'refs/heads/master'
+ extra-branch1: '{branch}'
+ extra-refspec1: 'refs/heads/{branch}'
checkout-dir1: 'testsuite/eteutils'
extra-project2: 'testsuite/heatbridge'
- extra-branch2: 'master'
- extra-refspec2: 'refs/heads/master'
+ extra-branch2: '{branch}'
+ extra-refspec2: 'refs/heads/{branch}'
checkout-dir2: 'testsuite/heatbridge'
extra-project3: 'demo'