diff options
| author |   Cédric Ollivier <cedric.ollivier@orange.com> | 2018-09-02 12:20:26 +0200 |
|---|---|---|
| committer | Cédric Ollivier <cedric.ollivier@orange.com> | 2018-09-02 18:10:51 +0200 |
| commit | 8f8f600106c038138845b3ddc527aebc9055f4a8 (patch) | |
| tree | 5a987f558dc26932cc609d350c2c48d6571554da /ci | |
| parent | 4151722a50e5cd821113183bf4a88d1e8c0ee877 (diff) | |
Move shaker and vmtp into functest-benchmarking
It also updates all jobs and fixes Dockerhub hooks.
Change-Id: Ib182155736b4dbdb829293081741a9d5cb8ea6d7
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
Diffstat (limited to 'ci')
| -rw-r--r-- | ci/daily.yaml | 3 | ||||
| -rw-r--r-- | ci/gate.yaml | 4 | ||||
| -rw-r--r-- | ci/run.yaml | 28 |
3 files changed, 31 insertions, 4 deletions
diff --git a/ci/daily.yaml b/ci/daily.yaml index 2ae1b68c2..89b404f77 100644 --- a/ci/daily.yaml +++ b/ci/daily.yaml @@ -9,6 +9,7 @@ container: - healthcheck - smoke + - benchmarking - components - vnf - features @@ -24,6 +25,7 @@ projects: - name: '{repo}-functest-healthcheck-{tag}-pull' - name: '{repo}-functest-smoke-{tag}-pull' + - name: '{repo}-functest-benchmarking-{tag}-pull' - name: '{repo}-functest-components-{tag}-pull' - name: '{repo}-functest-vnf-{tag}-pull' - name: '{repo}-functest-features-{tag}-pull' @@ -49,6 +51,7 @@ name: advanced tests projects: - name: '{repo}-functest-smoke-{tag}-run' + - name: '{repo}-functest-benchmarking-{tag}-run' - name: '{repo}-functest-components-{tag}-run' - name: '{repo}-functest-vnf-{tag}-run' - name: '{repo}-functest-features-{tag}-run' diff --git a/ci/gate.yaml b/ci/gate.yaml index ea0c76e09..1abfc67ac 100644 --- a/ci/gate.yaml +++ b/ci/gate.yaml @@ -39,6 +39,7 @@ - tempest - healthcheck - smoke + - benchmarking - components - vnf - features @@ -67,6 +68,8 @@ <<: *functest-projectparameters - name: '{repo}-functest-smoke-{tag}-build' <<: *functest-projectparameters + - name: '{repo}-functest-benchmarking-{tag}-build' + <<: *functest-projectparameters - name: '{repo}-functest-components-{tag}-build' <<: *functest-projectparameters - name: '{repo}-functest-vnf-{tag}-build' @@ -97,6 +100,7 @@ name: advanced tests projects: - name: '{repo}-functest-smoke-{tag}-run' + - name: '{repo}-functest-benchmarking-{tag}-run' - name: '{repo}-functest-components-{tag}-run' - name: '{repo}-functest-vnf-{tag}-run' - name: '{repo}-functest-features-{tag}-run' diff --git a/ci/run.yaml b/ci/run.yaml index 558956f6f..9cc374c0c 100644 --- a/ci/run.yaml +++ b/ci/run.yaml @@ -68,8 +68,6 @@ - rally_sanity - refstack_defcore - patrole - - vmtp - - shaker - snaps_smoke - neutron_trunk - networking-bgpvpn @@ -90,8 +88,6 @@ - name: '{repo}-functest-smoke-rally_sanity-{tag}-run' - name: '{repo}-functest-smoke-refstack_defcore-{tag}-run' - name: '{repo}-functest-smoke-patrole-{tag}-run' - - name: '{repo}-functest-smoke-vmtp-{tag}-run' - - name: '{repo}-functest-smoke-shaker-{tag}-run' - name: '{repo}-functest-smoke-snaps_smoke-{tag}-run' - name: '{repo}-functest-smoke-neutron_trunk-{tag}-run' - name: '{repo}-functest-smoke-networking-bgpvpn-{tag}-run' @@ -104,6 +100,30 @@ - '{repo}-functest-smoke-{tag}-run' - project: + name: '{repo}-functest-benchmarking-{test}-{tag}-run' + container: benchmarking + test: + - vmtp + - shaker + jobs: + - '{repo}-functest-{container}-{test}-{tag}-run' + +- job-template: + name: '{repo}-functest-benchmarking-{tag}-run' + project-type: multijob + builders: + - multijob: + name: smoke + projects: + - name: '{repo}-functest-benchmarking-vmtp-{tag}-run' + - name: '{repo}-functest-benchmarking-shaker-{tag}-run' + +- project: + name: '{repo}-functest-benchmarking-{tag}-run' + jobs: + - '{repo}-functest-benchmarking-{tag}-run' + +- project: name: '{repo}-functest-components-{test}-{tag}-run' container: components test: |