From ab305b8ff70c758b3400168867c3c90499c95ac0 Mon Sep 17 00:00:00 2001
From: Andrea Frittoli <andrea.frittoli@gmail.com>
Date: Sun, 28 May 2017 10:36:33 +0100
Subject: [PATCH] Drop neutron-full-ssh job

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
---
 jenkins/jobs/devstack-gate.yaml | 46 +++------------------------------
 zuul/layout.yaml                |  5 ----
 2 files changed, 4 insertions(+), 47 deletions(-)

diff --git a/jenkins/jobs/devstack-gate.yaml b/jenkins/jobs/devstack-gate.yaml
index 944dbc23f8..722635133b 100644
--- a/jenkins/jobs/devstack-gate.yaml
+++ b/jenkins/jobs/devstack-gate.yaml
@@ -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}'
diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 854c57443d..29ea27f90c 100755
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -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: