diff --git a/grafana/networking-midonet.yaml b/grafana/networking-midonet.yaml index 35a266f9e4..c27b860631 100644 --- a/grafana/networking-midonet.yaml +++ b/grafana/networking-midonet.yaml @@ -51,10 +51,7 @@ dashboard: - 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') - 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') - 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') - - 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') - 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') - 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') - - 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') - - 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') - 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') type: graph diff --git a/jenkins/jobs/networking-midonet.yaml b/jenkins/jobs/networking-midonet.yaml index 7610f8e99b..0b6d2924e5 100644 --- a/jenkins/jobs/networking-midonet.yaml +++ b/jenkins/jobs/networking-midonet.yaml @@ -1,65 +1,3 @@ -- job-template: - name: '{pipeline}-tempest-dsvm-networking-midonet-v1-{node}{suffix}' - node: '{node}' - - wrappers: - - build-timeout: - timeout: 130 - - 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_NEUTRON=1 - export DEVSTACK_GATE_TEMPEST=1 - export BRANCH_OVERRIDE={branch-override} - if [ "$BRANCH_OVERRIDE" != "default" ] ; then - export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE - fi - # Because we are testing a non standard project, add - # our project repository. This makes zuul do the right - # reference magic for testing changes. - export PROJECTS="openstack/networking-midonet $PROJECTS" - - if [[ ! "stable/mitaka" =~ $ZUUL_BRANCH ]]; then - function gate_hook {{ - bash -xe $BASE/new/networking-midonet/devstack/ci/gate_hook.sh v1 - }} - export -f gate_hook - else - # Note the actual url here is somewhat irrelevant because it - # caches in nodepool, however make it a valid url for - # documentation purposes. - export DEVSTACK_LOCAL_CONFIG="enable_plugin networking-midonet git://git.openstack.org/openstack/networking-midonet" - export DEVSTACK_LOCAL_CONFIG+=$'\n'"Q_PLUGIN=midonet" - export DEVSTACK_LOCAL_CONFIG+=$'\n'"TEMPEST_RUN_VALIDATION=True" - - # Enable MidoNet v1 architecture - export DEVSTACK_LOCAL_CONFIG+=$'\n'"MIDONET_PLUGIN=midonet.neutron.plugin_v1.MidonetPluginV2" - export DEVSTACK_LOCAL_CONFIG+=$'\n'"MIDONET_CLIENT=midonet.neutron.client.api.MidonetApiClient" - export DEVSTACK_LOCAL_CONFIG+=$'\n'"MIDONET_USE_ZOOM=False" - # NOTE(yamamoto): v2015.06 is the latest stable releases - # with v1 support. - # REVISIT(yamamoto): Consider switching to stable/v2015.06.4 - # when available. - export DEVSTACK_LOCAL_CONFIG+=$'\n'"MIDONET_BRANCH=staging/v2015.06" - fi - - export DEVSTACK_GATE_SETTINGS=/opt/stack/new/networking-midonet/devstack/devstackgaterc - - 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}-tempest-dsvm-networking-midonet-{midonet-plugin}-{node}{suffix}' node: '{node}' diff --git a/jenkins/jobs/projects.yaml b/jenkins/jobs/projects.yaml index 698f5166dd..5f8de6d23f 100644 --- a/jenkins/jobs/projects.yaml +++ b/jenkins/jobs/projects.yaml @@ -7767,7 +7767,6 @@ jobs: - coverage-jobs - python-jobs - - python-mitaka-bitrot-jobs - python-newton-bitrot-jobs - python-ocata-bitrot-jobs - pypi-jobs @@ -7775,11 +7774,6 @@ - translation-jobs - openstack-releasenotes-jobs - periodic-python-jobs-with-neutron-lib-master - - '{pipeline}-tempest-dsvm-networking-midonet-v1-{node}{suffix}': - pipeline: gate - node: ubuntu-trusty - suffix: '-nv' - branch-override: default - '{pipeline}-tempest-dsvm-networking-midonet-{midonet-plugin}-{node}{suffix}': pipeline: gate midonet-plugin: v2 @@ -7798,12 +7792,6 @@ node: ubuntu-xenial suffix: '-nv' branch-override: default - - '{pipeline}-tempest-dsvm-networking-midonet-{midonet-plugin}-{node}{suffix}': - pipeline: gate - midonet-plugin: v2 - node: ubuntu-trusty - suffix: '' - branch-override: default - '{pipeline}-tempest-dsvm-networking-midonet-{midonet-plugin}-{node}{suffix}': pipeline: periodic midonet-plugin: ml2-full @@ -7822,12 +7810,6 @@ node: ubuntu-xenial suffix: '-newton' branch-override: stable/newton - - '{pipeline}-tempest-dsvm-networking-midonet-{midonet-plugin}-{node}{suffix}': - pipeline: periodic - midonet-plugin: v2 - node: ubuntu-trusty - suffix: '-mitaka' - branch-override: stable/mitaka - '{pipeline}-tempest-dsvm-networking-midonet-{midonet-plugin}-{node}{suffix}': pipeline: gate midonet-plugin: ml2 @@ -7858,12 +7840,6 @@ node: ubuntu-xenial suffix: '-nv' branch-override: default - - '{pipeline}-tempest-dsvm-networking-midonet-{midonet-plugin}-{node}{suffix}': - pipeline: gate - midonet-plugin: ml2 - node: ubuntu-trusty - suffix: '-nv' - branch-override: default - '{pipeline}-networking-midonet-rally-dsvm-{midonet-plugin}-{node}{suffix}': pipeline: gate midonet-plugin: v2 diff --git a/zuul/layout.yaml b/zuul/layout.yaml index dc2f3a2083..72cadebd0d 100755 --- a/zuul/layout.yaml +++ b/zuul/layout.yaml @@ -2511,16 +2511,16 @@ jobs: branch: ^(?!stable/mitaka).*$ - name: ^gate-tempest-dsvm-networking-midonet-.+-full-ubuntu-xenial - branch: ^(?!stable/(mitaka|newton)).*$ + branch: ^(?!stable/newton).*$ - name: ^gate-tempest-dsvm-networking-midonet-.+-full-legacy-ubuntu-xenial - branch: ^(?!stable/(mitaka|newton|ocata)).*$ + branch: ^(?!stable/(newton|ocata)).*$ - name: ^gate-grenade-dsvm-networking-midonet-ml2-ubuntu-xenial - branch: ^(?!stable/(mitaka|newton)).*$ + branch: ^(?!stable/newton).*$ - name: ^gate-grenade-dsvm-networking-midonet-v2-ubuntu-xenial - branch: ^(?!stable/(mitaka|newton|ocata)).*$ + branch: ^(?!stable/(newton|ocata)).*$ - name: ^gate-networking-midonet-rally-dsvm-.+-ubuntu-xenial branch: ^(?!stable/newton).*$ @@ -12790,7 +12790,6 @@ projects: - name: python-jobs - name: python34-jobs - name: python35-jobs - - name: periodic-mitaka - name: periodic-newton - name: periodic-ocata - name: periodic-jobs-with-neutron-lib-master @@ -12799,29 +12798,20 @@ projects: - name: release-notes-jobs - name: translation-jobs check: - # NOTE(yamamoto): No v1 xenial job as it isn't compatible with xenial. - - gate-tempest-dsvm-networking-midonet-v1-ubuntu-trusty-nv - gate-tempest-dsvm-networking-midonet-v2-ubuntu-xenial - gate-tempest-dsvm-networking-midonet-v2-full-ubuntu-xenial-nv - - gate-tempest-dsvm-networking-midonet-v2-ubuntu-trusty - # NOTE(yamamoto): ml2 job is voting only for Newton and later, - # which happen to use xenial. - gate-tempest-dsvm-networking-midonet-ml2-ubuntu-xenial - gate-tempest-dsvm-networking-midonet-ml2-centos-7-nv - gate-tempest-dsvm-networking-midonet-ml2-full-ubuntu-xenial-nv - gate-tempest-dsvm-networking-midonet-ml2-full-centos-7-nv - - gate-tempest-dsvm-networking-midonet-ml2-ubuntu-trusty-nv - - networking-midonet-coverage-ubuntu-trusty-nv - networking-midonet-coverage-ubuntu-xenial-nv - gate-grenade-dsvm-networking-midonet-ml2-ubuntu-xenial-nv - gate-networking-midonet-rally-dsvm-ml2-ubuntu-xenial-nv - gate-networking-midonet-rally-dsvm-v2-ubuntu-xenial-nv gate: - gate-tempest-dsvm-networking-midonet-v2-ubuntu-xenial - - gate-tempest-dsvm-networking-midonet-v2-ubuntu-trusty - gate-tempest-dsvm-networking-midonet-ml2-ubuntu-xenial periodic: - - periodic-tempest-dsvm-networking-midonet-v2-ubuntu-trusty-mitaka - periodic-tempest-dsvm-networking-midonet-v2-ubuntu-xenial-newton - periodic-tempest-dsvm-networking-midonet-v2-full-ubuntu-xenial-ocata - periodic-tempest-dsvm-networking-midonet-ml2-full-ubuntu-xenial-ocata