diff options
| -rw-r--r-- | ci/daily.yaml | 18 | ||||
| -rw-r--r-- | ci/gate.yaml | 56 | ||||
| -rw-r--r-- | ci/globals.yaml | 3 | ||||
| -rw-r--r-- | ci/run.yaml | 35 |
4 files changed, 58 insertions, 54 deletions
diff --git a/ci/daily.yaml b/ci/daily.yaml index 8c1dd6830..2ae1b68c2 100644 --- a/ci/daily.yaml +++ b/ci/daily.yaml @@ -1,19 +1,19 @@ --- - 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 + - healthcheck + - smoke + - components + - vnf + - features 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 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: diff --git a/ci/globals.yaml b/ci/globals.yaml index 15a1d89ca..4be1b37a2 100644 --- a/ci/globals.yaml +++ b/ci/globals.yaml @@ -4,6 +4,9 @@ repo: 'opnfv' branch: 'master' tag: 'latest' + +- 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 83d917aa6..558956f6f 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,11 +11,11 @@ {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 - tenantnetwork1 @@ -30,7 +31,7 @@ - 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' @@ -59,8 +60,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: - tempest_smoke - neutron-tempest-plugin-api @@ -75,7 +76,7 @@ - networking-sfc - barbican jobs: - - '{repo}-{container}-{test}-{tag}-run' + - '{repo}-functest-{container}-{test}-{tag}-run' - job-template: name: '{repo}-functest-smoke-{tag}-run' @@ -103,14 +104,14 @@ - '{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 - tempest_scenario - rally_full jobs: - - '{repo}-{container}-{test}-{tag}-run' + - '{repo}-functest-{container}-{test}-{tag}-run' - job-template: name: '{repo}-functest-components-{tag}-run' @@ -129,8 +130,8 @@ - '{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 - cloudify_ims @@ -138,7 +139,7 @@ - vyos_vrouter - juju_epc jobs: - - '{repo}-{container}-{test}-{tag}-run' + - '{repo}-functest-{container}-{test}-{tag}-run' - job-template: name: '{repo}-functest-vnf-{tag}-run' @@ -159,8 +160,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 @@ -170,7 +171,7 @@ - vgpu - stor4nfv_os jobs: - - '{repo}-{container}-{test}-{tag}-run' + - '{repo}-functest-{container}-{test}-{tag}-run' - job-template: name: '{repo}-functest-features-{tag}-run' |