openstack/project-config
Code Issues Proposed changes

Drop neutron-full-ssh job

Browse Source 
Since I187e560911f5d5d482eb7959e5174068c4c9a801 ssh validation is
enabled by default in devstack on master (Pike).
The neutron-full-ssh test was introduced as a test to make ssh
validation stable. Now that that goal is achieved, it can be
removed.

Since neutron-full-ssh was the only job running with file injection
enabled, enabling it now in the standard neutron-full job.

Change-Id: I568c56dbcb62ec541661364c142eff2397e3eed7
This commit is contained in:
Andrea Frittoli 2017-05-28 10:36:33 +01:00
parent 2adfd0e1cf
commit ab305b8ff7
2 changed files with 4 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
jenkins/jobs/devstack-gate.yaml
View File

@ -375,6 +375,10 @@
- link-logs
- net-info
- devstack-checkout
- local_conf:
conf: |
[[local|localrc]]
ENABLE_FILE_INJECTION=True
- shell: |
#!/bin/bash -xe
export PYTHONUNBUFFERED=true
@ -2375,46 +2379,6 @@
- console-log
- job-template:
name: '{pipeline}-tempest-dsvm-neutron-full-ssh{suffix}'
node: '{node}'
wrappers:
- build-timeout:
timeout: 180
- timestamps
builders:
- print-template-name:
template-name: "{template-name}"
- link-logs
- net-info
- devstack-checkout
- local_conf:
conf: |
[[local|localrc]]
TEMPEST_RUN_VALIDATION=True
ENABLE_FILE_INJECTION=True
- shell: |
#!/bin/bash -xe
export PYTHONUNBUFFERED=true
export DEVSTACK_GATE_TEMPEST=1
export DEVSTACK_GATE_TEMPEST_FULL=1
export DEVSTACK_GATE_NEUTRON=1
export DEVSTACK_GATE_TLSPROXY=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: 'gate-dsvm-os-loganalyze{suffix}'
node: '{node}'
@ -2480,7 +2444,6 @@
- '{pipeline}-tempest-dsvm-neutron-full-test-accounts-{node}{suffix}'
- '{pipeline}-tempest-dsvm-neutron-identity-v3-only-full-{node}{suffix}'
- '{pipeline}-tempest-dsvm-oslo-latest-full{suffix}'
- '{pipeline}-tempest-dsvm-neutron-full-ssh{suffix}'
# Jobs will get defined for stable branches in the periodic pipeline, and
# for stable branches gate jobs.
@ -2507,7 +2470,6 @@
- '{pipeline}-tempest-dsvm-neutron-dvr-{node}{suffix}'
- '{pipeline}-tempest-dsvm-cells-{node}{suffix}'
- '{pipeline}-devstack-dsvm-updown-{node}{suffix}'
- '{pipeline}-tempest-dsvm-neutron-full-ssh{suffix}'
- '{pipeline}-tempest-dsvm-full-lio-{node}{suffix}'
- '{pipeline}-tempest-dsvm-lvm-{node}{suffix}'
- '{pipeline}-tempest-dsvm-zeromq-multibackend-{node}{suffix}'

5
zuul/layout.yaml
View File

@ -13064,7 +13064,6 @@ projects:
- gate-neutron-dsvm-functional-python35-ubuntu-xenial-nv
- gate-grenade-dsvm-neutron-forward-ubuntu-trusty
- gate-grenade-dsvm-neutron-forward-ubuntu-xenial
- gate-tempest-dsvm-neutron-full-ssh
- gate-tempest-dsvm-neutron-ipv6only-nv
- gate-tempest-dsvm-neutron-serviceipv6-nv
- gate-tempest-dsvm-neutron-ovs-native-ubuntu-trusty-nv
@ -13353,7 +13352,6 @@ projects:
- gate-tempest-dsvm-multinode-full-ubuntu-xenial-nv
- gate-tempest-dsvm-neutron-dvr-multinode-full-ubuntu-xenial-nv
- gate-tempest-dsvm-neutron-dvr-ha-multinode-full-ubuntu-xenial-nv
- gate-tempest-dsvm-neutron-full-ssh
# This runs all of the scenario tests, even the slow ones.
- gate-tempest-dsvm-neutron-scenario-multinode-lvm-multibackend-ubuntu-xenial-nv
- gate-tempest-dsvm-ironic-pxe_ipa-full-ubuntu-xenial-nv
@ -18385,7 +18383,6 @@ projects:
- gate-grenade-dsvm-neutron-multinode-ubuntu-xenial
- gate-grenade-dsvm-neutron-ubuntu-xenial
- gate-tempest-dsvm-ironic-ipa-wholedisk-bios-agent_ipmitool-tinyipa-ubuntu-xenial-nv
- gate-tempest-dsvm-neutron-full-ssh
- gate-tempest-dsvm-full-devstack-plugin-ceph-ubuntu-xenial
- gate-puppet-openstack-integration-4-scenario001-tempest-centos-7-nv
- gate-puppet-openstack-integration-4-scenario002-tempest-centos-7-nv
@ -18407,7 +18404,6 @@ projects:
gate:
- gate-grenade-dsvm-multinode
- gate-grenade-dsvm-neutron-multinode-ubuntu-xenial
- gate-tempest-dsvm-neutron-full-ssh
experimental:
- periodic-tempest-dsvm-all-master
- gate-tempest-dsvm-multinode-full-ubuntu-xenial-nv
@ -18443,7 +18439,6 @@ projects:
- periodic-tempest-dsvm-neutron-full-test-accounts-ubuntu-xenial-master
- periodic-tempest-dsvm-neutron-full-non-admin-ubuntu-xenial-master
- periodic-tempest-dsvm-all-master
- periodic-tempest-dsvm-neutron-full-ssh-master
- name: openstack/tempest-horizon
template: