diff options
author | Cédric Ollivier <cedric.ollivier@orange.com> | 2018-08-26 11:30:11 +0200 |
---|---|---|
committer | Cédric Ollivier <cedric.ollivier@orange.com> | 2018-08-27 21:11:38 +0200 |
commit | 8d896c9529c7711b86cdc963b26a14c22688f12e (patch) | |
tree | 99868dd55185463f27bca975d06c3e8e6c994dfe /ci/run.yaml | |
parent | 0ca6df5099fd237ebd21cec31ff6db0733e0ac95 (diff) |
Avoid duplicating jjb names
It allows loading functest and functest-kubernetes jjbs in one
Jenkins.
Change-Id: Ia52e84583bc25aad0d1508096b536cbd5585d261
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
(cherry picked from commit 890bc75c29ef98fe2eb0dd8e456ad6eafa9d26a1)
Diffstat (limited to 'ci/run.yaml')
-rw-r--r-- | ci/run.yaml | 39 |
1 files changed, 20 insertions, 19 deletions
diff --git a/ci/run.yaml b/ci/run.yaml index 58b3436b3..dffd2bbc9 100644 --- a/ci/run.yaml +++ b/ci/run.yaml @@ -1,6 +1,7 @@ --- - job-template: - name: '{repo}-{container}-{test}-{tag}-run' + name: '{repo}-functest-{container}-{test}-{tag}-run' + defaults: 'functest-defaults' builders: - shell: | docker run \ @@ -10,17 +11,17 @@ {prefix}/results/$JOB_NAME-$BUILD_ID:/home/opnfv/functest/results \ -v {prefix}/openstack.creds:/home/opnfv/functest/conf/env_file \ -v {prefix}/images:/home/opnfv/functest/images \ - {repo}/{container}:{tag} run_tests -t {test} + {repo}/functest-{container}:{tag} run_tests -t {test} - project: - name: '{repo}-healthcheck-{test}-{tag}-run' - container: functest-healthcheck + name: '{repo}-functest-healthcheck-{test}-{tag}-run' + container: healthcheck test: - connection_check - api_check - snaps_health_check jobs: - - '{repo}-{container}-{test}-{tag}-run' + - '{repo}-functest-{container}-{test}-{tag}-run' - job-template: name: '{repo}-functest-healthcheck-{tag}-run' @@ -39,8 +40,8 @@ - '{repo}-functest-healthcheck-{tag}-run' - project: - name: '{repo}-smoke-{test}-{tag}-run' - container: functest-smoke + name: '{repo}-functest-smoke-{test}-{tag}-run' + container: smoke test: - vping_ssh - vping_userdata @@ -52,7 +53,7 @@ - snaps_smoke - neutron_trunk jobs: - - '{repo}-{container}-{test}-{tag}-run' + - '{repo}-functest-{container}-{test}-{tag}-run' - job-template: name: '{repo}-functest-smoke-{tag}-run' @@ -77,13 +78,13 @@ - '{repo}-functest-smoke-{tag}-run' - project: - name: '{repo}-components-{test}-{tag}-run' - container: functest-components + name: '{repo}-functest-components-{test}-{tag}-run' + container: components test: - tempest_full_parallel - rally_full jobs: - - '{repo}-{container}-{test}-{tag}-run' + - '{repo}-functest-{container}-{test}-{tag}-run' - job-template: name: '{repo}-functest-components-{tag}-run' @@ -101,14 +102,14 @@ - '{repo}-functest-components-{tag}-run' - project: - name: '{repo}-vnf-{test}-{tag}-run' - container: functest-vnf + name: '{repo}-functest-vnf-{test}-{tag}-run' + container: vnf test: - cloudify_ims - vyos_vrouter - juju_epc jobs: - - '{repo}-{container}-{test}-{tag}-run' + - '{repo}-functest-{container}-{test}-{tag}-run' - job-template: name: '{repo}-functest-vnf-{tag}-run' @@ -127,8 +128,8 @@ - '{repo}-functest-vnf-{tag}-run' - project: - name: '{repo}-features-{test}-{tag}-run' - container: functest-features + name: '{repo}-functest-features-{test}-{tag}-run' + container: features test: - doctor-notification - bgpvpn @@ -136,7 +137,7 @@ - barometercollectd - fds jobs: - - '{repo}-{container}-{test}-{tag}-run' + - '{repo}-functest-{container}-{test}-{tag}-run' - job-template: name: '{repo}-functest-features-{tag}-run' @@ -158,11 +159,11 @@ - project: name: '{repo}-parser-{test}-{tag}-run' - container: functest-parser + container: parser test: - parser-basics jobs: - - '{repo}-{container}-{test}-{tag}-run' + - '{repo}-functest-{container}-{test}-{tag}-run' - job-template: name: '{repo}-functest-parser-{tag}-run' |