diff options
| -rw-r--r-- | jjb/armband/armband-ci-jobs.yml | 3 | ||||
| -rw-r--r-- | jjb/ci_gate_security/opnfv-ci-gate-security.yml | 6 | ||||
| -rw-r--r-- | jjb/compass4nfv/compass-verify-jobs.yml | 6 | ||||
| -rw-r--r-- | jjb/doctor/doctor.yml | 4 | ||||
| -rwxr-xr-x | jjb/dovetail/dovetail-run.sh | 10 | ||||
| -rw-r--r-- | jjb/global/releng-macros.yml | 40 | ||||
| -rw-r--r-- | jjb/global/slave-params.yml | 11 | ||||
| -rw-r--r-- | jjb/octopus/octopus.yml | 11 | ||||
| -rw-r--r-- | jjb/prediction/prediction.yml | 8 | ||||
| -rw-r--r-- | jjb/releng/opnfv-lint.yml | 2 |
10 files changed, 20 insertions, 81 deletions
diff --git a/jjb/armband/armband-ci-jobs.yml b/jjb/armband/armband-ci-jobs.yml index c74e3c83d..0bf750be3 100644 --- a/jjb/armband/armband-ci-jobs.yml +++ b/jjb/armband/armband-ci-jobs.yml @@ -250,6 +250,7 @@ gs-pathname: '{gs-pathname}' - '{slave-label}-defaults': installer: '{installer}' + - testapi-parameter - string: name: DEPLOY_SCENARIO default: 'os-odl-nofeature-ha' @@ -262,6 +263,7 @@ name: '$BUILD_NUMBER - Scenario: $DEPLOY_SCENARIO' builders: + - track-begin-timestamp - shell: !include-raw-escape: ../fuel/fuel-deploy.sh @@ -269,6 +271,7 @@ - email: recipients: armband@enea.com - email-jenkins-admins-on-failure + - report-provision-result ######################## # trigger macros diff --git a/jjb/ci_gate_security/opnfv-ci-gate-security.yml b/jjb/ci_gate_security/opnfv-ci-gate-security.yml index 56aee174c..cd3831310 100644 --- a/jjb/ci_gate_security/opnfv-ci-gate-security.yml +++ b/jjb/ci_gate_security/opnfv-ci-gate-security.yml @@ -34,7 +34,6 @@ - dovetail - dpacc - enfv - - fastpathmetrics - fds - fuel - functest @@ -43,12 +42,9 @@ - kvmfornfv - models - moon - - multisite - netready - nfvbench - - octopus - onosfw - - openretriever - opera - opnfvdocs - orchestra @@ -159,7 +155,7 @@ comment-contains-value: 'reverify' projects: - project-compare-type: 'REG_EXP' - project-pattern: 'apex|armband|bamboo|barometer|bottlenecks|calipso|compass4nfv|conductor|copper|cperf|daisy|doctor|dovetail|dpacc|enfv|escalator|fds|fuel|functest|octopus|pharos|releng|sandbox|yardstick|infra|ipv6|kvmfornfv|lsoapi|models|moon|multisite|netready' + project-pattern: 'apex|armband|bamboo|barometer|bottlenecks|calipso|compass4nfv|conductor|copper|cperf|daisy|doctor|dovetail|dpacc|enfv|fds|fuel|functest|pharos|releng|sandbox|yardstick|infra|ipv6|kvmfornfv|models|moon|netready' branches: - branch-compare-type: 'ANT' branch-pattern: '**/{branch}' diff --git a/jjb/compass4nfv/compass-verify-jobs.yml b/jjb/compass4nfv/compass-verify-jobs.yml index 444b17361..c357ff641 100644 --- a/jjb/compass4nfv/compass-verify-jobs.yml +++ b/jjb/compass4nfv/compass-verify-jobs.yml @@ -14,14 +14,14 @@ gs-pathname: '' ppa-pathname: '/{stream}' disabled: false - openstack-version: 'ocata' + openstack-version: 'pike' branch-type: 'master' - - euphrates: + - fraser: branch: 'stable/{stream}' gs-pathname: '/{stream}' ppa-pathname: '/{stream}' disabled: false - openstack-version: 'ocata' + openstack-version: 'pike' branch-type: 'master' distro: diff --git a/jjb/doctor/doctor.yml b/jjb/doctor/doctor.yml index 5732100be..3985356c1 100644 --- a/jjb/doctor/doctor.yml +++ b/jjb/doctor/doctor.yml @@ -121,7 +121,9 @@ branch: '{branch}' - '{installer}-defaults' - 'doctor-slave-parameter' - - 'doctor-parameter' + - 'doctor-parameter': + docker-tag: '{docker-tag}' + scenario: '{scenario}' - 'doctor-functest-parameter' scm: - git-scm-gerrit diff --git a/jjb/dovetail/dovetail-run.sh b/jjb/dovetail/dovetail-run.sh index d01128385..f74b10754 100755 --- a/jjb/dovetail/dovetail-run.sh +++ b/jjb/dovetail/dovetail-run.sh @@ -213,7 +213,7 @@ if [[ ! -f ${ubuntu_image} ]]; then fi sudo cp ${ubuntu_image} ${DOVETAIL_IMAGES} -# functest needs to download this image first before running +# yardstick and bottlenecks need to download this image first before running cirros_image=${image_path}/cirros-0.3.5-x86_64-disk.img if [[ ! -f ${cirros_image} ]]; then echo "Download image cirros-0.3.5-x86_64-disk.img ..." @@ -221,6 +221,14 @@ if [[ ! -f ${cirros_image} ]]; then fi sudo cp ${cirros_image} ${DOVETAIL_IMAGES} +# functest needs to download this image first before running +cirros_image=${image_path}/cirros-0.4.0-x86_64-disk.img +if [[ ! -f ${cirros_image} ]]; then + echo "Download image cirros-0.4.0-x86_64-disk.img ..." + wget -q -nc http://download.cirros-cloud.net/0.4.0/cirros-0.4.0-x86_64-disk.img -P ${image_path} +fi +sudo cp ${cirros_image} ${DOVETAIL_IMAGES} + # snaps_smoke test case needs to download this image first before running ubuntu14_image=${image_path}/ubuntu-14.04-server-cloudimg-amd64-disk1.img if [[ ! -f ${ubuntu14_image} ]]; then diff --git a/jjb/global/releng-macros.yml b/jjb/global/releng-macros.yml index d70e7e0a5..f473d8541 100644 --- a/jjb/global/releng-macros.yml +++ b/jjb/global/releng-macros.yml @@ -686,22 +686,6 @@ JBuchanan@advaoptical.com - publisher: - name: 'email-escalator-ptl' - publishers: - - email-ext: - <<: *email_ptl_defaults - recipients: > - kong.wei2@zte.com.cn - -- publisher: - name: 'email-fastpathmetrics-ptl' - publishers: - - email-ext: - <<: *email_ptl_defaults - recipients: > - maryam.tahhan@intel.com - -- publisher: name: 'email-fds-ptl' publishers: - email-ext: @@ -766,14 +750,6 @@ ruan.he@orange.com - publisher: - name: 'email-multisite-ptl' - publishers: - - email-ext: - <<: *email_ptl_defaults - recipients: > - joehuang@huawei.com - -- publisher: name: 'email-netready-ptl' publishers: - email-ext: @@ -790,14 +766,6 @@ ahothan@cisco.com - publisher: - name: 'email-octopus-ptl' - publishers: - - email-ext: - <<: *email_ptl_defaults - recipients: > - ulrich.kleber@huawei.com - -- publisher: name: 'email-onosfw-ptl' publishers: - email-ext: @@ -806,14 +774,6 @@ su.wei@huawei.com - publisher: - name: 'email-openretriever-ptl' - publishers: - - email-ext: - <<: *email_ptl_defaults - recipients: > - jiaxuan@chinamobile.com - -- publisher: name: 'email-opera-ptl' publishers: - email-ext: diff --git a/jjb/global/slave-params.yml b/jjb/global/slave-params.yml index ee6357890..9d8bed45f 100644 --- a/jjb/global/slave-params.yml +++ b/jjb/global/slave-params.yml @@ -1015,17 +1015,6 @@ description: 'SSH key to be used' - parameter: - name: 'multisite-virtual-defaults' - parameters: - - label: - name: SLAVE_LABEL - default: 'multisite-virtual' - - string: - name: GIT_BASE - default: https://gerrit.opnfv.org/gerrit/$PROJECT - description: 'Git URL to use on this Jenkins Slave' - -- parameter: name: 'ericsson-virtual5-defaults' parameters: - label: diff --git a/jjb/octopus/octopus.yml b/jjb/octopus/octopus.yml deleted file mode 100644 index a04d7f10d..000000000 --- a/jjb/octopus/octopus.yml +++ /dev/null @@ -1,11 +0,0 @@ ---- -################################ -# job configuration for Octopus -################################ -- project: - name: octopus - - project: '{name}' - - jobs: - - '{project}-verify-basic' diff --git a/jjb/prediction/prediction.yml b/jjb/prediction/prediction.yml deleted file mode 100644 index b686d9524..000000000 --- a/jjb/prediction/prediction.yml +++ /dev/null @@ -1,8 +0,0 @@ ---- -- project: - name: prediction - - project: '{name}' - - jobs: - - '{project}-verify-basic' diff --git a/jjb/releng/opnfv-lint.yml b/jjb/releng/opnfv-lint.yml index 80893de89..f8e994c90 100644 --- a/jjb/releng/opnfv-lint.yml +++ b/jjb/releng/opnfv-lint.yml @@ -172,7 +172,7 @@ comment-contains-value: 'reverify' projects: - project-compare-type: 'REG_EXP' - project-pattern: 'armband|fuel|octopus|releng-anteater' + project-pattern: 'armband|fuel|releng-anteater' branches: - branch-compare-type: 'ANT' branch-pattern: '**/{branch}' |