openstack
/
project-config
Code Issues Proposed changes

Revert "Migrate -platform- devstack jobs to -neutron-full-" 

This reverts commit b577ae03f1.

This change unexpectedly added -ubuntu-trusty job in the master
integrated gate (and probably removed it from other branches). What we
need to do is to run it in devstack master AND in integrated gate for
Mitaka. I am not sure how to achieve that, so in the meantime, I revert
the patch.

Change-Id: Icc81edd85abbf8912328145f4c95d784271c4ae0
This commit is contained in:
Ihar Hrachyshka 2017-01-30 22:10:15 +00:00
parent b577ae03f1
commit be80b4f85d
4 changed files with 56 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
grafana/devstack.yaml
View File

@ -18,6 +18,6 @@ dashboard:
targets:
- target: alias(movingAverage(asPercent(transformNull(stats_counts.zuul.pipeline.check.job.gate-tempest-dsvm-neutron-full-ubuntu-xenial.FAILURE),sum(stats_counts.zuul.pipeline.check.job.gate-tempest-dsvm-neutron-full-ubuntu-xenial.{SUCCESS,FAILURE})),'24hours'), 'gate-tempest-dsvm-neutron-full-ubuntu-xenial')
- target: alias(movingAverage(asPercent(transformNull(stats_counts.zuul.pipeline.check.job.gate-tempest-dsvm-platform-ubuntu-trusty.FAILURE),sum(stats_counts.zuul.pipeline.check.job.gate-tempest-dsvm-platform-ubuntu-trusty.{SUCCESS,FAILURE})),'24hours'), 'gate-tempest-dsvm-platform-ubuntu-trusty')
- target: alias(movingAverage(asPercent(transformNull(stats_counts.zuul.pipeline.check.job.gate-tempest-dsvm-platform-centos-7-nv.FAILURE),sum(stats_counts.zuul.pipeline.check.job.gate-tempest-dsvm-platform-centos-7-nv.{SUCCESS,FAILURE})),'24hours'), 'gate-tempest-dsvm-platform-centos-7-nv')
- target: alias(movingAverage(asPercent(transformNull(stats_counts.zuul.pipeline.check.job.gate-tempest-dsvm-platform-fedora-25-nv.FAILURE),sum(stats_counts.zuul.pipeline.check.job.gate-tempest-dsvm-platform-fedora-25-nv.{SUCCESS,FAILURE})),'24hours'), 'gate-tempest-dsvm-platform-fedora-25-nv')
- target: alias(movingAverage(asPercent(transformNull(stats_counts.zuul.pipeline.check.job.gate-tempest-dsvm-platform-centos7-nv.FAILURE),sum(stats_counts.zuul.pipeline.check.job.gate-tempest-dsvm-platform-centos7-nv.{SUCCESS,FAILURE})),'24hours'), 'gate-tempest-dsvm-platform-centos7-nv')
- target: alias(movingAverage(asPercent(transformNull(stats_counts.zuul.pipeline.check.job.gate-tempest-dsvm-platform-fedora25-nv.FAILURE),sum(stats_counts.zuul.pipeline.check.job.gate-tempest-dsvm-platform-fedora25-nv.{SUCCESS,FAILURE})),'24hours'), 'gate-tempest-dsvm-platform-fedora25-nv')
type: graph

31
jenkins/jobs/devstack-gate.yaml
View File

@ -1485,6 +1485,37 @@
- devstack-logs
- console-log
# "platform" test -- run on an alternative node
- job-template:
name: '{pipeline}-tempest-dsvm-platform-{name}{suffix}'
node: '{node}'
wrappers:
- build-timeout:
timeout: 180
- timestamps
builders:
- print-template-name:
template-name: "{template-name}"
- link-logs
- net-info
- devstack-checkout
- shell: |
#!/bin/bash -xe
export PYTHONUNBUFFERED=true
export DEVSTACK_GATE_TEMPEST=1
export DEVSTACK_GATE_TEMPEST_FULL=1
export DEVSTACK_GATE_NEUTRON={neutron}
export DEVSTACK_GATE_TLSPROXY=1
cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh
./safe-devstack-vm-gate-wrap.sh
publishers:
- devstack-logs
- console-log
- job-template:
name: '{pipeline}-keystone-dsvm-grenade-multinode-{node-release}{suffix}'
node: '{node}'

