diff options
Diffstat (limited to 'jjb/functest')
| -rw-r--r-- | jjb/functest/functest-docker.yaml | 24 | ||||
| -rw-r--r-- | jjb/functest/functest-kubernetes-project-jobs.yaml | 203 | ||||
| -rw-r--r-- | jjb/functest/functest-kubernetes.yaml | 15 | ||||
| -rw-r--r-- | jjb/functest/functest-project-jobs.yaml | 197 | ||||
| -rw-r--r-- | jjb/functest/functest-rtd-jobs.yaml | 24 | ||||
| -rw-r--r-- | jjb/functest/functest.yaml | 191 | ||||
| -rw-r--r-- | jjb/functest/xtesting-project-jobs.yaml | 203 | ||||
| -rw-r--r-- | jjb/functest/xtesting.yaml | 15 |
8 files changed, 384 insertions, 488 deletions
diff --git a/jjb/functest/functest-docker.yaml b/jjb/functest/functest-docker.yaml index 686c009ac..a0741f1ee 100644 --- a/jjb/functest/functest-docker.yaml +++ b/jjb/functest/functest-docker.yaml @@ -36,6 +36,8 @@ - 'smoke' - 'benchmarking' - 'vnf' + - 'smoke-cntt' + - 'benchmarking-cntt' exclude: - stream: 'master' @@ -165,6 +167,28 @@ <<: *manifest-job-settings - name: 'functest-vnf-docker-manifest-{stream}' <<: *manifest-job-settings + - multijob: + name: 'build all functest cntt images' + condition: SUCCESSFUL + execution-type: PARALLEL + projects: + - name: 'functest-smoke-cntt-docker-build-amd64-{stream}' + <<: *build-job-settings + - name: 'functest-smoke-cntt-docker-build-arm64-{stream}' + <<: *build-job-settings + - name: 'functest-benchmarking-cntt-docker-build-amd64-{stream}' + <<: *build-job-settings + - name: 'functest-benchmarking-cntt-docker-build-arm64-{stream}' + <<: *build-job-settings + - multijob: + name: 'publish all cntt manifests' + condition: SUCCESSFUL + execution-type: PARALLEL + projects: + - name: 'functest-smoke-cntt-docker-manifest-{stream}' + <<: *manifest-job-settings + - name: 'functest-benchmarking-cntt-docker-manifest-{stream}' + <<: *manifest-job-settings publishers: - 'functest-amd64-recipients' diff --git a/jjb/functest/functest-kubernetes-project-jobs.yaml b/jjb/functest/functest-kubernetes-project-jobs.yaml index 82998f059..2e1a410e2 100644 --- a/jjb/functest/functest-kubernetes-project-jobs.yaml +++ b/jjb/functest/functest-kubernetes-project-jobs.yaml @@ -1,167 +1,80 @@ --- -################################################### -# All the jobs except verify have been removed! -# They will only be enabled on request by projects! -################################################### -- project: - name: functest-kubernetes-project-jobs - - project: 'functest-kubernetes' - - jobs: - - 'functest-kubernetes-verify-{stream}' - - 'functest-kubernetes-verify-{phase}-{stream}' - - stream: - - master: - branch: '{stream}' - gs-pathname: '' - disabled: false - - jerma: &jerma - branch: '{stream}' - gs-pathname: '' - disabled: false - - iruya: &iruya - branch: 'stable/{stream}' - gs-pathname: '/{stream}' - disabled: false - - hunter: &hunter - branch: 'stable/{stream}' - gs-pathname: '/{stream}' - disabled: false - - phase: - - 'unit-tests-and-docs': - slave-label: 'lf-virtual1' - -- job-template: - name: 'functest-kubernetes-verify-{stream}' - - disabled: '{obj:disabled}' - - project-type: 'multijob' - - parameters: - - project-parameter: - project: '{project}' - branch: '{branch}' - - 'opnfv-build-ubuntu-defaults' - - scm: - - git-scm-gerrit - - triggers: - - 'functest-kubernetes-verify-triggers-macro': - project: '{project}' - branch: '{branch}' - - builders: - - shell: | - #!/bin/bash - # we do nothing here as the main stuff will be done - # in phase jobs - echo "Triggering phase jobs!" - - multijob: - name: 'functest-kubernetes-build-and-unittest' - execution-type: PARALLEL - projects: - - name: 'functest-kubernetes-verify-unit-tests-and-docs-{stream}' - current-parameters: false - predefined-parameters: | - GERRIT_BRANCH=$GERRIT_BRANCH - GERRIT_REFSPEC=$GERRIT_REFSPEC - GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER - GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE - git-revision: true - node-parameters: false - kill-phase-on: FAILURE - abort-all-job: false - -- job-template: - name: 'functest-kubernetes-verify-{phase}-{stream}' - - disabled: '{obj:disabled}' - - wrappers: - - ssh-agent-wrapper - - build-timeout: - timeout: 30 - - parameters: - - project-parameter: - project: '{project}' - branch: '{branch}' - - '{slave-label}-defaults' - - scm: - - git-scm-gerrit +- functest-kubernetes-project-params: &functest-kubernetes-project-params + name: 'functest-kubernetes-project-params' + tag: + - latest: + branch: master + slave: lf-virtual1 + - jerma: + branch: stable/jerma + slave: lf-virtual1 + - iruya: + branch: stable/iruya + slave: lf-virtual1 + - hunter: + branch: stable/hunter + slave: lf-virtual1 +- builder: + name: functest-kubernetes-run-tox builders: - - 'functest-kubernetes-verify-{phase}-builders-macro' - - publishers: - - 'functest-kubernetes-verify-{phase}-publishers-macro' + - shell: tox -################################ -# job triggers -################################ - trigger: - name: 'functest-kubernetes-verify-triggers-macro' + name: functest-kubernetes-project-patchset-created triggers: - gerrit: server-name: 'gerrit.opnfv.org' trigger-on: - - patchset-created-event: - exclude-drafts: 'false' - exclude-trivial-rebase: 'false' - exclude-no-code-change: 'false' - - draft-published-event + - patchset-created-event - comment-added-contains-event: comment-contains-value: 'recheck' - comment-added-contains-event: comment-contains-value: 'reverify' projects: - project-compare-type: 'ANT' - project-pattern: '{project}' + project-pattern: 'functest-kubernetes' branches: - branch-compare-type: 'ANT' branch-pattern: '**/{branch}' - disable-strict-forbidden-file-verification: 'true' - forbidden-file-paths: - - compare-type: ANT - pattern: 'docs/**|.gitignore' + skip-vote: + successful: false + failed: false + unstable: false + notbuilt: false + +- parameter: + name: functest-kubernetes-project-slave + parameters: + - label: + name: slave + default: '{slave}' -################################ -# job builders -################################ +- scm: + name: functest-kubernetes-project-scm + scm: + - git: + url: https://gerrit.opnfv.org/gerrit/functest-kubernetes + refspec: '+refs/changes/*:refs/changes/*' + branches: + - '{ref}' -- builder: - name: 'functest-kubernetes-verify-unit-tests-and-docs-builders-macro' +- job-template: + name: 'functest-kubernetes-run-tox-{tag}' + triggers: + - functest-kubernetes-project-patchset-created: + branch: '{branch}' + scm: + - functest-kubernetes-project-scm: + ref: $GERRIT_REFSPEC + parameters: + - functest-kubernetes-project-slave: + slave: '{slave}' builders: - - shell: | - cd $WORKSPACE && tox + - functest-kubernetes-run-tox -################################ -# job publishers -################################ -- publisher: - name: 'functest-kubernetes-verify-unit-tests-and-docs-publishers-macro' - publishers: - - junit: - results: nosetests.xml - - cobertura: - report-file: "coverage.xml" - only-stable: "true" - health-auto-update: "true" - stability-auto-update: "true" - zoom-coverage-chart: "true" - targets: - - files: - healthy: 10 - unhealthy: 20 - failing: 30 - - method: - healthy: 50 - unhealthy: 40 - failing: 30 - - email-jenkins-admins-on-failure +- project: + name: 'functest-kubernetes-run-tox' + <<: *functest-kubernetes-project-params + jobs: + - 'functest-kubernetes-run-tox-{tag}' diff --git a/jjb/functest/functest-kubernetes.yaml b/jjb/functest/functest-kubernetes.yaml index 484d5f9d0..12c9c26a1 100644 --- a/jjb/functest/functest-kubernetes.yaml +++ b/jjb/functest/functest-kubernetes.yaml @@ -13,7 +13,7 @@ slave: lf-virtual8 - jerma: branch: stable/jerma - slave: lf-virtual7 + slave: lf-virtual8 - iruya: branch: stable/iruya slave: lf-virtual7 @@ -103,17 +103,14 @@ image={repo}:{port}/{container}:{tag} fi docker run --rm \ + -e S3_ENDPOINT_URL=https://storage.googleapis.com \ + -e S3_DST_URL=s3://artifacts.opnfv.org/functest-kubernetes/$JOB_NAME-$BUILD_ID \ + -e HTTP_DST_URL=http://artifacts.opnfv.org/functest-kubernetes/$JOB_NAME-$BUILD_ID \ -v $WORKSPACE/../$JOB_NAME/results:/var/lib/xtesting/results \ -e DEPLOY_SCENARIO=k8-nosdn-nofeature-noha \ -v /home/opnfv/functest-kubernetes/config.{tag}:/root/.kube/config \ - $image run_tests -t {test} - res=$? - gsutil -m cp -r $WORKSPACE/ \ - gs://artifacts.opnfv.org/functest-kubernetes/$JOB_NAME-$BUILD_ID > /dev/null 2>&1 - find $WORKSPACE -type f \ - -printf \ - "http://artifacts.opnfv.org/functest-kubernetes/$JOB_NAME-$BUILD_ID/%P\n" - exit $res + -v /home/opnfv/functest-kubernetes/.boto:/root/.boto \ + $image run_tests -t {test} -p - builder: name: functest-kubernetes-remove-images diff --git a/jjb/functest/functest-project-jobs.yaml b/jjb/functest/functest-project-jobs.yaml index d50b1a531..0a836441b 100644 --- a/jjb/functest/functest-project-jobs.yaml +++ b/jjb/functest/functest-project-jobs.yaml @@ -1,167 +1,80 @@ --- -################################################### -# All the jobs except verify have been removed! -# They will only be enabled on request by projects! -################################################### -- project: - name: functest-project-jobs - - project: 'functest' - - jobs: - - 'functest-verify-{stream}' - - 'functest-verify-{phase}-{stream}' - - stream: - - master: - branch: '{stream}' - gs-pathname: '' - disabled: false +- functest-project-params: &functest-project-params + name: 'functest-project-params' + tag: + - latest: + branch: master + slave: lf-virtual9 - jerma: - branch: 'stable/{stream}' - gs-pathname: '' - disabled: false + branch: stable/jerma + slave: lf-virtual4 - iruya: - branch: 'stable/{stream}' - gs-pathname: '' - disabled: false + branch: stable/iruya + slave: lf-virtual4 - hunter: - branch: 'stable/{stream}' - gs-pathname: '' - disabled: false - - phase: - - 'unit-tests-and-docs': - slave-label: 'lf-virtual1' - -- job-template: - name: 'functest-verify-{stream}' - - disabled: '{obj:disabled}' - - project-type: 'multijob' - - parameters: - - project-parameter: - project: '{project}' - branch: '{branch}' - - 'opnfv-build-ubuntu-defaults' - - scm: - - git-scm-gerrit - - triggers: - - 'functest-verify-triggers-macro': - project: '{project}' - branch: '{branch}' - - builders: - - shell: | - #!/bin/bash - # we do nothing here as the main stuff will be done - # in phase jobs - echo "Triggering phase jobs!" - - multijob: - name: 'functest-build-and-unittest' - execution-type: PARALLEL - projects: - - name: 'functest-verify-unit-tests-and-docs-{stream}' - current-parameters: false - predefined-parameters: | - GERRIT_BRANCH=$GERRIT_BRANCH - GERRIT_REFSPEC=$GERRIT_REFSPEC - GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER - GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE - git-revision: true - node-parameters: false - kill-phase-on: FAILURE - abort-all-job: false - -- job-template: - name: 'functest-verify-{phase}-{stream}' - - disabled: '{obj:disabled}' - - wrappers: - - ssh-agent-wrapper - - build-timeout: - timeout: 60 - - parameters: - - project-parameter: - project: '{project}' - branch: '{branch}' - - '{slave-label}-defaults' - - scm: - - git-scm-gerrit + branch: stable/hunter + slave: lf-virtual6 +- builder: + name: functest-run-tox builders: - - 'functest-verify-{phase}-builders-macro' - - publishers: - - 'functest-verify-{phase}-publishers-macro' + - shell: tox -################################ -# job triggers -################################ - trigger: - name: 'functest-verify-triggers-macro' + name: functest-project-patchset-created triggers: - gerrit: server-name: 'gerrit.opnfv.org' trigger-on: - - patchset-created-event: - exclude-drafts: 'false' - exclude-trivial-rebase: 'false' - exclude-no-code-change: 'false' - - draft-published-event + - patchset-created-event - comment-added-contains-event: comment-contains-value: 'recheck' - comment-added-contains-event: comment-contains-value: 'reverify' projects: - project-compare-type: 'ANT' - project-pattern: '{project}' + project-pattern: 'functest' branches: - branch-compare-type: 'ANT' branch-pattern: '**/{branch}' - disable-strict-forbidden-file-verification: 'true' - forbidden-file-paths: - - compare-type: ANT - pattern: 'docs/**|.gitignore' + skip-vote: + successful: false + failed: false + unstable: false + notbuilt: false + +- parameter: + name: functest-project-slave + parameters: + - label: + name: slave + default: '{slave}' -################################ -# job builders -################################ +- scm: + name: functest-project-scm + scm: + - git: + url: https://gerrit.opnfv.org/gerrit/functest + refspec: '+refs/changes/*:refs/changes/*' + branches: + - '{ref}' -- builder: - name: 'functest-verify-unit-tests-and-docs-builders-macro' +- job-template: + name: 'functest-run-tox-{tag}' + triggers: + - functest-project-patchset-created: + branch: '{branch}' + scm: + - functest-project-scm: + ref: $GERRIT_REFSPEC + parameters: + - functest-project-slave: + slave: '{slave}' builders: - - shell: | - cd $WORKSPACE && tox + - functest-run-tox -################################ -# job publishers -################################ -- publisher: - name: 'functest-verify-unit-tests-and-docs-publishers-macro' - publishers: - - junit: - results: nosetests.xml - - cobertura: - report-file: "coverage.xml" - only-stable: "true" - health-auto-update: "true" - stability-auto-update: "true" - zoom-coverage-chart: "true" - targets: - - files: - healthy: 10 - unhealthy: 20 - failing: 30 - - method: - healthy: 50 - unhealthy: 40 - failing: 30 - - email-jenkins-admins-on-failure +- project: + name: 'functest-run-tox' + <<: *functest-project-params + jobs: + - 'functest-run-tox-{tag}' diff --git a/jjb/functest/functest-rtd-jobs.yaml b/jjb/functest/functest-rtd-jobs.yaml deleted file mode 100644 index 8d20dd20e..000000000 --- a/jjb/functest/functest-rtd-jobs.yaml +++ /dev/null @@ -1,24 +0,0 @@ ---- -- project: - name: functest-rtd - project: functest - project-name: functest - - gerrit-skip-vote: true - project-pattern: 'functest' - rtd-build-url: 'https://readthedocs.org/api/v2/webhook/opnfv-functest/47369/' - rtd-token: '26f9131bd5c337928ba8b431a289f6850b330504' - - stream: - - master: - branch: '{stream}' - disabled: false - - iruya: - branch: 'stable/{stream}' - disabled: false - - hunter: - branch: 'stable/{stream}' - disabled: false - - jobs: - - '{project-name}-rtd-jobs' diff --git a/jjb/functest/functest.yaml b/jjb/functest/functest.yaml index fc0718a9c..feb672c40 100644 --- a/jjb/functest/functest.yaml +++ b/jjb/functest/functest.yaml @@ -11,15 +11,19 @@ - latest: branch: master slave: lf-virtual9 + dashboard_url: http://172.30.13.94 - jerma: branch: stable/jerma slave: lf-virtual4 + dashboard_url: http://172.30.13.89 - iruya: branch: stable/iruya slave: lf-virtual4 + dashboard_url: http://172.30.13.89 - hunter: branch: stable/hunter slave: lf-virtual6 + dashboard_url: http://172.30.13.91 - parameter: name: functest-slave @@ -35,6 +39,20 @@ name: branch default: '{branch}' +- parameter: + name: functest-DEBUG + parameters: + - string: + name: DEBUG + default: 'true' + +- parameter: + name: functest-EXTERNAL_NETWORK + parameters: + - string: + name: EXTERNAL_NETWORK + default: public + - functest-containers: &functest-containers name: 'functest-containers' repo: '{repo}' @@ -43,9 +61,10 @@ tag: '{tag}' - functest-run-containers: &functest-run-containers - name: 'functest-build-containers' + name: 'functest-run-containers' <<: *functest-containers test: '{test}' + dashboard_url: '{dashboard_url}' - functest-build-containers: &functest-build-containers name: 'functest-build-containers' @@ -93,7 +112,7 @@ name: functest-run-containers builders: - shell: | - set +ex + set +x [ ! -z "$WORKSPACE" ] && sudo rm -rf $WORKSPACE/* || true if [ "{repo}" = "_" ]; then image={container}:{tag} @@ -112,9 +131,13 @@ py=2.7 fi sudo docker run --rm \ + -e S3_ENDPOINT_URL=https://storage.googleapis.com \ + -e S3_DST_URL=s3://artifacts.opnfv.org/functest/$JOB_NAME-$BUILD_ID \ + -e HTTP_DST_URL=http://artifacts.opnfv.org/functest/$JOB_NAME-$BUILD_ID \ -v $WORKSPACE/../$JOB_NAME/results:/var/lib/xtesting/results \ - -e DEBUG=True \ - -e EXTERNAL_NETWORK=public \ + -e DEBUG=$DEBUG \ + -e EXTERNAL_NETWORK=$EXTERNAL_NETWORK \ + -e DASHBOARD_URL={dashboard_url} \ -v /home/opnfv/functest/openstack.creds:/home/opnfv/functest/conf/env_file \ -v /home/opnfv/functest/images:/home/opnfv/functest/images \ -v /home/opnfv/functest/tempest_blacklist.yaml:/usr/lib/python$py/\ @@ -122,14 +145,8 @@ blacklist.yaml \ -v /home/opnfv/functest/blacklist.yaml:/usr/lib/python$py/\ site-packages/functest/opnfv_tests/openstack/rally/blacklist.yaml \ - $image run_tests -t {test} - res=$? - gsutil -m cp -r $WORKSPACE/ \ - gs://artifacts.opnfv.org/functest/$JOB_NAME-$BUILD_ID > /dev/null 2>&1 - find $WORKSPACE -type f \ - -printf \ - "http://artifacts.opnfv.org/functest/$JOB_NAME-$BUILD_ID/%P\n" - exit $res + -v /home/opnfv/functest/.boto:/root/.boto \ + $image run_tests -t {test} -p - builder: name: functest-remove-images @@ -178,6 +195,13 @@ - 'functest-{repo}-{container}-{tag}-pull' - project: + name: 'functest-opnfv-functest-smoke-cntt-pull' + <<: *functest-params + container: 'functest-smoke-cntt' + jobs: + - 'functest-{repo}-{container}-{tag}-pull' + +- project: name: 'functest-opnfv-functest-benchmarking-pull' <<: *functest-params container: 'functest-benchmarking' @@ -215,6 +239,13 @@ - 'functest-{repo}-{container}-{tag}-rmi' - project: + name: 'functest-opnfv-functest-smoke-cntt-rmi' + <<: *functest-params + container: 'functest-smoke-cntt' + jobs: + - 'functest-{repo}-{container}-{tag}-rmi' + +- project: name: 'functest-opnfv-functest-benchmarking-rmi' <<: *functest-params container: 'functest-benchmarking' @@ -233,6 +264,10 @@ parameters: - functest-slave: slave: '{slave}' + - functest-DEBUG: + DEBUG: 'true' + - functest-EXTERNAL_NETWORK: + EXTERNAL_NETWORK: public builders: - functest-run-containers: <<: *functest-run-containers @@ -254,6 +289,10 @@ - cinder_test - odl - tempest_smoke + - tempest_horizon + exclude: + - tag: hunter + test: tempest_horizon jobs: - 'functest-{repo}-{container}-{tag}-{test}-run' @@ -263,6 +302,8 @@ container: 'functest-smoke' test: - neutron-tempest-plugin-api + - tempest_cinder + - tempest_keystone - rally_sanity - refstack_defcore - refstack_compute @@ -293,13 +334,26 @@ - tag: hunter test: refstack_platform - tag: hunter - test: tempest_slow - - tag: hunter test: octavia jobs: - 'functest-{repo}-{container}-{tag}-{test}-run' - project: + name: 'functest-opnfv-functest-smoke-cntt' + <<: *functest-params + container: 'functest-smoke-cntt' + test: + - neutron-tempest-plugin-api + - tempest_cinder + - tempest_keystone + - rally_sanity + - tempest_full + - tempest_scenario + - tempest_slow + jobs: + - 'functest-{repo}-{container}-{tag}-{test}-run' + +- project: name: 'functest-opnfv-functest-benchmarking' <<: *functest-params container: 'functest-benchmarking' @@ -332,6 +386,10 @@ parameters: - functest-slave: slave: '{slave}' + - functest-DEBUG: + DEBUG: 'true' + - functest-EXTERNAL_NETWORK: + EXTERNAL_NETWORK: public properties: - build-blocker: use-build-blocker: true @@ -346,6 +404,8 @@ <<: *functest-jobs - name: 'functest-opnfv-functest-smoke-{tag}-rmi' <<: *functest-jobs + - name: 'functest-opnfv-functest-smoke-cntt-{tag}-rmi' + <<: *functest-jobs - name: 'functest-opnfv-functest-benchmarking-{tag}-rmi' <<: *functest-jobs - name: 'functest-opnfv-functest-vnf-{tag}-rmi' @@ -357,6 +417,8 @@ <<: *functest-jobs - name: 'functest-opnfv-functest-smoke-{tag}-pull' <<: *functest-jobs + - name: 'functest-opnfv-functest-smoke-cntt-{tag}-pull' + <<: *functest-jobs - name: 'functest-opnfv-functest-benchmarking-{tag}-pull' <<: *functest-jobs - name: 'functest-opnfv-functest-vnf-{tag}-pull' @@ -388,11 +450,17 @@ <<: *functest-jobs - name: 'functest-opnfv-functest-healthcheck-{tag}-tempest_smoke-run' <<: *functest-jobs + - name: 'functest-opnfv-functest-healthcheck-{tag}-tempest_horizon-run' + <<: *functest-jobs - multijob: name: opnfv/functest-smoke:{tag} projects: - name: 'functest-opnfv-functest-smoke-{tag}-neutron-tempest-plugin-api-run' <<: *functest-jobs + - name: 'functest-opnfv-functest-smoke-{tag}-tempest_cinder-run' + <<: *functest-jobs + - name: 'functest-opnfv-functest-smoke-{tag}-tempest_keystone-run' + <<: *functest-jobs - name: 'functest-opnfv-functest-smoke-{tag}-rally_sanity-run' <<: *functest-jobs - name: 'functest-opnfv-functest-smoke-{tag}-refstack_defcore-run' @@ -422,6 +490,23 @@ - name: 'functest-opnfv-functest-smoke-{tag}-octavia-run' <<: *functest-jobs - multijob: + name: opnfv/functest-smoke-cntt:{tag} + projects: + - name: 'functest-opnfv-functest-smoke-cntt-{tag}-neutron-tempest-plugin-api-run' + <<: *functest-jobs + - name: 'functest-opnfv-functest-smoke-cntt-{tag}-tempest_cinder-run' + <<: *functest-jobs + - name: 'functest-opnfv-functest-smoke-cntt-{tag}-tempest_keystone-run' + <<: *functest-jobs + - name: 'functest-opnfv-functest-smoke-cntt-{tag}-rally_sanity-run' + <<: *functest-jobs + - name: 'functest-opnfv-functest-smoke-cntt-{tag}-tempest_full-run' + <<: *functest-jobs + - name: 'functest-opnfv-functest-smoke-cntt-{tag}-tempest_scenario-run' + <<: *functest-jobs + - name: 'functest-opnfv-functest-smoke-cntt-{tag}-tempest_slow-run' + <<: *functest-jobs + - multijob: name: opnfv/functest-benchmarking:{tag} projects: - name: 'functest-opnfv-functest-benchmarking-{tag}-rally_full-run' @@ -558,6 +643,16 @@ - 'functest-{repo}-{container}-{tag}-gate' - 'functest-{repo}-{container}-{tag}-check' +- project: + name: functest-opnfv-functest-smoke-cntt-{tag}-build + <<: *functest-params + container: functest-smoke-cntt + ref_arg: BRANCH + path: docker/smoke-cntt + jobs: + - 'functest-{repo}-{container}-{tag}-gate' + - 'functest-{repo}-{container}-{tag}-check' + - job-template: name: 'functest-{tag}-check' project-type: multijob @@ -566,6 +661,10 @@ slave: '{slave}' - functest-branch: branch: '{branch}' + - functest-DEBUG: + DEBUG: 'true' + - functest-EXTERNAL_NETWORK: + EXTERNAL_NETWORK: public properties: - build-blocker: use-build-blocker: true @@ -580,6 +679,8 @@ <<: *functest-jobs - name: 'functest-opnfv-functest-smoke-{tag}-rmi' <<: *functest-jobs + - name: 'functest-opnfv-functest-smoke-cntt-{tag}-rmi' + <<: *functest-jobs - name: 'functest-opnfv-functest-benchmarking-{tag}-rmi' <<: *functest-jobs - name: 'functest-opnfv-functest-vnf-{tag}-rmi' @@ -616,6 +717,11 @@ - name: 'functest-opnfv-functest-vnf-{tag}-check' <<: *functest-jobs - multijob: + name: build opnfv/functest-smoke-cntt + projects: + - name: 'functest-opnfv-functest-smoke-cntt-{tag}-check' + <<: *functest-jobs + - multijob: name: opnfv/functest-healthcheck:{tag} projects: - name: 'functest-opnfv-functest-healthcheck-{tag}-connection_check-run' @@ -642,11 +748,17 @@ <<: *functest-jobs - name: 'functest-opnfv-functest-healthcheck-{tag}-tempest_smoke-run' <<: *functest-jobs + - name: 'functest-opnfv-functest-healthcheck-{tag}-tempest_horizon-run' + <<: *functest-jobs - multijob: name: opnfv/functest-smoke:{tag} projects: - name: 'functest-opnfv-functest-smoke-{tag}-neutron-tempest-plugin-api-run' <<: *functest-jobs + - name: 'functest-opnfv-functest-smoke-{tag}-tempest_cinder-run' + <<: *functest-jobs + - name: 'functest-opnfv-functest-smoke-{tag}-tempest_keystone-run' + <<: *functest-jobs - name: 'functest-opnfv-functest-smoke-{tag}-rally_sanity-run' <<: *functest-jobs - name: 'functest-opnfv-functest-smoke-{tag}-refstack_defcore-run' @@ -676,6 +788,23 @@ - name: 'functest-opnfv-functest-smoke-{tag}-octavia-run' <<: *functest-jobs - multijob: + name: opnfv/functest-smoke-cntt:{tag} + projects: + - name: 'functest-opnfv-functest-smoke-cntt-{tag}-neutron-tempest-plugin-api-run' + <<: *functest-jobs + - name: 'functest-opnfv-functest-smoke-cntt-{tag}-tempest_cinder-run' + <<: *functest-jobs + - name: 'functest-opnfv-functest-smoke-cntt-{tag}-tempest_keystone-run' + <<: *functest-jobs + - name: 'functest-opnfv-functest-smoke-cntt-{tag}-rally_sanity-run' + <<: *functest-jobs + - name: 'functest-opnfv-functest-smoke-cntt-{tag}-tempest_full-run' + <<: *functest-jobs + - name: 'functest-opnfv-functest-smoke-cntt-{tag}-tempest_scenario-run' + <<: *functest-jobs + - name: 'functest-opnfv-functest-smoke-cntt-{tag}-tempest_slow-run' + <<: *functest-jobs + - multijob: name: opnfv/functest-benchmarking:{tag} projects: - name: 'functest-opnfv-functest-benchmarking-{tag}-rally_full-run' @@ -733,6 +862,10 @@ parameters: - functest-slave: slave: '{slave}' + - functest-DEBUG: + DEBUG: 'true' + - functest-EXTERNAL_NETWORK: + EXTERNAL_NETWORK: public properties: - build-blocker: use-build-blocker: true @@ -747,6 +880,8 @@ <<: *functest-jobs - name: 'functest-opnfv-functest-smoke-{tag}-rmi' <<: *functest-jobs + - name: 'functest-opnfv-functest-smoke-cntt-{tag}-rmi' + <<: *functest-jobs - name: 'functest-opnfv-functest-benchmarking-{tag}-rmi' <<: *functest-jobs - name: 'functest-opnfv-functest-vnf-{tag}-rmi' @@ -783,6 +918,11 @@ - name: 'functest-opnfv-functest-vnf-{tag}-gate' <<: *functest-jobs - multijob: + name: build opnfv/functest-smoke-cntt + projects: + - name: 'functest-opnfv-functest-smoke-cntt-{tag}-gate' + <<: *functest-jobs + - multijob: name: opnfv/functest-healthcheck:{tag} projects: - name: 'functest-opnfv-functest-healthcheck-{tag}-connection_check-run' @@ -809,11 +949,17 @@ <<: *functest-jobs - name: 'functest-opnfv-functest-healthcheck-{tag}-tempest_smoke-run' <<: *functest-jobs + - name: 'functest-opnfv-functest-healthcheck-{tag}-tempest_horizon-run' + <<: *functest-jobs - multijob: name: opnfv/functest-smoke:{tag} projects: - name: 'functest-opnfv-functest-smoke-{tag}-neutron-tempest-plugin-api-run' <<: *functest-jobs + - name: 'functest-opnfv-functest-smoke-{tag}-tempest_cinder-run' + <<: *functest-jobs + - name: 'functest-opnfv-functest-smoke-{tag}-tempest_keystone-run' + <<: *functest-jobs - name: 'functest-opnfv-functest-smoke-{tag}-rally_sanity-run' <<: *functest-jobs - name: 'functest-opnfv-functest-smoke-{tag}-refstack_defcore-run' @@ -843,6 +989,23 @@ - name: 'functest-opnfv-functest-smoke-{tag}-octavia-run' <<: *functest-jobs - multijob: + name: opnfv/functest-smoke-cntt:{tag} + projects: + - name: 'functest-opnfv-functest-smoke-cntt-{tag}-neutron-tempest-plugin-api-run' + <<: *functest-jobs + - name: 'functest-opnfv-functest-smoke-cntt-{tag}-tempest_cinder-run' + <<: *functest-jobs + - name: 'functest-opnfv-functest-smoke-cntt-{tag}-tempest_keystone-run' + <<: *functest-jobs + - name: 'functest-opnfv-functest-smoke-cntt-{tag}-rally_sanity-run' + <<: *functest-jobs + - name: 'functest-opnfv-functest-smoke-cntt-{tag}-tempest_full-run' + <<: *functest-jobs + - name: 'functest-opnfv-functest-smoke-cntt-{tag}-tempest_scenario-run' + <<: *functest-jobs + - name: 'functest-opnfv-functest-smoke-cntt-{tag}-tempest_slow-run' + <<: *functest-jobs + - multijob: name: opnfv/functest-benchmarking:{tag} projects: - name: 'functest-opnfv-functest-benchmarking-{tag}-rally_full-run' diff --git a/jjb/functest/xtesting-project-jobs.yaml b/jjb/functest/xtesting-project-jobs.yaml index b030fcec6..a1013feb3 100644 --- a/jjb/functest/xtesting-project-jobs.yaml +++ b/jjb/functest/xtesting-project-jobs.yaml @@ -1,167 +1,80 @@ --- -################################################### -# All the jobs except verify have been removed! -# They will only be enabled on request by projects! -################################################### -- project: - name: xtesting-project-jobs - - project: 'functest-xtesting' - - jobs: - - 'xtesting-verify-{stream}' - - 'xtesting-verify-{phase}-{stream}' - - stream: - - master: - branch: '{stream}' - gs-pathname: '' - disabled: false - - jerma: &jerma - branch: 'stable/{stream}' - gs-pathname: '/{stream}' - disabled: false - - iruya: &iruya - branch: 'stable/{stream}' - gs-pathname: '/{stream}' - disabled: false - - hunter: &hunter - branch: 'stable/{stream}' - gs-pathname: '/{stream}' - disabled: false - - phase: - - 'unit-tests-and-docs': - slave-label: 'lf-virtual1' - -- job-template: - name: 'xtesting-verify-{stream}' - - disabled: '{obj:disabled}' - - project-type: 'multijob' - - parameters: - - project-parameter: - project: '{project}' - branch: '{branch}' - - 'opnfv-build-ubuntu-defaults' - - scm: - - git-scm-gerrit - - triggers: - - 'xtesting-verify-triggers-macro': - project: '{project}' - branch: '{branch}' - - builders: - - shell: | - #!/bin/bash - # we do nothing here as the main stuff will be done - # in phase jobs - echo "Triggering phase jobs!" - - multijob: - name: 'xtesting-build-and-unittest' - execution-type: PARALLEL - projects: - - name: 'xtesting-verify-unit-tests-and-docs-{stream}' - current-parameters: false - predefined-parameters: | - GERRIT_BRANCH=$GERRIT_BRANCH - GERRIT_REFSPEC=$GERRIT_REFSPEC - GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER - GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE - git-revision: true - node-parameters: false - kill-phase-on: FAILURE - abort-all-job: false - -- job-template: - name: 'xtesting-verify-{phase}-{stream}' - - disabled: '{obj:disabled}' - - wrappers: - - ssh-agent-wrapper - - build-timeout: - timeout: 30 - - parameters: - - project-parameter: - project: '{project}' - branch: '{branch}' - - '{slave-label}-defaults' - - scm: - - git-scm-gerrit +- xtesting-project-params: &xtesting-project-params + name: 'xtesting-project-params' + tag: + - latest: + branch: master + slave: lf-virtual1 + - jerma: + branch: stable/jerma + slave: lf-virtual1 + - iruya: + branch: stable/iruya + slave: lf-virtual1 + - hunter: + branch: stable/hunter + slave: lf-virtual1 +- builder: + name: xtesting-run-tox builders: - - 'xtesting-verify-{phase}-builders-macro' - - publishers: - - 'xtesting-verify-{phase}-publishers-macro' + - shell: tox -################################ -# job triggers -################################ - trigger: - name: 'xtesting-verify-triggers-macro' + name: xtesting-project-patchset-created triggers: - gerrit: server-name: 'gerrit.opnfv.org' trigger-on: - - patchset-created-event: - exclude-drafts: 'false' - exclude-trivial-rebase: 'false' - exclude-no-code-change: 'false' - - draft-published-event + - patchset-created-event - comment-added-contains-event: comment-contains-value: 'recheck' - comment-added-contains-event: comment-contains-value: 'reverify' projects: - project-compare-type: 'ANT' - project-pattern: '{project}' + project-pattern: 'functest-xtesting' branches: - branch-compare-type: 'ANT' branch-pattern: '**/{branch}' - disable-strict-forbidden-file-verification: 'true' - forbidden-file-paths: - - compare-type: ANT - pattern: 'docs/**|.gitignore' + skip-vote: + successful: false + failed: false + unstable: false + notbuilt: false + +- parameter: + name: xtesting-project-slave + parameters: + - label: + name: slave + default: '{slave}' -################################ -# job builders -################################ +- scm: + name: xtesting-project-scm + scm: + - git: + url: https://gerrit.opnfv.org/gerrit/functest-xtesting + refspec: '+refs/changes/*:refs/changes/*' + branches: + - '{ref}' -- builder: - name: 'xtesting-verify-unit-tests-and-docs-builders-macro' +- job-template: + name: 'xtesting-run-tox-{tag}' + triggers: + - xtesting-project-patchset-created: + branch: '{branch}' + scm: + - xtesting-project-scm: + ref: $GERRIT_REFSPEC + parameters: + - xtesting-project-slave: + slave: '{slave}' builders: - - shell: | - cd $WORKSPACE && tox + - xtesting-run-tox -################################ -# job publishers -################################ -- publisher: - name: 'xtesting-verify-unit-tests-and-docs-publishers-macro' - publishers: - - junit: - results: nosetests.xml - - cobertura: - report-file: "coverage.xml" - only-stable: "true" - health-auto-update: "true" - stability-auto-update: "true" - zoom-coverage-chart: "true" - targets: - - files: - healthy: 10 - unhealthy: 20 - failing: 30 - - method: - healthy: 50 - unhealthy: 40 - failing: 30 - - email-jenkins-admins-on-failure +- project: + name: 'xtesting-run-tox' + <<: *xtesting-project-params + jobs: + - 'xtesting-run-tox-{tag}' diff --git a/jjb/functest/xtesting.yaml b/jjb/functest/xtesting.yaml index cc9ec07ba..b34fc100c 100644 --- a/jjb/functest/xtesting.yaml +++ b/jjb/functest/xtesting.yaml @@ -93,7 +93,7 @@ name: xtesting-run-containers builders: - shell: | - set +ex + set +x [ ! -z "$WORKSPACE" ] && sudo rm -rf $WORKSPACE/* || true if [ "{repo}" = "_" ]; then image={container}:{tag} @@ -103,16 +103,13 @@ image={repo}:{port}/{container}:{tag} fi sudo docker run --rm \ + -e S3_ENDPOINT_URL=https://storage.googleapis.com \ + -e S3_DST_URL=s3://artifacts.opnfv.org/xtesting/$JOB_NAME-$BUILD_ID \ + -e HTTP_DST_URL=http://artifacts.opnfv.org/xtesting/$JOB_NAME-$BUILD_ID \ -v $WORKSPACE/../$JOB_NAME/results:/var/lib/xtesting/results \ + -v /home/opnfv/xtesting/.boto:/root/.boto \ -e DEBUG=true \ - $image run_tests -t {test} - res=$? - gsutil -m cp -r $WORKSPACE/ \ - gs://artifacts.opnfv.org/xtesting/$JOB_NAME-$BUILD_ID > /dev/null 2>&1 - find $WORKSPACE -type f \ - -printf \ - "http://artifacts.opnfv.org/xtesting/$JOB_NAME-$BUILD_ID/%P\n" - exit $res + $image run_tests -t {test} -p - builder: name: xtesting-remove-images |