From d4b685acba18ebd81a89fb5987703f38d1fd02c0 Mon Sep 17 00:00:00 2001 From: Yolanda Robla <yolanda.robla-mota@hp.com> Date: Fri, 15 Apr 2016 08:25:16 +0200 Subject: [PATCH] Remove non voting job for magum dib checks We will start consuming the generated qcow2 images by default, so this job is no longer needed. Change-Id: I0c6c5727e170a654de332e0deaa9ea98ee9bfa96 --- jenkins/jobs/magnum.yaml | 57 ---------------------------------------- zuul/layout.yaml | 11 -------- 2 files changed, 68 deletions(-) diff --git a/jenkins/jobs/magnum.yaml b/jenkins/jobs/magnum.yaml index 8c48621f2a..6e7c022e3e 100644 --- a/jenkins/jobs/magnum.yaml +++ b/jenkins/jobs/magnum.yaml @@ -53,63 +53,6 @@ - devstack-logs - console-log -- job: - name: 'gate-functional-dsvm-magnum-k8s-dib-nv' - node: 'ubuntu-trusty' - - wrappers: - - build-timeout: - timeout: 130 - - timestamps - - builders: - - link-logs - - net-info - - devstack-checkout - - shell: | - #!/bin/bash -xe - export PYTHONUNBUFFERED=true - export DEVSTACK_GATE_TEMPEST=0 - export DEVSTACK_GATE_NEUTRON=1 - - # Enable tempest for tempest plugin - export ENABLED_SERVICES=tempest - - export BRANCH_OVERRIDE=default - if [ "$BRANCH_OVERRIDE" != "default" ] ; then - export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE - fi - export PROJECTS="openstack/magnum $PROJECTS" - export PROJECTS="openstack/python-magnumclient $PROJECTS" - export PROJECTS="openstack/barbican $PROJECTS" - export DEVSTACK_LOCAL_CONFIG="enable_plugin magnum git://git.openstack.org/openstack/magnum" - export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin ceilometer git://git.openstack.org/openstack/ceilometer" - - # Keep localrc to be able to set some vars in post_test_hook - export KEEP_LOCALRC=1 - - function gate_hook { - cd /opt/stack/new/magnum/ - echo "MAGNUM_GUEST_IMAGE_URL='https://fedorapeople.org/groups/magnum/fedora-atomic-f23-dib.qcow2'" >> $BASE/new/devstack/localrc - echo "MAGNUM_IMAGE_NAME='fedora-atomic-f23-dib'" >> $BASE/new/devstack/localrc - ./magnum/tests/contrib/gate_hook.sh k8s - } - export -f gate_hook - - function post_test_hook { - source $BASE/new/devstack/accrc/admin/admin - cd /opt/stack/new/magnum/ - ./magnum/tests/contrib/post_test_hook.sh k8s - } - 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: 'dib-buildimage-atomic-f23' node: ubuntu-trusty diff --git a/zuul/layout.yaml b/zuul/layout.yaml index 582cc9af29..5f93050e7e 100755 --- a/zuul/layout.yaml +++ b/zuul/layout.yaml @@ -1408,16 +1408,6 @@ jobs: - ^.*\.rst$ - ^doc/.*$ - - name: gate-functional-dsvm-magnum-k8s-dib-nv - branch: ^(?!stable/kilo).*$ - skip-if: - - project: ^openstack/magnum$ - all-files-match-any: - - ^.*\.rst$ - - ^doc/.*$ - - ^magnum/templates/swarm/.*$ - - ^magnum/templates/mesos/.*$ - - name: gate-functional-dsvm-magnum-k8s branch: ^(?!stable/kilo).*$ skip-if: @@ -6950,7 +6940,6 @@ projects: - name: translation-jobs check: - gate-functional-dsvm-magnum-api - - gate-functional-dsvm-magnum-k8s-dib-nv - gate-functional-dsvm-magnum-k8s - gate-functional-dsvm-magnum-swarm - gate-functional-dsvm-magnum-mesos