diff options
| -rw-r--r-- | ci/daily.yaml | 20 | ||||
| -rw-r--r-- | ci/gate.yaml | 56 | ||||
| -rw-r--r-- | ci/globals.yaml | 3 | ||||
| -rw-r--r-- | ci/run.yaml | 39 |
4 files changed, 61 insertions, 57 deletions
diff --git a/ci/daily.yaml b/ci/daily.yaml index ee6afb26d..3d6e99f38 100644 --- a/ci/daily.yaml +++ b/ci/daily.yaml @@ -1,20 +1,20 @@ --- - job-template: - name: '{repo}-{container}-{tag}-pull' + name: '{repo}-functest-{container}-{tag}-pull' builders: - - shell: docker pull {repo}/{container}:{tag} + - shell: docker pull {repo}/functest-{container}:{tag} - project: - name: '{repo}-{container}-{tag}-pull' + name: '{repo}-functest-{container}-{tag}-pull' container: - - functest-healthcheck - - functest-smoke - - functest-components - - functest-vnf - - functest-features - - functest-parser + - healthcheck + - smoke + - components + - vnf + - features + - parser jobs: - - '{repo}-{container}-{tag}-pull' + - '{repo}-functest-{container}-{tag}-pull' - job-template: name: '{repo}-functest-{tag}-pull' diff --git a/ci/gate.yaml b/ci/gate.yaml index a6e38d4da..5501c0248 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,56 +20,56 @@ - ${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-healthcheck - - functest-smoke - - functest-components - - functest-vnf - - functest-features - - functest-parser + - core + - healthcheck + - smoke + - components + - vnf + - features + - parser 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 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 - name: '{repo}-functest-parser-{tag}-build' - <<: *projectparameters + <<: *functest-projectparameters - project: name: '{repo}-functest-{tag}-build' @@ -79,13 +79,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: diff --git a/ci/globals.yaml b/ci/globals.yaml index 6f29606c5..31083e69a 100644 --- a/ci/globals.yaml +++ b/ci/globals.yaml @@ -4,6 +4,9 @@ repo: 'opnfv' branch: 'stable/fraser' tag: 'fraser' + +- defaults: + name: functest-defaults prefix: '/home/opnfv/functest' nameserver: '8.8.8.8' external_network: 'ext-net' 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' |