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-heatbridge-release.yaml b/jjb/testsuite/testsuite-heatbridge-release.yaml
deleted file mode 100644
index cf46f14..0000000
--- a/jjb/testsuite/testsuite-heatbridge-release.yaml
+++ /dev/null
@@ -1,17 +0,0 @@
----
-- project:
- name: testsuite-heatbridge-release
- project-name: 'testsuite-heatbridge'
- subproject:
- - heatbridge:
- path: '.'
- pattern: '**'
- jobs:
- - '{project-name}-{stream}-{subproject}-verify-python'
-
- project: 'testsuite/heatbridge'
-
- stream:
- - 'release-1.0.0':
- branch: 'release-1.0.0'
- mvn-settings: 'testsuite-heatbridge-settings'
diff --git a/jjb/testsuite/testsuite-heatbridge-master.yaml b/jjb/testsuite/testsuite-heatbridge.yaml
similarity index 95%
rename from jjb/testsuite/testsuite-heatbridge-master.yaml
rename to jjb/testsuite/testsuite-heatbridge.yaml
index fd6ec4c..20ba913 100644
--- a/jjb/testsuite/testsuite-heatbridge-master.yaml
+++ b/jjb/testsuite/testsuite-heatbridge.yaml
@@ -13,6 +13,8 @@
stream:
- 'master':
branch: 'master'
+ - 'dublin':
+ branch: 'dublin'
mvn-settings: 'testsuite-heatbridge-settings'
files: '**'
archive-artifacts: ''
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'