diff options
| author |   Gary Wu <gary.i.wu@huawei.com> | 2019-05-10 09:20:27 -0700 |
|---|---|---|
| committer | Gary Wu <gary.i.wu@huawei.com> | 2019-05-10 09:20:27 -0700 |
| commit | 844d50370e61ed8498fe2f54bfd9847148c05930 (patch) | |
| tree | 1860a27fc9c3650216812a2e0fd3231c292c372a /jjb | |
| parent | 452d9627d12459dff096f4833ee90036e8f16b35 (diff) | |
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>
Diffstat (limited to 'jjb')
| -rw-r--r-- | jjb/testsuite/testsuite-heatbridge-release.yaml | 17 | ||||
| -rw-r--r-- | jjb/testsuite/testsuite-heatbridge.yaml (renamed from jjb/testsuite/testsuite-heatbridge-master.yaml) | 2 | ||||
| -rw-r--r-- | jjb/testsuite/testsuite.yaml | 8 |
3 files changed, 6 insertions, 21 deletions
diff --git a/jjb/testsuite/testsuite-heatbridge-release.yaml b/jjb/testsuite/testsuite-heatbridge-release.yaml deleted file mode 100644 index cf46f1442..000000000 --- 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 index fd6ec4ccc..20ba913b7 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 d41cc6d51..0b1e6cb14 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' |