From 25aded856880c881c059258f821d3547d7c517a9 Mon Sep 17 00:00:00 2001 From: Clark Boylan Date: Wed, 7 Sep 2016 15:13:01 -0700 Subject: [PATCH] Add neutron api test on xenial to experimental This job isn't currently passing on xenial instances. Continue to run the existing job on trusty for check and gate against all branches but add a xenial job that can be run in experimental so that this can be corrected. Change-Id: I454b21ed81de57c392575e6a5b3cf731500c6138 --- grafana/neutron.yaml | 4 ++-- jenkins/jobs/neutron.yaml | 2 +- jenkins/jobs/projects.yaml | 16 ++++++++++++++-- zuul/layout.yaml | 13 ++++++++++--- 4 files changed, 27 insertions(+), 8 deletions(-) diff --git a/grafana/neutron.yaml b/grafana/neutron.yaml index 1d86ce5349..3fe5043795 100644 --- a/grafana/neutron.yaml +++ b/grafana/neutron.yaml @@ -48,7 +48,7 @@ dashboard: targets: - 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-neutron-dsvm-api{,-ubuntu-trusty,-ubuntu-xenial}.FAILURE),sum(stats_counts.zuul.pipeline.gate.job.gate-neutron-dsvm-api{,-ubuntu-trusty,-ubuntu-xenial}.{SUCCESS,FAILURE})),'24hours'), 'gate-neutron-dsvm-api') - 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 @@ -70,7 +70,7 @@ dashboard: - title: API/Functional/Fullstack Failure Rates/KeystoneV3 (Check queue) span: 4 targets: - - target: alias(movingAverage(asPercent(transformNull(stats_counts.zuul.pipeline.check.job.gate-neutron-dsvm-api.FAILURE),sum(stats_counts.zuul.pipeline.check.job.gate-neutron-dsvm-api.{SUCCESS,FAILURE})),'24hours'), 'gate-neutron-dsvm-api') + - target: alias(movingAverage(asPercent(transformNull(stats_counts.zuul.pipeline.check.job.gate-neutron-dsvm-api{,-ubuntu-trusty,-ubuntu-xenial}.FAILURE),sum(stats_counts.zuul.pipeline.check.job.gate-neutron-dsvm-api{,-ubuntu-trusty,-ubuntu-xenial}.{SUCCESS,FAILURE})),'24hours'), 'gate-neutron-dsvm-api') - target: alias(movingAverage(asPercent(transformNull(stats_counts.zuul.pipeline.check.job.gate-neutron-dsvm-functional-ubuntu-trusty.FAILURE),sum(stats_counts.zuul.pipeline.check.job.gate-neutron-dsvm-functional-ubuntu-trusty.{SUCCESS,FAILURE})),'24hours'), 'gate-neutron-dsvm-functional-ubuntu-trusty') - target: alias(movingAverage(asPercent(transformNull(stats_counts.zuul.pipeline.check.job.gate-neutron-dsvm-fullstack-ubuntu-trusty.FAILURE),sum(stats_counts.zuul.pipeline.check.job.gate-neutron-dsvm-fullstack-ubuntu-trusty.{SUCCESS,FAILURE})),'24hours'), 'gate-neutron-dsvm-fullstack-ubuntu-trusty') - target: alias(movingAverage(asPercent(transformNull(stats_counts.zuul.pipeline.check.job.gate-tempest-dsvm-neutron-identity-v3-only-full-nv.FAILURE),sum(stats_counts.zuul.pipeline.check.job.gate-tempest-dsvm-neutron-identity-v3-only-full-nv.{SUCCESS,FAILURE})),'24hours'), 'gate-tempest-dsvm-neutron-identity-v3-only-full-nv') diff --git a/jenkins/jobs/neutron.yaml b/jenkins/jobs/neutron.yaml index 420bf55216..77d142a330 100644 --- a/jenkins/jobs/neutron.yaml +++ b/jenkins/jobs/neutron.yaml @@ -28,7 +28,7 @@ - console-log - job-template: - name: '{pipeline}-neutron-dsvm-api{which}{job-suffix}' + name: '{pipeline}-neutron-dsvm-api{which}-{node}{job-suffix}' node: '{node}' wrappers: diff --git a/jenkins/jobs/projects.yaml b/jenkins/jobs/projects.yaml index d9b5128d85..a71f56652a 100644 --- a/jenkins/jobs/projects.yaml +++ b/jenkins/jobs/projects.yaml @@ -6965,18 +6965,30 @@ node: ubuntu-xenial job-suffix: '' branch-override: default - - '{pipeline}-neutron-dsvm-api{which}{job-suffix}': + - '{pipeline}-neutron-dsvm-api{which}-{node}{job-suffix}': pipeline: gate node: ubuntu-trusty job-suffix: '' branch-override: default which: '' - - '{pipeline}-neutron-dsvm-api{which}{job-suffix}': + - '{pipeline}-neutron-dsvm-api{which}-{node}{job-suffix}': pipeline: gate node: ubuntu-trusty job-suffix: '' branch-override: default which: '-pecan' + - '{pipeline}-neutron-dsvm-api{which}-{node}{job-suffix}': + pipeline: gate + node: ubuntu-xenial + job-suffix: '' + branch-override: default + which: '' + - '{pipeline}-neutron-dsvm-api{which}-{node}{job-suffix}': + pipeline: gate + node: ubuntu-xenial + job-suffix: '' + branch-override: default + which: '-pecan' - '{pipeline}-tempest-dsvm-neutron-linuxbridge-{node}{job-suffix}': pipeline: gate node: ubuntu-trusty diff --git a/zuul/layout.yaml b/zuul/layout.yaml index b8b9bf7015..647f89693a 100755 --- a/zuul/layout.yaml +++ b/zuul/layout.yaml @@ -2768,6 +2768,11 @@ jobs: branch: ^(master|stable/(liberty|mitaka|newton))$ voting: false + # NOTE(clarkb): This job should run on Mitaka and earlier stable branches in + # the future. + - name: gate-neutron-dsvm-api-ubuntu-trusty + branch: ^(master|stable/(liberty|mitaka|newton))$ + - name: gate-tacker-dsvm-functional voting: false @@ -11116,7 +11121,7 @@ projects: - name: release-notes-jobs check: - neutron-coverage-ubuntu-xenial - - gate-neutron-dsvm-api + - gate-neutron-dsvm-api-ubuntu-trusty - gate-neutron-dsvm-functional-ubuntu-trusty - gate-neutron-dsvm-fullstack-ubuntu-trusty - gate-rally-dsvm-neutron-neutron @@ -11135,7 +11140,7 @@ projects: - gate-tempest-dsvm-ironic-ipa-partition-pxe_ssh-tinyipa-nv gate: - neutron-coverage-ubuntu-xenial - - gate-neutron-dsvm-api + - gate-neutron-dsvm-api-ubuntu-trusty - gate-tempest-dsvm-neutron-dvr-ubuntu-trusty - gate-tempest-dsvm-neutron-dvr-ubuntu-xenial - gate-tempest-dsvm-neutron-linuxbridge-ubuntu-trusty @@ -11159,7 +11164,9 @@ projects: - gate-tempest-dsvm-neutron-serviceipv6 - gate-tempest-dsvm-neutron-ovs-native - gate-tempest-dsvm-neutron-dvr-ovs-native - - gate-neutron-dsvm-api-pecan + - gate-neutron-dsvm-api-ubuntu-xenial + - gate-neutron-dsvm-api-pecan-ubuntu-trusty + - gate-neutron-dsvm-api-pecan-ubuntu-xenial - gate-tempest-dsvm-neutron-pecan - gate-tempest-dsvm-neutron-src-neutron-lib - gate-grenade-dsvm-neutron-linuxbridge-multinode-nv