From 5b5d5ea08bc21085a2f0cef4af2c30e7d10f28fa Mon Sep 17 00:00:00 2001 From: "James E. Blair" Date: Thu, 24 Sep 2015 09:02:52 -0700 Subject: [PATCH] Remove networking-midonet tempest-dsvm jobs These jobs clone and build a repository from github within a devstack plugin. In order to do so, they must disable ERROR_ON_CLONE which is our assurance that all tested OpenStack projects are in the $PROJECTS variable. Further, OpenStack projects must not clone non-OpenStack repositories in gate tests -- they should either be consuming OpenStack projects from git via the $PROJECTS variable or installing released packages as dependencies. For Midonet, that likely either means via the operating system, or via a maven repository. If via maven, then we will need some commitment from the Midonet team to set up a maven mirror similar to our pypi mirror so that when we run tests we are not relying on external network resources. Change-Id: I9194069c4754439977a11404bbc5ac650c5134df --- jenkins/jobs/networking-midonet.yaml | 150 --------------------------- jenkins/jobs/projects.yaml | 15 --- zuul/layout.yaml | 23 ---- 3 files changed, 188 deletions(-) delete mode 100644 jenkins/jobs/networking-midonet.yaml diff --git a/jenkins/jobs/networking-midonet.yaml b/jenkins/jobs/networking-midonet.yaml deleted file mode 100644 index bca60843ee..0000000000 --- a/jenkins/jobs/networking-midonet.yaml +++ /dev/null @@ -1,150 +0,0 @@ -- job-template: - name: '{pipeline}-tempest-dsvm-networking-midonet{branch-designator}' - node: '{node}' - - wrappers: - - build-timeout: - timeout: 125 - - timestamps - - builders: - - link-logs - - net-info - - devstack-checkout - - shell: | - #!/bin/bash -xe - export PYTHONUNBUFFERED=true - export DEVSTACK_GATE_TIMEOUT=120 - 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" - # 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" - - # Keep localrc to be able to set some vars in pre_test_hook - export KEEP_LOCALRC=1 - - 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-v2{branch-designator}' - node: '{node}' - - wrappers: - - build-timeout: - timeout: 125 - - timestamps - - builders: - - link-logs - - net-info - - devstack-checkout - - shell: | - #!/bin/bash -xe - export PYTHONUNBUFFERED=true - export DEVSTACK_GATE_TIMEOUT=120 - 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" - # 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 v2 architecture - export DEVSTACK_LOCAL_CONFIG+=$'\n'"MIDONET_PLUGIN=midonet.neutron.plugin_v2.MidonetPluginV2" - export DEVSTACK_LOCAL_CONFIG+=$'\n'"MIDONET_CLIENT=midonet.neutron.client.cluster.MidonetClusterClient" - export DEVSTACK_LOCAL_CONFIG+=$'\n'"MIDONET_USE_ZOOM=True" - - # Keep localrc to be able to set some vars in pre_test_hook - export KEEP_LOCALRC=1 - - 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-ml2{branch-designator}' - node: '{node}' - - wrappers: - - build-timeout: - timeout: 125 - - timestamps - - builders: - - link-logs - - net-info - - devstack-checkout - - shell: | - #!/bin/bash -xe - export PYTHONUNBUFFERED=true - export DEVSTACK_GATE_TIMEOUT=120 - 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" - # 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=ml2" - export DEVSTACK_LOCAL_CONFIG+=$'\n'"Q_ML2_PLUGIN_MECHANISM_DRIVERS=midonet" - export DEVSTACK_LOCAL_CONFIG+=$'\n'"Q_ML2_PLUGIN_TYPE_DRIVERS=midonet" - export DEVSTACK_LOCAL_CONFIG+=$'\n'"Q_ML2_TENANT_NETWORK_TYPE=midonet" - export DEVSTACK_LOCAL_CONFIG+=$'\n'"ML2_L3_PLUGIN=midonet.neutron.services.l3.l3_midonet.MidonetL3ServicePlugin" - export DEVSTACK_LOCAL_CONFIG+=$'\n'"TEMPEST_RUN_VALIDATION=True" - export DEVSTACK_LOCAL_CONFIG+=$'\n'"METADATA_SERVICE_AVAILABLE=True" - export DEVSTACK_LOCAL_CONFIG+=$'\n'"MIDONET_USE_ZOOM=True" - - # Keep localrc to be able to set some vars in pre_test_hook - export KEEP_LOCALRC=1 - - 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 diff --git a/jenkins/jobs/projects.yaml b/jenkins/jobs/projects.yaml index a995ef1e5b..639ae7eeb0 100755 --- a/jenkins/jobs/projects.yaml +++ b/jenkins/jobs/projects.yaml @@ -859,21 +859,6 @@ - python-jobs - pypi-jobs - openstack-publish-jobs - - '{pipeline}-tempest-dsvm-networking-midonet{branch-designator}': - pipeline: gate - node: 'devstack-precise || devstack-trusty' - branch-designator: '' - branch-override: default - - '{pipeline}-tempest-dsvm-networking-midonet-v2{branch-designator}': - pipeline: gate - node: 'devstack-precise || devstack-trusty' - branch-designator: '' - branch-override: default - - '{pipeline}-tempest-dsvm-networking-midonet-ml2{branch-designator}': - pipeline: gate - node: 'devstack-precise || devstack-trusty' - branch-designator: '' - branch-override: default - project: name: networking-odl diff --git a/zuul/layout.yaml b/zuul/layout.yaml index 71da228fa9..11a37ea01c 100755 --- a/zuul/layout.yaml +++ b/zuul/layout.yaml @@ -671,11 +671,6 @@ jobs: all-files-match-any: - ^.*\.rst$ - ^doc/.*$ - - project: ^openstack/networking-midonet$ - all-files-match-any: - - ^.*\.rst$ - - ^doc/.*$ - - ^midonet/neutron/tests/.*$ # Skip non-doc jobs for doc-only neutron changes. Since # doc/source/conf.py is checked by neutron-(pep8|pylint), those jobs @@ -880,17 +875,6 @@ jobs: - name: gate-networking-midonet-python34 branch: ^(?!stable/(icehouse|juno|kilo)).*$ - - name: ^gate-tempest-dsvm-networking-midonet - branch: ^(?!stable/(icehouse|juno)).*$ - - - name: ^gate-tempest-dsvm-networking-midonet-v2 - branch: ^(?!stable/(icehouse|juno)).*$ - voting: false - - - name: ^gate-tempest-dsvm-networking-midonet-ml2 - branch: ^(?!stable/(icehouse|juno|kilo)).*$ - voting: false - - name: ^gate-tempest-dsvm-networking-odl branch: ^(?!stable) voting: false @@ -2639,13 +2623,6 @@ projects: - name: python3-jobs - name: publish-to-pypi - name: openstack-server-publish-jobs - check: - - gate-tempest-dsvm-networking-midonet - gate: - - gate-tempest-dsvm-networking-midonet - experimental: - - gate-tempest-dsvm-networking-midonet-v2 - - gate-tempest-dsvm-networking-midonet-ml2 - name: openstack/networking-odl template: