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-26 14:50:32 +0200 |
| commit | 890bc75c29ef98fe2eb0dd8e456ad6eafa9d26a1 (patch) | |
| tree | 8bf915e8cac575fbc12418f51e4e811110e36044 /ci/gate.yaml | |
| parent | 381a70d86ce49bd55b298042dc11cb16f9710d82 (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>
Diffstat (limited to 'ci/gate.yaml')
| -rw-r--r-- | ci/gate.yaml | 56 |
1 files changed, 28 insertions, 28 deletions
diff --git a/ci/gate.yaml b/ci/gate.yaml index 278ecb778..ea0c76e09 100644 --- a/ci/gate.yaml +++ b/ci/gate.yaml @@ -1,17 +1,17 @@ --- -- buildparameters: &buildparameters - name: 'buildparameters' +- functest-buildparameters: &functest-buildparameters + name: 'functest-buildparameters' parameters: - string: name: branch default: '{branch}' -- projectparameters: &projectparameters - name: 'projectparameters' +- functest-projectparameters: &functest-projectparameters + name: 'functest-projectparameters' current-parameters: true - scm: - name: gerrit + name: functest-gerrit scm: - git: url: https://gerrit.opnfv.org/gerrit/functest @@ -20,59 +20,59 @@ - ${branch} - job-template: - name: '{repo}-{container}-{tag}-build' - <<: *buildparameters + name: '{repo}-functest-{container}-{tag}-build' + <<: *functest-buildparameters scm: - - gerrit + - functest-gerrit builders: - shell: | cd docker/$(echo {container} |cut -d\- -f 2) docker build \ --pull=false --no-cache --force-rm=true \ --build-arg BRANCH=${{branch}} \ - -t {repo}/{container}:{tag} . + -t {repo}/functest-{container}:{tag} . - project: - name: '{repo}-{container}-{tag}-build' + name: '{repo}-functest-{container}-{tag}-build' container: - - functest-core - - functest-tempest - - functest-healthcheck - - functest-smoke - - functest-components - - functest-vnf - - functest-features + - core + - tempest + - healthcheck + - smoke + - components + - vnf + - features jobs: - - '{repo}-{container}-{tag}-build' + - '{repo}-functest-{container}-{tag}-build' - job-template: name: '{repo}-functest-{tag}-build' project-type: multijob - <<: *buildparameters + <<: *functest-buildparameters builders: - multijob: name: build functest-core projects: - name: '{repo}-functest-core-{tag}-build' - <<: *projectparameters + <<: *functest-projectparameters - multijob: name: build functest-tempest projects: - name: '{repo}-functest-tempest-{tag}-build' - <<: *projectparameters + <<: *functest-projectparameters - multijob: name: build all remaining contrainers projects: - name: '{repo}-functest-healthcheck-{tag}-build' - <<: *projectparameters + <<: *functest-projectparameters - name: '{repo}-functest-smoke-{tag}-build' - <<: *projectparameters + <<: *functest-projectparameters - name: '{repo}-functest-components-{tag}-build' - <<: *projectparameters + <<: *functest-projectparameters - name: '{repo}-functest-vnf-{tag}-build' - <<: *projectparameters + <<: *functest-projectparameters - name: '{repo}-functest-features-{tag}-build' - <<: *projectparameters + <<: *functest-projectparameters - project: name: '{repo}-functest-{tag}-build' @@ -82,13 +82,13 @@ - job-template: name: '{repo}-functest-{tag}-gate' project-type: multijob - <<: *buildparameters + <<: *functest-buildparameters builders: - multijob: name: build containers projects: - name: '{repo}-functest-{tag}-build' - <<: *projectparameters + <<: *functest-projectparameters - multijob: name: basics tests projects: |