From 3d8106f7980d2032840d6d34b373b5dd1e7cf545 Mon Sep 17 00:00:00 2001 From: Andreas Jaeger Date: Mon, 6 Feb 2017 21:24:46 +0100 Subject: [PATCH] networking-sfc: Use normal python jobs This repo now uses tools/test-setup.sh we do not need the db jobs anymore, change to the standard python unit jobs. Update grafana files for this as well. Change-Id: I73696f3cc430b91b350755c8ed7c67838f13ab61 Depends-On: Icb4a1a0c45c534fdeccf00f6f2ce402c6ea6741b --- grafana/networking-sfc.yaml | 12 ++++++------ jenkins/jobs/projects.yaml | 2 +- zuul/layout.yaml | 6 +++--- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/grafana/networking-sfc.yaml b/grafana/networking-sfc.yaml index d60065e012..91c5d87380 100644 --- a/grafana/networking-sfc.yaml +++ b/grafana/networking-sfc.yaml @@ -16,16 +16,16 @@ dashboard: - title: Unit Test Failure Rates (Check queue) span: 4 targets: - - target: alias(movingAverage(asPercent(transformNull(stats_counts.zuul.pipeline.check.job.gate-networking-sfc-python27-db-ubuntu-xenial.FAILURE),sum(stats_counts.zuul.pipeline.check.job.gate-networking-sfc-python27-db-ubuntu-xenial.{SUCCESS,FAILURE})),'24hours'), 'gate-networking-sfc-python27-db-ubuntu-xenial') - - target: alias(movingAverage(asPercent(transformNull(stats_counts.zuul.pipeline.check.job.gate-networking-sfc-python34-db.FAILURE),sum(stats_counts.zuul.pipeline.check.job.gate-networking-sfc-python34-db.{SUCCESS,FAILURE})),'24hours'), 'gate-networking-sfc-python34-db') - - target: alias(movingAverage(asPercent(transformNull(stats_counts.zuul.pipeline.check.job.gate-networking-sfc-python35-db.FAILURE),sum(stats_counts.zuul.pipeline.check.job.gate-networking-sfc-python35-db.{SUCCESS,FAILURE})),'24hours'), 'gate-networking-sfc-python35-db') + - target: alias(movingAverage(asPercent(transformNull(stats_counts.zuul.pipeline.check.job.gate-networking-sfc-python27-ubuntu-xenial.FAILURE),sum(stats_counts.zuul.pipeline.check.job.gate-networking-sfc-python27-ubuntu-xenial.{SUCCESS,FAILURE})),'24hours'), 'gate-networking-sfc-python27-ubuntu-xenial') + - target: alias(movingAverage(asPercent(transformNull(stats_counts.zuul.pipeline.check.job.gate-networking-sfc-python34.FAILURE),sum(stats_counts.zuul.pipeline.check.job.gate-networking-sfc-python34.{SUCCESS,FAILURE})),'24hours'), 'gate-networking-sfc-python34') + - target: alias(movingAverage(asPercent(transformNull(stats_counts.zuul.pipeline.check.job.gate-networking-sfc-python35.FAILURE),sum(stats_counts.zuul.pipeline.check.job.gate-networking-sfc-python35.{SUCCESS,FAILURE})),'24hours'), 'gate-networking-sfc-python35') type: graph - title: Unit Test Failure Rates (Gate queue) span: 4 targets: - - target: alias(movingAverage(asPercent(transformNull(stats_counts.zuul.pipeline.gate.job.gate-networking-sfc-python27-db-ubuntu-xenial.FAILURE),sum(stats_counts.zuul.pipeline.gate.job.gate-networking-sfc-python27-db-ubuntu-xenial.{SUCCESS,FAILURE})),'24hours'), 'gate-networking-sfc-python27-db-ubuntu-xenial') - - target: alias(movingAverage(asPercent(transformNull(stats_counts.zuul.pipeline.gate.job.gate-networking-sfc-python34-db.FAILURE),sum(stats_counts.zuul.pipeline.gate.job.gate-networking-sfc-python34-db.{SUCCESS,FAILURE})),'24hours'), 'gate-networking-sfc-python34-db') - - target: alias(movingAverage(asPercent(transformNull(stats_counts.zuul.pipeline.gate.job.gate-networking-sfc-python35-db.FAILURE),sum(stats_counts.zuul.pipeline.gate.job.gate-networking-sfc-python35-db.{SUCCESS,FAILURE})),'24hours'), 'gate-networking-sfc-python35-db') + - target: alias(movingAverage(asPercent(transformNull(stats_counts.zuul.pipeline.gate.job.gate-networking-sfc-python27-ubuntu-xenial.FAILURE),sum(stats_counts.zuul.pipeline.gate.job.gate-networking-sfc-python27-ubuntu-xenial.{SUCCESS,FAILURE})),'24hours'), 'gate-networking-sfc-python27-ubuntu-xenial') + - target: alias(movingAverage(asPercent(transformNull(stats_counts.zuul.pipeline.gate.job.gate-networking-sfc-python34.FAILURE),sum(stats_counts.zuul.pipeline.gate.job.gate-networking-sfc-python34.{SUCCESS,FAILURE})),'24hours'), 'gate-networking-sfc-python34') + - target: alias(movingAverage(asPercent(transformNull(stats_counts.zuul.pipeline.gate.job.gate-networking-sfc-python35.FAILURE),sum(stats_counts.zuul.pipeline.gate.job.gate-networking-sfc-python35.{SUCCESS,FAILURE})),'24hours'), 'gate-networking-sfc-python35') type: graph - title: Periodic Job Failure Rates span: 4 diff --git a/jenkins/jobs/projects.yaml b/jenkins/jobs/projects.yaml index 8be797d238..9836153151 100644 --- a/jenkins/jobs/projects.yaml +++ b/jenkins/jobs/projects.yaml @@ -7501,7 +7501,7 @@ name: networking-sfc jobs: - - python-db-jobs + - python-jobs - openstack-publish-jobs - openstack-releasenotes-jobs - pypi-jobs diff --git a/zuul/layout.yaml b/zuul/layout.yaml index 73ee9bfefa..69969392f9 100755 --- a/zuul/layout.yaml +++ b/zuul/layout.yaml @@ -12400,12 +12400,12 @@ projects: - name: openstack/networking-sfc template: - name: merge-check - - name: python-db-jobs + - name: python-jobs - name: openstack-server-publish-jobs - name: check-requirements - name: publish-to-pypi - - name: python34-db-jobs - - name: python35-db-jobs + - name: python34-jobs + - name: python35-jobs - name: periodic-jobs-with-neutron-lib-master - name: release-notes-jobs check: