diff --git a/jenkins/jobs/shade.yaml b/jenkins/jobs/shade.yaml index cfb263ba14..291fcbbd2b 100644 --- a/jenkins/jobs/shade.yaml +++ b/jenkins/jobs/shade.yaml @@ -276,45 +276,6 @@ - devstack-logs - console-log -- job: - name: 'gate-shade-dsvm-functional-nova-magnum' - node: ubuntu-trusty - - wrappers: - - build-timeout: - timeout: 70 - - timestamps - - builders: - - link-logs - - net-info - - devstack-checkout - - shell: | - #!/bin/bash -xe - export PYTHONUNBUFFERED=true - export DEVSTACK_GATE_NEUTRON=0 - export DEVSTACK_GATE_HEAT=1 - export PROJECTS="openstack/designate $PROJECTS" - export PROJECTS="openstack/designate-dashboard $PROJECTS" - export PROJECTS="openstack/designate-tempest-plugin $PROJECTS" - export PROJECTS="openstack/magnum $PROJECTS" - export PROJECTS="openstack/python-magnumclient $PROJECTS" - export PROJECTS="openstack-infra/shade $PROJECTS" - export DEVSTACK_LOCAL_CONFIG="enable_plugin designate git://git.openstack.org/openstack/designate" - export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin magnum git://git.openstack.org/openstack/magnum" - export DEVSTACK_LOCAL_CONFIG+=$'\n'"MAGNUM_GUEST_IMAGE_URL='http://tarballs.openstack.org/magnum/images/fedora-atomic-f23-dib.qcow2'" - export DEVSTACK_LOCAL_CONFIG+=$'\n'"MAGNUM_IMAGE_NAME='fedora-atomic-f23-dib'" - - function post_test_hook { - $BASE/new/shade/shade/tests/functional/hooks/post_test_hook.sh - } - export -f post_test_hook - 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: name: 'gate-shade-dsvm-ansible-dev-magnum' node: ubuntu-trusty diff --git a/zuul/layout.yaml b/zuul/layout.yaml index 8bd6c1166d..4553931746 100755 --- a/zuul/layout.yaml +++ b/zuul/layout.yaml @@ -4032,7 +4032,6 @@ projects: experimental: - gate-shade-dsvm-functional-keystone2-magnum - gate-shade-dsvm-functional-neutron-magnum - - gate-shade-dsvm-functional-nova-magnum - gate-shade-dsvm-ansible-dev-magnum - name: openstack-infra/statusbot