From 7ee6e0a20edf734e4acbc672bf837f2df5977efe Mon Sep 17 00:00:00 2001 From: Clark Boylan Date: Wed, 7 Sep 2016 15:01:16 -0700 Subject: [PATCH] Run neutron linuxbridge and dvr jobs on xenial Continue the trusty/xenial split by running the linuxbridge and dvr neutron tempest jobs on xenial for branches >= newton. This has been tested on xenial instances booted off of the infra images then running the reproduce.sh scripst for each of these jobs on them. The reproduce.sh scripts came from the gate jobs for change 358866. These seem to run happily on xenial just like the normal tempest full job. Change-Id: I0845b408bae6f463b957ac3bc705048ea4005fee --- grafana/neutron.yaml | 8 ++++---- jenkins/jobs/devstack-gate.yaml | 3 ++- jenkins/jobs/neutron.yaml | 4 ++-- jenkins/jobs/projects.yaml | 7 ++++++- zuul/layout.yaml | 26 +++++++++++++++++--------- 5 files changed, 31 insertions(+), 17 deletions(-) diff --git a/grafana/neutron.yaml b/grafana/neutron.yaml index 54d1f8105a..1d86ce5349 100644 --- a/grafana/neutron.yaml +++ b/grafana/neutron.yaml @@ -49,8 +49,8 @@ dashboard: - target: alias(movingAverage(asPercent(transformNull(stats_counts.zuul.pipeline.gate.job.gate-tempest-dsvm-full-ubuntu-xenial.FAILURE),sum(stats_counts.zuul.pipeline.gate.job.gate-tempest-dsvm-full-ubuntu-xenial.{SUCCESS,FAILURE})),'24hours'), 'gate-tempest-dsvm-full-ubuntu-xenial') - target: alias(movingAverage(asPercent(transformNull(stats_counts.zuul.pipeline.gate.job.gate-tempest-dsvm-neutron-full-ubuntu-xenial.FAILURE),sum(stats_counts.zuul.pipeline.gate.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.gate.job.gate-neutron-dsvm-api.FAILURE),sum(stats_counts.zuul.pipeline.gate.job.gate-neutron-dsvm-api.{SUCCESS,FAILURE})),'24hours'), 'gate-neutron-dsvm-api') - - target: alias(movingAverage(asPercent(transformNull(stats_counts.zuul.pipeline.gate.job.gate-tempest-dsvm-neutron-dvr.FAILURE),sum(stats_counts.zuul.pipeline.gate.job.gate-tempest-dsvm-neutron-dvr.{SUCCESS,FAILURE})),'24hours'), 'gate-tempest-dsvm-neutron-dvr') - - target: alias(movingAverage(asPercent(transformNull(stats_counts.zuul.pipeline.gate.job.gate-tempest-dsvm-neutron-linuxbridge.FAILURE),sum(stats_counts.zuul.pipeline.gate.job.gate-tempest-dsvm-neutron-linuxbridge.{SUCCESS,FAILURE})),'24hours'), 'gate-tempest-dsvm-neutron-linuxbridge') + - target: alias(movingAverage(asPercent(transformNull(stats_counts.zuul.pipeline.gate.job.gate-tempest-dsvm-neutron-dvr{,-ubuntu-trusty,-ubuntu-xenial}.FAILURE),sum(stats_counts.zuul.pipeline.gate.job.gate-tempest-dsvm-neutron-dvr{,-ubuntu-trusty,-ubuntu-xenial}.{SUCCESS,FAILURE})),'24hours'), 'gate-tempest-dsvm-neutron-dvr') + - target: alias(movingAverage(asPercent(transformNull(stats_counts.zuul.pipeline.gate.job.gate-tempest-dsvm-neutron-linuxbridge{,-ubuntu-trusty,-ubuntu-xenial}.FAILURE),sum(stats_counts.zuul.pipeline.gate.job.gate-tempest-dsvm-neutron-linuxbridge{,-ubuntu-trusty,-ubuntu-xenial}.{SUCCESS,FAILURE})),'24hours'), 'gate-tempest-dsvm-neutron-linuxbridge') type: graph - title: Graphs height: 320px @@ -92,8 +92,8 @@ dashboard: span: 4 targets: - target: alias(movingAverage(asPercent(transformNull(stats_counts.zuul.pipeline.check.job.gate-tempest-dsvm-neutron-full.FAILURE),sum(stats_counts.zuul.pipeline.check.job.gate-tempest-dsvm-neutron-full.{SUCCESS,FAILURE})),'24hours'), 'gate-tempest-dsvm-neutron-full') - - target: alias(movingAverage(asPercent(transformNull(stats_counts.zuul.pipeline.check.job.gate-tempest-dsvm-neutron-dvr.FAILURE),sum(stats_counts.zuul.pipeline.check.job.gate-tempest-dsvm-neutron-dvr.{SUCCESS,FAILURE})),'24hours'), 'gate-tempest-dsvm-neutron-dvr') - - target: alias(movingAverage(asPercent(transformNull(stats_counts.zuul.pipeline.check.job.gate-tempest-dsvm-neutron-linuxbridge.FAILURE),sum(stats_counts.zuul.pipeline.check.job.gate-tempest-dsvm-neutron-linuxbridge.{SUCCESS,FAILURE})),'24hours'), 'gate-tempest-dsvm-neutron-linuxbridge') + - target: alias(movingAverage(asPercent(transformNull(stats_counts.zuul.pipeline.check.job.gate-tempest-dsvm-neutron-dvr{,-ubuntu-trusty,-ubuntu-xenial}.FAILURE),sum(stats_counts.zuul.pipeline.check.job.gate-tempest-dsvm-neutron-dvr{,-ubuntu-trusty,-ubuntu-xenial}.{SUCCESS,FAILURE})),'24hours'), 'gate-tempest-dsvm-neutron-dvr') + - target: alias(movingAverage(asPercent(transformNull(stats_counts.zuul.pipeline.check.job.gate-tempest-dsvm-neutron-linuxbridge{,-ubuntu-trusty,-ubuntu-xenial}.FAILURE),sum(stats_counts.zuul.pipeline.check.job.gate-tempest-dsvm-neutron-linuxbridge{,-ubuntu-trusty,-ubuntu-xenial}.{SUCCESS,FAILURE})),'24hours'), 'gate-tempest-dsvm-neutron-linuxbridge') - target: alias(movingAverage(asPercent(transformNull(stats_counts.zuul.pipeline.check.job.gate-tempest-dsvm-neutron-multinode-full.FAILURE),sum(stats_counts.zuul.pipeline.check.job.gate-tempest-dsvm-neutron-multinode-full.{SUCCESS,FAILURE})),'24hours'), 'gate-tempest-dsvm-neutron-multinode-full') - target: alias(movingAverage(asPercent(transformNull(stats_counts.zuul.pipeline.check.job.gate-tempest-dsvm-neutron-dvr-multinode-full.FAILURE),sum(stats_counts.zuul.pipeline.check.job.gate-tempest-dsvm-neutron-dvr-multinode-full.{SUCCESS,FAILURE})),'24hours'), 'gate-tempest-dsvm-neutron-dvr-multinode-full') - target: alias(movingAverage(asPercent(transformNull(stats_counts.zuul.pipeline.check.job.gate-grenade-dsvm-neutron-multinode.FAILURE),sum(stats_counts.zuul.pipeline.check.job.gate-grenade-dsvm-neutron-multinode.{SUCCESS,FAILURE})),'24hours'), 'gate-grenade-dsvm-neutron-multinode') diff --git a/jenkins/jobs/devstack-gate.yaml b/jenkins/jobs/devstack-gate.yaml index f0a19034e2..a33a32016b 100644 --- a/jenkins/jobs/devstack-gate.yaml +++ b/jenkins/jobs/devstack-gate.yaml @@ -2290,6 +2290,7 @@ - '{pipeline}-tempest-dsvm-full-{node}{job-suffix}' - '{pipeline}-tempest-dsvm-neutron-full-{node}{job-suffix}' - '{pipeline}-tempest-dsvm-neutron-pg-full-{node}{job-suffix}' + - '{pipeline}-tempest-dsvm-neutron-dvr-{node}{job-suffix}' - job-group: name: devstack-jobs @@ -2325,7 +2326,7 @@ - '{pipeline}-tempest-dsvm-lxc-ubuntu-trusty{job-suffix}' - '{pipeline}-tempest-dsvm-lvm{job-suffix}' - '{pipeline}-tempest-dsvm-neutron-dvr-ovs-native{job-suffix}' - - '{pipeline}-tempest-dsvm-neutron-dvr{job-suffix}' + - '{pipeline}-tempest-dsvm-neutron-dvr-{node}{job-suffix}' - '{pipeline}-tempest-dsvm-neutron-full-non-admin{job-suffix}' - '{pipeline}-tempest-dsvm-neutron-full-ssh{job-suffix}' - '{pipeline}-tempest-dsvm-neutron-full-test-accounts{job-suffix}' diff --git a/jenkins/jobs/neutron.yaml b/jenkins/jobs/neutron.yaml index 54358d832b..420bf55216 100644 --- a/jenkins/jobs/neutron.yaml +++ b/jenkins/jobs/neutron.yaml @@ -83,7 +83,7 @@ - console-log - job-template: - name: '{pipeline}-tempest-dsvm-neutron-dvr{job-suffix}' + name: '{pipeline}-tempest-dsvm-neutron-dvr-{node}{job-suffix}' node: '{node}' wrappers: @@ -407,7 +407,7 @@ - console-log - job-template: - name: '{pipeline}-tempest-dsvm-neutron-linuxbridge{job-suffix}' + name: '{pipeline}-tempest-dsvm-neutron-linuxbridge-{node}{job-suffix}' node: '{node}' wrappers: diff --git a/jenkins/jobs/projects.yaml b/jenkins/jobs/projects.yaml index ee9ae9e979..d9b5128d85 100644 --- a/jenkins/jobs/projects.yaml +++ b/jenkins/jobs/projects.yaml @@ -6977,11 +6977,16 @@ job-suffix: '' branch-override: default which: '-pecan' - - '{pipeline}-tempest-dsvm-neutron-linuxbridge{job-suffix}': + - '{pipeline}-tempest-dsvm-neutron-linuxbridge-{node}{job-suffix}': pipeline: gate node: ubuntu-trusty job-suffix: '' branch-override: default + - '{pipeline}-tempest-dsvm-neutron-linuxbridge-{node}{job-suffix}': + pipeline: gate + node: ubuntu-xenial + job-suffix: '' + branch-override: default - '{pipeline}-tempest-dsvm-neutron-ipv6only{job-suffix}': pipeline: gate node: ubuntu-trusty diff --git a/zuul/layout.yaml b/zuul/layout.yaml index 37b54b6495..b8b9bf7015 100755 --- a/zuul/layout.yaml +++ b/zuul/layout.yaml @@ -2015,7 +2015,7 @@ jobs: # Only run the neutron LB job on nova if there are changes to nova/network/* # TODO(mriedem): Run this proper on all changes once nova-network is dropped. - - name: gate-tempest-dsvm-neutron-linuxbridge + - name: ^gate-tempest-dsvm-neutron-linuxbridge-ubuntu-(trusty|xenial)$ skip-if: - project: ^openstack/nova$ all-files-match-any: @@ -3350,10 +3350,12 @@ projects: - gate-grenade-dsvm-neutron-multinode experimental: - gate-neutron-dsvm-functional-ubuntu-trusty - - gate-tempest-dsvm-neutron-dvr + - gate-tempest-dsvm-neutron-dvr-ubuntu-trusty + - gate-tempest-dsvm-neutron-dvr-ubuntu-xenial - gate-tempest-dsvm-neutron-dvr-multinode-full-ubuntu-trusty - gate-tempest-dsvm-neutron-dvr-multinode-full-ubuntu-xenial - - gate-tempest-dsvm-neutron-linuxbridge + - gate-tempest-dsvm-neutron-linuxbridge-ubuntu-trusty + - gate-tempest-dsvm-neutron-linuxbridge-ubuntu-xenial - gate-tempest-dsvm-neutron-placement-full-ubuntu-xenial-nv - gate-tempest-dsvm-cells - gate-dsvm-mongodb-zaqar @@ -11118,9 +11120,11 @@ projects: - gate-neutron-dsvm-functional-ubuntu-trusty - gate-neutron-dsvm-fullstack-ubuntu-trusty - gate-rally-dsvm-neutron-neutron - - gate-tempest-dsvm-neutron-dvr + - gate-tempest-dsvm-neutron-dvr-ubuntu-trusty + - gate-tempest-dsvm-neutron-dvr-ubuntu-xenial - gate-tempest-dsvm-neutron-identity-v3-only-full-nv - - gate-tempest-dsvm-neutron-linuxbridge + - gate-tempest-dsvm-neutron-linuxbridge-ubuntu-trusty + - gate-tempest-dsvm-neutron-linuxbridge-ubuntu-xenial - gate-neutron-lbaasv2-dsvm-minimal - gate-grenade-dsvm-neutron-multinode - gate-grenade-dsvm-neutron-dvr-multinode @@ -11132,8 +11136,10 @@ projects: gate: - neutron-coverage-ubuntu-xenial - gate-neutron-dsvm-api - - gate-tempest-dsvm-neutron-dvr - - gate-tempest-dsvm-neutron-linuxbridge + - gate-tempest-dsvm-neutron-dvr-ubuntu-trusty + - gate-tempest-dsvm-neutron-dvr-ubuntu-xenial + - gate-tempest-dsvm-neutron-linuxbridge-ubuntu-trusty + - gate-tempest-dsvm-neutron-linuxbridge-ubuntu-xenial - gate-grenade-dsvm-neutron-multinode - gate-grenade-dsvm-neutron-dvr-multinode post: @@ -11346,7 +11352,8 @@ projects: - gate-tempest-dsvm-ironic-ipa-partition-pxe_ssh-tinyipa-nv - gate-tempest-dsvm-cells - gate-tempest-dsvm-full-devstack-plugin-ceph - - gate-tempest-dsvm-neutron-linuxbridge + - gate-tempest-dsvm-neutron-linuxbridge-ubuntu-trusty + - gate-tempest-dsvm-neutron-linuxbridge-ubuntu-xenial - gate-tempest-dsvm-neutron-multinode-full-ubuntu-trusty - gate-tempest-dsvm-neutron-multinode-full-ubuntu-xenial - gate-tempest-dsvm-neutron-placement-full-ubuntu-xenial-nv @@ -15878,7 +15885,8 @@ projects: - gate-puppet-openstack-integration-3-scenario003-tempest-centos-7-nv # jobs for other configs - gate-tempest-dsvm-layer4 - - gate-tempest-dsvm-neutron-dvr + - gate-tempest-dsvm-neutron-dvr-ubuntu-trusty + - gate-tempest-dsvm-neutron-dvr-ubuntu-xenial # mitaka compat jobs for tempest master - gate-tempest-dsvm-full-ubuntu-trusty-mitaka - gate-tempest-dsvm-neutron-full-ubuntu-trusty-mitaka