summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-06-22 08:55:52 +0000
committerGerrit Code Review <review@openstack.org>2017-06-22 08:55:52 +0000
commit2a2e54e2f1c017df93e2e96f10c5e773479b6ab6 (patch)
tree61c16bf424106cdf517764b669ad05996e2803ab
parent68073b30dfd19d877c3d72a333a38d59b8b9ae97 (diff)
parent93c5ac6cd79bf3e46cf1d5edcc4ff98306ca4739 (diff)
Merge "networking-midonet: Remove mitaka jobs"
-rw-r--r--grafana/networking-midonet.yaml3
-rw-r--r--jenkins/jobs/networking-midonet.yaml62
-rw-r--r--jenkins/jobs/projects.yaml24
-rwxr-xr-xzuul/layout.yaml18
4 files changed, 4 insertions, 103 deletions
diff --git a/grafana/networking-midonet.yaml b/grafana/networking-midonet.yaml
index 35a266f..c27b860 100644
--- a/grafana/networking-midonet.yaml
+++ b/grafana/networking-midonet.yaml
@@ -51,10 +51,7 @@ dashboard:
51 - target: alias(movingAverage(asPercent(transformNull(stats_counts.zuul.pipeline.periodic.job.periodic-tempest-dsvm-networking-midonet-ml2-full-ubuntu-xenial-ocata.FAILURE),sum(stats_counts.zuul.pipeline.periodic.job.periodic-tempest-dsvm-networking-midonet-ml2-full-ubuntu-xenial-ocata.{SUCCESS,FAILURE})),'24hours'), 'periodic-tempest-dsvm-networking-midonet-ml2-full-ubuntu-xenial-ocata') 51 - target: alias(movingAverage(asPercent(transformNull(stats_counts.zuul.pipeline.periodic.job.periodic-tempest-dsvm-networking-midonet-ml2-full-ubuntu-xenial-ocata.FAILURE),sum(stats_counts.zuul.pipeline.periodic.job.periodic-tempest-dsvm-networking-midonet-ml2-full-ubuntu-xenial-ocata.{SUCCESS,FAILURE})),'24hours'), 'periodic-tempest-dsvm-networking-midonet-ml2-full-ubuntu-xenial-ocata')
52 - target: alias(movingAverage(asPercent(transformNull(stats_counts.zuul.pipeline.periodic.job.periodic-tempest-dsvm-networking-midonet-v2-full-ubuntu-xenial-ocata.FAILURE),sum(stats_counts.zuul.pipeline.periodic.job.periodic-tempest-dsvm-networking-midonet-v2-full-ubuntu-xenial-ocata.{SUCCESS,FAILURE})),'24hours'), 'periodic-tempest-dsvm-networking-midonet-v2-full-ubuntu-xenial-ocata') 52 - target: alias(movingAverage(asPercent(transformNull(stats_counts.zuul.pipeline.periodic.job.periodic-tempest-dsvm-networking-midonet-v2-full-ubuntu-xenial-ocata.FAILURE),sum(stats_counts.zuul.pipeline.periodic.job.periodic-tempest-dsvm-networking-midonet-v2-full-ubuntu-xenial-ocata.{SUCCESS,FAILURE})),'24hours'), 'periodic-tempest-dsvm-networking-midonet-v2-full-ubuntu-xenial-ocata')
53 - target: alias(movingAverage(asPercent(transformNull(stats_counts.zuul.pipeline.periodic.job.periodic-tempest-dsvm-networking-midonet-v2-ubuntu-xenial-newton.FAILURE),sum(stats_counts.zuul.pipeline.periodic.job.periodic-tempest-dsvm-networking-midonet-v2-ubuntu-xenial-newton.{SUCCESS,FAILURE})),'24hours'), 'periodic-tempest-dsvm-networking-midonet-v2-ubuntu-xenial-newton') 53 - target: alias(movingAverage(asPercent(transformNull(stats_counts.zuul.pipeline.periodic.job.periodic-tempest-dsvm-networking-midonet-v2-ubuntu-xenial-newton.FAILURE),sum(stats_counts.zuul.pipeline.periodic.job.periodic-tempest-dsvm-networking-midonet-v2-ubuntu-xenial-newton.{SUCCESS,FAILURE})),'24hours'), 'periodic-tempest-dsvm-networking-midonet-v2-ubuntu-xenial-newton')
54 - target: alias(movingAverage(asPercent(transformNull(stats_counts.zuul.pipeline.periodic.job.periodic-tempest-dsvm-networking-midonet-v2-ubuntu-trusty-mitaka.FAILURE),sum(stats_counts.zuul.pipeline.periodic.job.periodic-tempest-dsvm-networking-midonet-v2-ubuntu-trusty-mitaka.{SUCCESS,FAILURE})),'24hours'), 'periodic-tempest-dsvm-networking-midonet-v2-ubuntu-trusty-mitaka')
55 - target: alias(movingAverage(asPercent(transformNull(stats_counts.zuul.pipeline.periodic-stable.job.periodic-networking-midonet-python27-ocata.FAILURE),sum(stats_counts.zuul.pipeline.periodic-stable.job.periodic-networking-midonet-python27-ocata.{SUCCESS,FAILURE})),'24hours'), 'periodic-networking-midonet-python27-ocata') 54 - target: alias(movingAverage(asPercent(transformNull(stats_counts.zuul.pipeline.periodic-stable.job.periodic-networking-midonet-python27-ocata.FAILURE),sum(stats_counts.zuul.pipeline.periodic-stable.job.periodic-networking-midonet-python27-ocata.{SUCCESS,FAILURE})),'24hours'), 'periodic-networking-midonet-python27-ocata')
56 - target: alias(movingAverage(asPercent(transformNull(stats_counts.zuul.pipeline.periodic-stable.job.periodic-networking-midonet-python27-newton.FAILURE),sum(stats_counts.zuul.pipeline.periodic-stable.job.periodic-networking-midonet-python27-newton.{SUCCESS,FAILURE})),'24hours'), 'periodic-networking-midonet-python27-newton') 55 - target: alias(movingAverage(asPercent(transformNull(stats_counts.zuul.pipeline.periodic-stable.job.periodic-networking-midonet-python27-newton.FAILURE),sum(stats_counts.zuul.pipeline.periodic-stable.job.periodic-networking-midonet-python27-newton.{SUCCESS,FAILURE})),'24hours'), 'periodic-networking-midonet-python27-newton')
57 - target: alias(movingAverage(asPercent(transformNull(stats_counts.zuul.pipeline.periodic-stable.job.periodic-networking-midonet-python27-mitaka.FAILURE),sum(stats_counts.zuul.pipeline.periodic-stable.job.periodic-networking-midonet-python27-mitaka.{SUCCESS,FAILURE})),'24hours'), 'periodic-networking-midonet-python27-mitaka')
58 - target: alias(movingAverage(asPercent(transformNull(stats_counts.zuul.pipeline.periodic-stable.job.periodic-networking-midonet-docs-mitaka.FAILURE),sum(stats_counts.zuul.pipeline.periodic-stable.job.periodic-networking-midonet-docs-mitaka.{SUCCESS,FAILURE})),'24hours'), 'periodic-networking-midonet-docs-mitaka')
59 - target: alias(movingAverage(asPercent(transformNull(stats_counts.zuul.pipeline.periodic.job.periodic-networking-midonet-py35-with-neutron-lib-master.FAILURE),sum(stats_counts.zuul.pipeline.periodic.job.periodic-networking-midonet-py35-with-neutron-lib-master.{SUCCESS,FAILURE})),'24hours'), 'periodic-networking-midonet-py35-with-neutron-lib-master') 56 - target: alias(movingAverage(asPercent(transformNull(stats_counts.zuul.pipeline.periodic.job.periodic-networking-midonet-py35-with-neutron-lib-master.FAILURE),sum(stats_counts.zuul.pipeline.periodic.job.periodic-networking-midonet-py35-with-neutron-lib-master.{SUCCESS,FAILURE})),'24hours'), 'periodic-networking-midonet-py35-with-neutron-lib-master')
60 type: graph 57 type: graph
diff --git a/jenkins/jobs/networking-midonet.yaml b/jenkins/jobs/networking-midonet.yaml
index 7610f8e..0b6d292 100644
--- a/jenkins/jobs/networking-midonet.yaml
+++ b/jenkins/jobs/networking-midonet.yaml
@@ -1,66 +1,4 @@
1- job-template: 1- job-template:
2 name: '{pipeline}-tempest-dsvm-networking-midonet-v1-{node}{suffix}'
3 node: '{node}'
4
5 wrappers:
6 - build-timeout:
7 timeout: 130
8 - timestamps
9
10 builders:
11 - print-template-name:
12 template-name: "{template-name}"
13 - link-logs
14 - net-info
15 - devstack-checkout
16 - shell: |
17 #!/bin/bash -xe
18 export PYTHONUNBUFFERED=true
19 export DEVSTACK_GATE_NEUTRON=1
20 export DEVSTACK_GATE_TEMPEST=1
21 export BRANCH_OVERRIDE={branch-override}
22 if [ "$BRANCH_OVERRIDE" != "default" ] ; then
23 export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE
24 fi
25 # Because we are testing a non standard project, add
26 # our project repository. This makes zuul do the right
27 # reference magic for testing changes.
28 export PROJECTS="openstack/networking-midonet $PROJECTS"
29
30 if [[ ! "stable/mitaka" =~ $ZUUL_BRANCH ]]; then
31 function gate_hook {{
32 bash -xe $BASE/new/networking-midonet/devstack/ci/gate_hook.sh v1
33 }}
34 export -f gate_hook
35 else
36 # Note the actual url here is somewhat irrelevant because it
37 # caches in nodepool, however make it a valid url for
38 # documentation purposes.
39 export DEVSTACK_LOCAL_CONFIG="enable_plugin networking-midonet git://git.openstack.org/openstack/networking-midonet"
40 export DEVSTACK_LOCAL_CONFIG+=$'\n'"Q_PLUGIN=midonet"
41 export DEVSTACK_LOCAL_CONFIG+=$'\n'"TEMPEST_RUN_VALIDATION=True"
42
43 # Enable MidoNet v1 architecture
44 export DEVSTACK_LOCAL_CONFIG+=$'\n'"MIDONET_PLUGIN=midonet.neutron.plugin_v1.MidonetPluginV2"
45 export DEVSTACK_LOCAL_CONFIG+=$'\n'"MIDONET_CLIENT=midonet.neutron.client.api.MidonetApiClient"
46 export DEVSTACK_LOCAL_CONFIG+=$'\n'"MIDONET_USE_ZOOM=False"
47 # NOTE(yamamoto): v2015.06 is the latest stable releases
48 # with v1 support.
49 # REVISIT(yamamoto): Consider switching to stable/v2015.06.4
50 # when available.
51 export DEVSTACK_LOCAL_CONFIG+=$'\n'"MIDONET_BRANCH=staging/v2015.06"
52 fi
53
54 export DEVSTACK_GATE_SETTINGS=/opt/stack/new/networking-midonet/devstack/devstackgaterc
55
56 cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh
57 ./safe-devstack-vm-gate-wrap.sh
58
59 publishers:
60 - devstack-logs
61 - console-log
62
63- job-template:
64 name: '{pipeline}-tempest-dsvm-networking-midonet-{midonet-plugin}-{node}{suffix}' 2 name: '{pipeline}-tempest-dsvm-networking-midonet-{midonet-plugin}-{node}{suffix}'
65 node: '{node}' 3 node: '{node}'
66 4
diff --git a/jenkins/jobs/projects.yaml b/jenkins/jobs/projects.yaml
index 698f516..5f8de6d 100644
--- a/jenkins/jobs/projects.yaml
+++ b/jenkins/jobs/projects.yaml
@@ -7767,7 +7767,6 @@
7767 jobs: 7767 jobs:
7768 - coverage-jobs 7768 - coverage-jobs
7769 - python-jobs 7769 - python-jobs
7770 - python-mitaka-bitrot-jobs
7771 - python-newton-bitrot-jobs 7770 - python-newton-bitrot-jobs
7772 - python-ocata-bitrot-jobs 7771 - python-ocata-bitrot-jobs
7773 - pypi-jobs 7772 - pypi-jobs
@@ -7775,11 +7774,6 @@
7775 - translation-jobs 7774 - translation-jobs
7776 - openstack-releasenotes-jobs 7775 - openstack-releasenotes-jobs
7777 - periodic-python-jobs-with-neutron-lib-master 7776 - periodic-python-jobs-with-neutron-lib-master
7778 - '{pipeline}-tempest-dsvm-networking-midonet-v1-{node}{suffix}':
7779 pipeline: gate
7780 node: ubuntu-trusty
7781 suffix: '-nv'
7782 branch-override: default
7783 - '{pipeline}-tempest-dsvm-networking-midonet-{midonet-plugin}-{node}{suffix}': 7777 - '{pipeline}-tempest-dsvm-networking-midonet-{midonet-plugin}-{node}{suffix}':
7784 pipeline: gate 7778 pipeline: gate
7785 midonet-plugin: v2 7779 midonet-plugin: v2
@@ -7799,12 +7793,6 @@
7799 suffix: '-nv' 7793 suffix: '-nv'
7800 branch-override: default 7794 branch-override: default
7801 - '{pipeline}-tempest-dsvm-networking-midonet-{midonet-plugin}-{node}{suffix}': 7795 - '{pipeline}-tempest-dsvm-networking-midonet-{midonet-plugin}-{node}{suffix}':
7802 pipeline: gate
7803 midonet-plugin: v2
7804 node: ubuntu-trusty
7805 suffix: ''
7806 branch-override: default
7807 - '{pipeline}-tempest-dsvm-networking-midonet-{midonet-plugin}-{node}{suffix}':
7808 pipeline: periodic 7796 pipeline: periodic
7809 midonet-plugin: ml2-full 7797 midonet-plugin: ml2-full
7810 node: ubuntu-xenial 7798 node: ubuntu-xenial
@@ -7823,12 +7811,6 @@
7823 suffix: '-newton' 7811 suffix: '-newton'
7824 branch-override: stable/newton 7812 branch-override: stable/newton
7825 - '{pipeline}-tempest-dsvm-networking-midonet-{midonet-plugin}-{node}{suffix}': 7813 - '{pipeline}-tempest-dsvm-networking-midonet-{midonet-plugin}-{node}{suffix}':
7826 pipeline: periodic
7827 midonet-plugin: v2
7828 node: ubuntu-trusty
7829 suffix: '-mitaka'
7830 branch-override: stable/mitaka
7831 - '{pipeline}-tempest-dsvm-networking-midonet-{midonet-plugin}-{node}{suffix}':
7832 pipeline: gate 7814 pipeline: gate
7833 midonet-plugin: ml2 7815 midonet-plugin: ml2
7834 node: ubuntu-xenial 7816 node: ubuntu-xenial
@@ -7858,12 +7840,6 @@
7858 node: ubuntu-xenial 7840 node: ubuntu-xenial
7859 suffix: '-nv' 7841 suffix: '-nv'
7860 branch-override: default 7842 branch-override: default
7861 - '{pipeline}-tempest-dsvm-networking-midonet-{midonet-plugin}-{node}{suffix}':
7862 pipeline: gate
7863 midonet-plugin: ml2
7864 node: ubuntu-trusty
7865 suffix: '-nv'
7866 branch-override: default
7867 - '{pipeline}-networking-midonet-rally-dsvm-{midonet-plugin}-{node}{suffix}': 7843 - '{pipeline}-networking-midonet-rally-dsvm-{midonet-plugin}-{node}{suffix}':
7868 pipeline: gate 7844 pipeline: gate
7869 midonet-plugin: v2 7845 midonet-plugin: v2
diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index dc2f3a2..72cadeb 100755
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -2511,16 +2511,16 @@ jobs:
2511 branch: ^(?!stable/mitaka).*$ 2511 branch: ^(?!stable/mitaka).*$
2512 2512
2513 - name: ^gate-tempest-dsvm-networking-midonet-.+-full-ubuntu-xenial 2513 - name: ^gate-tempest-dsvm-networking-midonet-.+-full-ubuntu-xenial
2514 branch: ^(?!stable/(mitaka|newton)).*$ 2514 branch: ^(?!stable/newton).*$
2515 2515
2516 - name: ^gate-tempest-dsvm-networking-midonet-.+-full-legacy-ubuntu-xenial 2516 - name: ^gate-tempest-dsvm-networking-midonet-.+-full-legacy-ubuntu-xenial
2517 branch: ^(?!stable/(mitaka|newton|ocata)).*$ 2517 branch: ^(?!stable/(newton|ocata)).*$
2518 2518
2519 - name: ^gate-grenade-dsvm-networking-midonet-ml2-ubuntu-xenial 2519 - name: ^gate-grenade-dsvm-networking-midonet-ml2-ubuntu-xenial
2520 branch: ^(?!stable/(mitaka|newton)).*$ 2520 branch: ^(?!stable/newton).*$
2521 2521
2522 - name: ^gate-grenade-dsvm-networking-midonet-v2-ubuntu-xenial 2522 - name: ^gate-grenade-dsvm-networking-midonet-v2-ubuntu-xenial
2523 branch: ^(?!stable/(mitaka|newton|ocata)).*$ 2523 branch: ^(?!stable/(newton|ocata)).*$
2524 2524
2525 - name: ^gate-networking-midonet-rally-dsvm-.+-ubuntu-xenial 2525 - name: ^gate-networking-midonet-rally-dsvm-.+-ubuntu-xenial
2526 branch: ^(?!stable/newton).*$ 2526 branch: ^(?!stable/newton).*$
@@ -12790,7 +12790,6 @@ projects:
12790 - name: python-jobs 12790 - name: python-jobs
12791 - name: python34-jobs 12791 - name: python34-jobs
12792 - name: python35-jobs 12792 - name: python35-jobs
12793 - name: periodic-mitaka
12794 - name: periodic-newton 12793 - name: periodic-newton
12795 - name: periodic-ocata 12794 - name: periodic-ocata
12796 - name: periodic-jobs-with-neutron-lib-master 12795 - name: periodic-jobs-with-neutron-lib-master
@@ -12799,29 +12798,20 @@ projects:
12799 - name: release-notes-jobs 12798 - name: release-notes-jobs
12800 - name: translation-jobs 12799 - name: translation-jobs
12801 check: 12800 check:
12802 # NOTE(yamamoto): No v1 xenial job as it isn't compatible with xenial.
12803 - gate-tempest-dsvm-networking-midonet-v1-ubuntu-trusty-nv
12804 - gate-tempest-dsvm-networking-midonet-v2-ubuntu-xenial 12801 - gate-tempest-dsvm-networking-midonet-v2-ubuntu-xenial
12805 - gate-tempest-dsvm-networking-midonet-v2-full-ubuntu-xenial-nv 12802 - gate-tempest-dsvm-networking-midonet-v2-full-ubuntu-xenial-nv
12806 - gate-tempest-dsvm-networking-midonet-v2-ubuntu-trusty
12807 # NOTE(yamamoto): ml2 job is voting only for Newton and later,
12808 # which happen to use xenial.
12809 - gate-tempest-dsvm-networking-midonet-ml2-ubuntu-xenial 12803 - gate-tempest-dsvm-networking-midonet-ml2-ubuntu-xenial
12810 - gate-tempest-dsvm-networking-midonet-ml2-centos-7-nv 12804 - gate-tempest-dsvm-networking-midonet-ml2-centos-7-nv
12811 - gate-tempest-dsvm-networking-midonet-ml2-full-ubuntu-xenial-nv 12805 - gate-tempest-dsvm-networking-midonet-ml2-full-ubuntu-xenial-nv
12812 - gate-tempest-dsvm-networking-midonet-ml2-full-centos-7-nv 12806 - gate-tempest-dsvm-networking-midonet-ml2-full-centos-7-nv
12813 - gate-tempest-dsvm-networking-midonet-ml2-ubuntu-trusty-nv
12814 - networking-midonet-coverage-ubuntu-trusty-nv
12815 - networking-midonet-coverage-ubuntu-xenial-nv 12807 - networking-midonet-coverage-ubuntu-xenial-nv
12816 - gate-grenade-dsvm-networking-midonet-ml2-ubuntu-xenial-nv 12808 - gate-grenade-dsvm-networking-midonet-ml2-ubuntu-xenial-nv
12817 - gate-networking-midonet-rally-dsvm-ml2-ubuntu-xenial-nv 12809 - gate-networking-midonet-rally-dsvm-ml2-ubuntu-xenial-nv
12818 - gate-networking-midonet-rally-dsvm-v2-ubuntu-xenial-nv 12810 - gate-networking-midonet-rally-dsvm-v2-ubuntu-xenial-nv
12819 gate: 12811 gate:
12820 - gate-tempest-dsvm-networking-midonet-v2-ubuntu-xenial 12812 - gate-tempest-dsvm-networking-midonet-v2-ubuntu-xenial
12821 - gate-tempest-dsvm-networking-midonet-v2-ubuntu-trusty
12822 - gate-tempest-dsvm-networking-midonet-ml2-ubuntu-xenial 12813 - gate-tempest-dsvm-networking-midonet-ml2-ubuntu-xenial
12823 periodic: 12814 periodic:
12824 - periodic-tempest-dsvm-networking-midonet-v2-ubuntu-trusty-mitaka
12825 - periodic-tempest-dsvm-networking-midonet-v2-ubuntu-xenial-newton 12815 - periodic-tempest-dsvm-networking-midonet-v2-ubuntu-xenial-newton
12826 - periodic-tempest-dsvm-networking-midonet-v2-full-ubuntu-xenial-ocata 12816 - periodic-tempest-dsvm-networking-midonet-v2-full-ubuntu-xenial-ocata
12827 - periodic-tempest-dsvm-networking-midonet-ml2-full-ubuntu-xenial-ocata 12817 - periodic-tempest-dsvm-networking-midonet-ml2-full-ubuntu-xenial-ocata