diff options
Diffstat (limited to 'jjb/functest')
-rw-r--r-- | jjb/functest/functest-virtual.yaml | 200 |
1 files changed, 157 insertions, 43 deletions
diff --git a/jjb/functest/functest-virtual.yaml b/jjb/functest/functest-virtual.yaml index c383d7c13..cd65f9643 100644 --- a/jjb/functest/functest-virtual.yaml +++ b/jjb/functest/functest-virtual.yaml @@ -3,9 +3,12 @@ name: 'functest-defaultparameters' repo: opnfv tag: - - gambia - - hunter - - latest + - gambia: + branch: stable/gambia + - hunter: + branch: stable/hunter + - latest: + branch: master - job-template: name: '{repo}-functest-{container}-{tag}-pull' @@ -37,14 +40,6 @@ - name: '{repo}-functest-vnf-{tag}-pull' - name: '{repo}-functest-features-{tag}-pull' -- functest-buildparameters: &functest-buildparameters - name: 'functest-buildparameters' - parameters: - - functest-virtual-defaults - - string: - name: branch - default: master - - job-template: name: '{repo}-functest-{container}-{test}-{tag}-run' parameters: @@ -161,6 +156,7 @@ test: - tempest_full - tempest_scenario + - rally_full jobs: - '{repo}-functest-{container}-{test}-{tag}-run' @@ -169,6 +165,7 @@ projects: - name: '{repo}-functest-components-tempest_full-{tag}-run' - name: '{repo}-functest-components-tempest_scenario-{tag}-run' + # - name: '{repo}-functest-components-rally_full-{tag}-run' - project: name: repo-functest-vnf-{test}-{tag}-run @@ -220,6 +217,15 @@ name: '{repo}-functest-{tag}-daily' <<: *functest-defaultparameters project-type: multijob + triggers: + - timed: '@daily' + properties: + - build-blocker: + use-build-blocker: true + block-level: 'NODE' + queue-scanning: 'BUILDABLE' + blocking-jobs: + - '{repo}-functest-.*-.*' parameters: - functest-virtual-defaults builders: @@ -238,9 +244,9 @@ - multijob: name: components <<: *functest-componentsjobs - - multijob: - name: vnf - <<: *functest-vnfjobs + # - multijob: + # name: vnf + # <<: *functest-vnfjobs - multijob: name: features <<: *functest-featuresjobs @@ -251,32 +257,70 @@ jobs: - '{repo}-functest-{tag}-daily' +- functest-gateparameters: &functest-gateparameters + name: 'functest-gateparameters' + parameters: + - functest-virtual-defaults + +- functest-checkparameters: &functest-checkparameters + name: 'functest-checkparameters' + parameters: + - functest-virtual-defaults + - string: + name: BRANCH + default: '{branch}' + +- builder: + name: build-containers + builders: + - shell: | + case "{container}" in + "components") + args="" ;; + *) + args="--build-arg BRANCH={ref}" ;; + esac + cd docker/{container} + sudo docker build \ + ${{args}} --pull=false --no-cache --force-rm=true \ + -t {repo}/functest-{container}:{tag} . + - scm: - name: functest-gerrit + name: functest-scm scm: - git: url: https://gerrit.opnfv.org/gerrit/functest refspec: '+refs/changes/*:refs/changes/*' branches: - - ${branch} + - '{ref}' + +- functest-buildparameters: &functest-buildparameters + name: 'functest-buildparameters' + container: '{container}' + repo: '{repo}' + tag: '{tag}' - job-template: - name: '{repo}-functest-{container}-{tag}-build' - <<: *functest-buildparameters + name: '{repo}-functest-{container}-{tag}-gate' + <<: *functest-gateparameters scm: - - functest-gerrit + - functest-scm: + ref: $GERRIT_REFSPEC builders: - - shell: | - case "{container}" in - "components") - args="" ;; - *) - args="--build-arg BRANCH=${{branch}}" ;; - esac - cd docker/$(echo {container} |cut -d\- -f 2) - sudo docker build \ - ${{args}} --pull=false --no-cache --force-rm=true \ - -t {repo}/functest-{container}:{tag} . + - build-containers: + ref: $GERRIT_REFSPEC + <<: *functest-buildparameters + +- job-template: + name: '{repo}-functest-{container}-{tag}-check' + <<: *functest-checkparameters + scm: + - functest-scm: + ref: $BRANCH + builders: + - build-containers: + ref: $BRANCH + <<: *functest-buildparameters - project: name: repo-functest-container-tag-build @@ -291,7 +335,8 @@ - vnf - features jobs: - - '{repo}-functest-{container}-{tag}-build' + - '{repo}-functest-{container}-{tag}-gate' + - '{repo}-functest-{container}-{tag}-check' - functest-projectparameters: &functest-projectparameters name: 'functest-projectparameters' @@ -300,32 +345,44 @@ - job-template: name: '{repo}-functest-{tag}-gate' project-type: multijob - <<: *functest-buildparameters + <<: *functest-gateparameters + triggers: + - gerrit-trigger-patchset-created: + project: 'functest' + branch: '{branch}' + files: '**' + properties: + - build-blocker: + use-build-blocker: true + block-level: 'NODE' + queue-scanning: 'BUILDABLE' + blocking-jobs: + - '{repo}-functest-.*-.*' builders: - multijob: name: build functest-core projects: - - name: '{repo}-functest-core-{tag}-build' + - name: '{repo}-functest-core-{tag}-gate' <<: *functest-projectparameters - multijob: name: build functest-tempest projects: - - name: '{repo}-functest-tempest-{tag}-build' + - name: '{repo}-functest-tempest-{tag}-gate' <<: *functest-projectparameters - multijob: name: build all remaining contrainers projects: - - name: '{repo}-functest-healthcheck-{tag}-build' + - name: '{repo}-functest-healthcheck-{tag}-gate' <<: *functest-projectparameters - - name: '{repo}-functest-smoke-{tag}-build' + - name: '{repo}-functest-smoke-{tag}-gate' <<: *functest-projectparameters - - name: '{repo}-functest-benchmarking-{tag}-build' + - name: '{repo}-functest-benchmarking-{tag}-gate' <<: *functest-projectparameters - - name: '{repo}-functest-components-{tag}-build' + - name: '{repo}-functest-components-{tag}-gate' <<: *functest-projectparameters - - name: '{repo}-functest-vnf-{tag}-build' + - name: '{repo}-functest-vnf-{tag}-gate' <<: *functest-projectparameters - - name: '{repo}-functest-features-{tag}-build' + - name: '{repo}-functest-features-{tag}-gate' <<: *functest-projectparameters - multijob: name: healthcheck @@ -339,15 +396,72 @@ - multijob: name: components <<: *functest-componentsjobs + # - multijob: + # name: vnf + # <<: *functest-vnfjobs + - multijob: + name: features + <<: *functest-featuresjobs + +- job-template: + name: '{repo}-functest-{tag}-check' + project-type: multijob + <<: *functest-checkparameters + properties: + - build-blocker: + use-build-blocker: true + block-level: 'NODE' + queue-scanning: 'BUILDABLE' + blocking-jobs: + - '{repo}-functest-.*-.*' + builders: + - multijob: + name: build functest-core + projects: + - name: '{repo}-functest-core-{tag}-check' + <<: *functest-projectparameters + - multijob: + name: build functest-tempest + projects: + - name: '{repo}-functest-tempest-{tag}-check' + <<: *functest-projectparameters + - multijob: + name: build all remaining contrainers + projects: + - name: '{repo}-functest-healthcheck-{tag}-check' + <<: *functest-projectparameters + - name: '{repo}-functest-smoke-{tag}-check' + <<: *functest-projectparameters + - name: '{repo}-functest-benchmarking-{tag}-check' + <<: *functest-projectparameters + - name: '{repo}-functest-components-{tag}-check' + <<: *functest-projectparameters + - name: '{repo}-functest-vnf-{tag}-check' + <<: *functest-projectparameters + - name: '{repo}-functest-features-{tag}-check' + <<: *functest-projectparameters - multijob: - name: vnf - <<: *functest-vnfjobs + name: healthcheck + <<: *functest-healthcheckjobs + - multijob: + name: smoke + <<: *functest-smokejobs + - multijob: + name: benchmarking + <<: *functest-benchmarkingjobs + - multijob: + name: components + <<: *functest-componentsjobs + # - multijob: + # name: vnf + # <<: *functest-vnfjobs - multijob: name: features <<: *functest-featuresjobs - project: - name: repo-functest-tag-gate + name: repo-functest-tag-build <<: *functest-defaultparameters jobs: - '{repo}-functest-{tag}-gate' + - '{repo}-functest-{tag}-check' |