diff options
Diffstat (limited to 'jjb/functest')
| -rwxr-xr-x | jjb/functest/functest-alpine.sh | 37 | ||||
| -rw-r--r-- | jjb/functest/functest-docker.yaml | 18 | ||||
| -rw-r--r-- | jjb/functest/functest-kubernetes-docker.yaml | 3 | ||||
| -rw-r--r-- | jjb/functest/functest-kubernetes-project-jobs.yaml | 199 | ||||
| -rw-r--r-- | jjb/functest/functest-kubernetes.yaml | 3 | ||||
| -rw-r--r-- | jjb/functest/functest-project-jobs.yaml | 195 | ||||
| -rw-r--r-- | jjb/functest/functest-rtd-jobs.yaml | 24 | ||||
| -rw-r--r-- | jjb/functest/functest.yaml | 42 | ||||
| -rw-r--r-- | jjb/functest/xtesting-docker.yaml | 3 | ||||
| -rw-r--r-- | jjb/functest/xtesting-project-jobs.yaml | 199 | ||||
| -rw-r--r-- | jjb/functest/xtesting.yaml | 3 |
11 files changed, 244 insertions, 482 deletions
diff --git a/jjb/functest/functest-alpine.sh b/jjb/functest/functest-alpine.sh index ae57258bc..14143d2e8 100755 --- a/jjb/functest/functest-alpine.sh +++ b/jjb/functest/functest-alpine.sh @@ -74,9 +74,6 @@ rc_file=${HOME}/opnfv-openrc.sh if [[ ${INSTALLER_TYPE} == 'joid' ]]; then rc_file=$LAB_CONFIG/admin-openrc -elif [[ ${INSTALLER_TYPE} == 'compass' ]]; then - cacert_file_vol="-v ${HOME}/os_cacert:${FUNCTEST_DIR}/conf/os_cacert" - echo "export OS_CACERT=${FUNCTEST_DIR}/conf/os_cacert" >> ${HOME}/opnfv-openrc.sh elif [[ ${INSTALLER_TYPE} == 'fuel' ]] && [[ "${DEPLOY_SCENARIO}" =~ -ha$ ]]; then cacert_file_vol="-v ${HOME}/os_cacert:/etc/ssl/certs/mcp_os_cacert" fi @@ -120,20 +117,6 @@ if [[ ${INSTALLER_TYPE} == 'fuel' && ${DEPLOY_SCENARIO} == 'os-nosdn-nofeature-n envs="${envs} -e LIBVIRT_USER=ubuntu -e LIBVIRT_KEY_PATH=${FUNCTEST_DIR}/conf/libvirt_key" fi -if [[ ${INSTALLER_TYPE} == 'compass' && ${DEPLOY_SCENARIO} =~ 'sfc' ]]; then - ssh_key="/tmp/id_rsa" - user_config="/tmp/openstack_user_config.yml" - docker cp compass-tasks:/root/.ssh/id_rsa $ssh_key - docker cp compass-tasks:/etc/openstack_deploy/openstack_user_config.yml $user_config - sshkey_vol="-v ${ssh_key}:/root/.ssh/id_rsa" - userconfig_vol="-v ${user_config}:${user_config}" - envs="${envs} -e EXTERNAL_NETWORK=${EXTERNAL_NETWORK}" -fi - -if [[ ${INSTALLER_TYPE} == 'compass' ]] || [[ ${DEPLOY_SCENARIO} == *"odl"* ]]; then - envs="${envs} -e SDN_CONTROLLER_RESTCONFPORT=8080" -fi - if [[ ${DEPLOY_SCENARIO} == *"ovs"* ]] || [[ ${DEPLOY_SCENARIO} == *"fdio"* ]]; then if [[ -n ${IMAGE_PROPERTIES} ]]; then IMAGE_PROPERTIES="${IMAGE_PROPERTIES},hw_mem_page_size:large" @@ -170,26 +153,6 @@ volume-feature-enabled: backup: false EOF ;; -compass) - cat << EOF > "${tempest_conf_yaml}" ---- -compute-feature-enabled: - shelve: false - vnc_console: false - block_migration_for_live_migration: false - spice_console: true -identity-feature-enabled: - api_v2: false - api_v2_admin: false -image-feature-enabled: - api_v2: true - api_v1: false -volume: - storage_protocol: ceph -volume-feature-enabled: - backup: false -EOF - ;; fuel) cat << EOF > "${tempest_conf_yaml}" --- diff --git a/jjb/functest/functest-docker.yaml b/jjb/functest/functest-docker.yaml index bb25c0f3c..001509441 100644 --- a/jjb/functest/functest-docker.yaml +++ b/jjb/functest/functest-docker.yaml @@ -12,6 +12,9 @@ - master: branch: '{stream}' disabled: false + - jerma: + branch: 'stable/{stream}' + disabled: false - iruya: branch: 'stable/{stream}' disabled: false @@ -33,10 +36,19 @@ - 'smoke' - 'benchmarking' - 'vnf' + - 'smoke-cntt' exclude: - stream: 'master' image: 'tempest' + - stream: 'jerma' + image: 'tempest' + - stream: 'jerma' + image: 'smoke-cntt' + - stream: 'iruya' + image: 'smoke-cntt' + - stream: 'hunter' + image: 'smoke-cntt' # settings for jobs run in multijob phases build-job-settings: &build-job-settings @@ -147,6 +159,10 @@ <<: *build-job-settings - name: 'functest-vnf-docker-build-arm64-{stream}' <<: *build-job-settings + - name: 'functest-smoke-cntt-docker-build-amd64-{stream}' + <<: *build-job-settings + - name: 'functest-smoke-cntt-docker-build-arm64-{stream}' + <<: *build-job-settings - multijob: name: 'publish all manifests' condition: SUCCESSFUL @@ -160,6 +176,8 @@ <<: *manifest-job-settings - name: 'functest-vnf-docker-manifest-{stream}' <<: *manifest-job-settings + - name: 'functest-smoke-cntt-docker-manifest-{stream}' + <<: *manifest-job-settings publishers: - 'functest-amd64-recipients' diff --git a/jjb/functest/functest-kubernetes-docker.yaml b/jjb/functest/functest-kubernetes-docker.yaml index 6c82904a0..8ae350a08 100644 --- a/jjb/functest/functest-kubernetes-docker.yaml +++ b/jjb/functest/functest-kubernetes-docker.yaml @@ -12,6 +12,9 @@ - master: branch: '{stream}' disabled: false + - jerma: + branch: 'stable/{stream}' + disabled: false - iruya: branch: 'stable/{stream}' disabled: false diff --git a/jjb/functest/functest-kubernetes-project-jobs.yaml b/jjb/functest/functest-kubernetes-project-jobs.yaml index 9ceabb19c..2e1a410e2 100644 --- a/jjb/functest/functest-kubernetes-project-jobs.yaml +++ b/jjb/functest/functest-kubernetes-project-jobs.yaml @@ -1,163 +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 - - 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 4dd7d608c..f235c4db3 100644 --- a/jjb/functest/functest-kubernetes.yaml +++ b/jjb/functest/functest-kubernetes.yaml @@ -11,6 +11,9 @@ - latest: branch: master slave: lf-virtual8 + - jerma: + branch: stable/jerma + slave: lf-virtual8 - iruya: branch: stable/iruya slave: lf-virtual7 diff --git a/jjb/functest/functest-project-jobs.yaml b/jjb/functest/functest-project-jobs.yaml index 269ecee7a..0a836441b 100644 --- a/jjb/functest/functest-project-jobs.yaml +++ b/jjb/functest/functest-project-jobs.yaml @@ -1,163 +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/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 093cc625c..0173c99a3 100644 --- a/jjb/functest/functest.yaml +++ b/jjb/functest/functest.yaml @@ -11,12 +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 @@ -43,6 +50,7 @@ name: 'functest-build-containers' <<: *functest-containers test: '{test}' + dashboard_url: '{dashboard_url}' - functest-build-containers: &functest-build-containers name: 'functest-build-containers' @@ -101,6 +109,8 @@ fi if [ "{tag}" = "latest" ]; then py=3.7 + elif [ "{tag}" = "jerma" ]; then + py=3.7 elif [ "{tag}" = "iruya" ]; then py=3.6 else @@ -110,6 +120,7 @@ -v $WORKSPACE/../$JOB_NAME/results:/var/lib/xtesting/results \ -e DEBUG=True \ -e EXTERNAL_NETWORK=public \ + -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/\ @@ -249,6 +260,10 @@ - cinder_test - odl - tempest_smoke + - tempest_horizon + exclude: + - tag: hunter + test: tempest_horizon jobs: - 'functest-{repo}-{container}-{tag}-{test}-run' @@ -258,6 +273,8 @@ container: 'functest-smoke' test: - neutron-tempest-plugin-api + - tempest_keystone + - tempest_cinder - rally_sanity - refstack_defcore - refstack_compute @@ -275,6 +292,8 @@ exclude: - tag: latest test: refstack_defcore + - tag: jerma + test: refstack_defcore - tag: iruya test: refstack_defcore - tag: iruya @@ -289,6 +308,10 @@ test: tempest_slow - tag: hunter test: octavia + - tag: hunter + test: tempest_keystone + - tag: hunter + test: tempest_cinder jobs: - 'functest-{repo}-{container}-{tag}-{test}-run' @@ -381,11 +404,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_keystone-run' + <<: *functest-jobs + - name: 'functest-opnfv-functest-smoke-{tag}-tempest_cinder-run' + <<: *functest-jobs - name: 'functest-opnfv-functest-smoke-{tag}-rally_sanity-run' <<: *functest-jobs - name: 'functest-opnfv-functest-smoke-{tag}-refstack_defcore-run' @@ -509,6 +538,7 @@ - 'functest-{repo}-{container}-{tag}-check' exclude: - tag: latest + - tag: jerma - project: name: functest-opnfv-functest-healthcheck-{tag}-build @@ -634,11 +664,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_keystone-run' + <<: *functest-jobs + - name: 'functest-opnfv-functest-smoke-{tag}-tempest_cinder-run' + <<: *functest-jobs - name: 'functest-opnfv-functest-smoke-{tag}-rally_sanity-run' <<: *functest-jobs - name: 'functest-opnfv-functest-smoke-{tag}-refstack_defcore-run' @@ -801,11 +837,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_keystone-run' + <<: *functest-jobs + - name: 'functest-opnfv-functest-smoke-{tag}-tempest_cinder-run' + <<: *functest-jobs - name: 'functest-opnfv-functest-smoke-{tag}-rally_sanity-run' <<: *functest-jobs - name: 'functest-opnfv-functest-smoke-{tag}-refstack_defcore-run' diff --git a/jjb/functest/xtesting-docker.yaml b/jjb/functest/xtesting-docker.yaml index 510a55ea3..fbc90c2e9 100644 --- a/jjb/functest/xtesting-docker.yaml +++ b/jjb/functest/xtesting-docker.yaml @@ -12,6 +12,9 @@ - master: branch: '{stream}' disabled: false + - jerma: + branch: 'stable/{stream}' + disabled: false - iruya: branch: 'stable/{stream}' disabled: false diff --git a/jjb/functest/xtesting-project-jobs.yaml b/jjb/functest/xtesting-project-jobs.yaml index 6e6f4453b..a1013feb3 100644 --- a/jjb/functest/xtesting-project-jobs.yaml +++ b/jjb/functest/xtesting-project-jobs.yaml @@ -1,163 +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 - - 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 e3fe56b2c..cc9ec07ba 100644 --- a/jjb/functest/xtesting.yaml +++ b/jjb/functest/xtesting.yaml @@ -11,6 +11,9 @@ - latest: branch: master slave: lf-virtual1 + - jerma: + branch: stable/jerma + slave: lf-virtual1 - iruya: branch: stable/iruya slave: lf-virtual1 |