21
jenkins/jobs/projects.yaml
View File

@ -3662,6 +3662,11 @@
node: ubuntu-xenial-2-node
suffix: '-nv'
branch-override: default
- '{pipeline}-tempest-dsvm-neutron-full-{node}{suffix}':
pipeline: gate
node: centos-7
suffix: '-nv'
branch-override: default
- '{pipeline}-tempest-dsvm-neutron-dvr-multinode-scenario-{node-release}{suffix}':
pipeline: gate
node-release: ubuntu-xenial
@ -3698,16 +3703,24 @@
node: ubuntu-xenial
suffix: '-nv'
branch-override: default
- '{pipeline}-tempest-dsvm-neutron-full-{node}{suffix}':
- '{pipeline}-tempest-dsvm-platform-{name}{suffix}':
name: centos7
pipeline: gate
node: centos-7
neutron: 1
suffix: '-nv'
branch-override: default
- '{pipeline}-tempest-dsvm-neutron-full-{node}{suffix}':
- '{pipeline}-tempest-dsvm-platform-{name}{suffix}':
pipeline: gate
name: fedora25
suffix: '-nv'
node: fedora-25
branch-override: default
neutron: 1
- '{pipeline}-tempest-dsvm-platform-{name}{suffix}':
pipeline: gate
name: ubuntu-trusty
suffix: ''
node: ubuntu-trusty
neutron: 1
- '{pipeline}-tempest-dsvm-py35-{node}{suffix}':
pipeline: gate
node: ubuntu-xenial

12
zuul/layout.yaml
View File

@ -1252,7 +1252,7 @@ jobs:
branch: master
# This job keeps the lights on for Trusty on devstack master branch
- name: ^gate-tempest-dsvm-neutron-full-ubuntu-trusty.*$
- name: ^gate-tempest-dsvm-platform-ubuntu-trusty.*$
branch: master
- name: ^gate-logstash-filters-ubuntu-xenial$
@ -3531,9 +3531,9 @@ projects:
- gate-grenade-dsvm-multinode
- gate-grenade-dsvm-neutron-multinode-ubuntu-trusty
- gate-grenade-dsvm-neutron-multinode-ubuntu-xenial
- gate-tempest-dsvm-neutron-full-ubuntu-trusty
- gate-tempest-dsvm-neutron-full-centos-7-nv
- gate-tempest-dsvm-neutron-full-fedora-25-nv
- gate-tempest-dsvm-platform-ubuntu-trusty
- gate-tempest-dsvm-platform-centos7-nv
- gate-tempest-dsvm-platform-fedora25-nv
- gate-tempest-dsvm-neutron-linuxbridge-ubuntu-trusty
- gate-tempest-dsvm-neutron-linuxbridge-ubuntu-xenial
gate:
@ -3778,8 +3778,8 @@ projects:
- gate-tempest-dsvm-neutron-full-ubuntu-trusty-mitaka-nv
- gate-tempest-dsvm-full-ubuntu-xenial-newton-nv
- gate-tempest-dsvm-neutron-full-ubuntu-xenial-newton-nv
- gate-tempest-dsvm-neutron-full-centos-7-nv
- gate-tempest-dsvm-neutron-full-fedora-25-nv
- gate-tempest-dsvm-platform-centos7-nv
- gate-tempest-dsvm-platform-fedora25-nv
- gate-tempest-dsvm-multinode-full-ubuntu-trusty-nv
- gate-tempest-dsvm-neutron-multinode-full-ubuntu-trusty-nv
- gate-tempest-dsvm-multinode-full-ubuntu-xenial-nv