From 4d7fb2d8d5d6c9b770c371a4c6f395155e456a08 Mon Sep 17 00:00:00 2001 From: Sean Dague Date: Fri, 20 Nov 2015 17:24:39 -0500 Subject: [PATCH] remove gate-devstack-dsvm-cells gate-devstack-dsvm-cells was a stop gap job on juno/kilo to use devstack exercises on cells until the tempest job got working. The tempest job was working in kilo, and now votes. With juno gone, and the old job almost testing nothing on kilo (it boots 1 vm only), we should remove it and just leave the tempest-cells job where it already is. Change-Id: I829903b0690faea2d499f4ba8a2393cf31ed4601 --- jenkins/jobs/cells.yaml | 32 -------------------------------- jenkins/jobs/devstack-gate.yaml | 1 - zuul/layout.yaml | 21 +-------------------- 3 files changed, 1 insertion(+), 53 deletions(-) diff --git a/jenkins/jobs/cells.yaml b/jenkins/jobs/cells.yaml index 3cbc203921..217c66edae 100644 --- a/jenkins/jobs/cells.yaml +++ b/jenkins/jobs/cells.yaml @@ -1,35 +1,3 @@ -- job-template: - name: '{pipeline}-devstack-dsvm-cells{job-suffix}' - node: '{node}' - - wrappers: - - build-timeout: - timeout: 65 - - 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_TIMEOUT=60 - export DEVSTACK_GATE_CELLS=1 - export DEVSTACK_GATE_EXERCISES=1 - export BRANCH_OVERRIDE={branch-override} - if [ "$BRANCH_OVERRIDE" != "default" ] ; then - export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE - fi - 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-cells{job-suffix}' node: '{node}' diff --git a/jenkins/jobs/devstack-gate.yaml b/jenkins/jobs/devstack-gate.yaml index 2964afa0bc..71869f8fcd 100644 --- a/jenkins/jobs/devstack-gate.yaml +++ b/jenkins/jobs/devstack-gate.yaml @@ -2782,7 +2782,6 @@ - '{pipeline}-tempest-dsvm-neutron-full{job-suffix}' - '{pipeline}-tempest-dsvm-neutron-full-ssh{job-suffix}' - '{pipeline}-tempest-dsvm-neutron-pg-full{job-suffix}' - - '{pipeline}-devstack-dsvm-cells{job-suffix}' - '{pipeline}-devstack-dsvm-updown{job-suffix}' - '{pipeline}-tempest-dsvm-cells{job-suffix}' - '{pipeline}-tempest-dsvm-large-ops{job-suffix}' diff --git a/zuul/layout.yaml b/zuul/layout.yaml index bc664de32a..6c702ed2c7 100644 --- a/zuul/layout.yaml +++ b/zuul/layout.yaml @@ -995,12 +995,7 @@ jobs: voting: false - name: ^gate-tempest-dsvm-cells$ - branch: ^(?!stable/(juno|kilo)).*$ - - # the devstack cells job only should be run on versions the tempest - # cells job does not work on. - - name: ^gate-devstack-dsvm-cells$ - branch: ^(stable/(juno|kilo)).*$ + branch: ^(?!stable/(kilo)).*$ # don't run any grenade jobs on the oldest supported stable # branch, this lets us catch all jobs that don't otherwise have @@ -2262,7 +2257,6 @@ projects: check: - gate-devstack-bashate - gate-devstack-unit-tests - - gate-devstack-dsvm-cells - gate-grenade-dsvm-partial-ncpu - gate-tempest-dsvm-ironic-agent_ssh - gate-devstack-dsvm-updown @@ -2277,7 +2271,6 @@ projects: - gate-grenade-dsvm-multinode gate: - gate-devstack-bashate - - gate-devstack-dsvm-cells - gate-grenade-dsvm-forward - gate-grenade-dsvm-partial-ncpu - gate-grenade-dsvm-multinode @@ -2484,7 +2477,6 @@ projects: check: - gate-devstack-gate-unittests - gate-devstack-gate-bashate - - gate-devstack-dsvm-cells - gate-dg-hooks-dsvm - gate-grenade-dsvm-partial-ncpu - gate-grenade-dsvm-multinode @@ -2506,7 +2498,6 @@ projects: - gate-tempest-dsvm-neutron-multinode-full gate: - gate-devstack-gate-unittests - - gate-devstack-dsvm-cells - gate-grenade-dsvm-partial-ncpu - gate-grenade-dsvm-multinode experimental: @@ -3943,7 +3934,6 @@ projects: - name: translation-jobs-liberty - name: release-notes-jobs check: - - gate-devstack-dsvm-cells - gate-tempest-dsvm-ceilometer-mongodb-full - gate-tempest-dsvm-ceilometer-mysql-neutron-full - gate-tempest-dsvm-ceilometer-mysql-full @@ -3954,7 +3944,6 @@ projects: - gate-grenade-dsvm-ceilometer - gate-ceilometer-dsvm-integration gate: - - gate-devstack-dsvm-cells - gate-ceilometer-dsvm-functional-mongodb - gate-ceilometer-dsvm-functional-mysql - gate-ceilometer-dsvm-functional-postgresql @@ -4031,7 +4020,6 @@ projects: - name: release-notes-jobs check: - gate-cinder-pylint - - gate-devstack-dsvm-cells - gate-rally-dsvm-cinder - gate-tempest-dsvm-full-ceph - gate-cinder-dsvm-apache @@ -4048,7 +4036,6 @@ projects: - gate-cinder-pep8-constraints - gate-cinder-pylint-constraints gate: - - gate-devstack-dsvm-cells - gate-tempest-dsvm-full-ceph experimental: - gate-grenade-dsvm-forward @@ -5355,7 +5342,6 @@ projects: - name: large-ops - name: release-notes-jobs check: - - gate-devstack-dsvm-cells - gate-tempest-dsvm-full-ceph - gate-rally-dsvm-glance - gate-glance-python27-constraints @@ -5363,7 +5349,6 @@ projects: - gate-glance-docs-constraints - gate-glance-pep8-constraints gate: - - gate-devstack-dsvm-cells - gate-tempest-dsvm-full-ceph experimental: - gate-grenade-dsvm-forward @@ -6698,7 +6683,6 @@ projects: - name: experimental-tripleo-jobs - name: release-notes-jobs check: - - gate-devstack-dsvm-cells - gate-nova-tox-functional - gate-grenade-dsvm-partial-ncpu - gate-grenade-dsvm-multinode @@ -6716,7 +6700,6 @@ projects: - gate-nova-tox-constraints-functional-constraints gate: - gate-nova-tox-functional - - gate-devstack-dsvm-cells - gate-grenade-dsvm-partial-ncpu - gate-grenade-dsvm-multinode - gate-tempest-dsvm-full-ceph @@ -8706,13 +8689,11 @@ projects: - gate-requirements-python27 - gate-requirements-integration-dsvm - gate-requirements-integration-dsvm-resolver - - gate-devstack-dsvm-cells - gate-requirements-tox-validate gate: - gate-requirements-pep8 - gate-requirements-python27 - gate-requirements-integration-dsvm - - gate-devstack-dsvm-cells - gate-requirements-tox-validate periodic: - propose-requirements-constraints-master