Fix swift enable/disable logic in rally-dsmv-* jobs

Desire state is that all rally-dsvm jobs, except py35,
are deploying Swfit. Perviously we have wrong logic for disabling
Swift (it was disable only when it was enabled).

Now we are fixing the behaviour and configurution of all jobs, so jobs
would be configured properly.

Change-Id: I787bdc5f83efc96237dfcdaa0fa7a909baba8956

jenkins/jobs/projects.yaml

@@ -1254,10 +1254,8 @@
       - gate-rally-dsvm-{name}-{node}{suffix}:
           node: ubuntu-xenial
           suffix: '-nv'
-          swift: '0'
       - gate-rally-dsvm-py35-{name}{suffix}:
           suffix: '-nv'
-          swift: '0'
       - '{pipeline}-cinder-dsvm-apache-{node}{suffix}':
           pipeline: gate
           node: ubuntu-xenial
@@ -4989,10 +4987,8 @@
       - gate-rally-dsvm-{name}-{node}{suffix}:
           node: ubuntu-xenial
           suffix: '-nv'
-          swift: '0'
       - gate-rally-dsvm-py35-{name}{suffix}:
           suffix: '-nv'
-          swift: '0'
       - '{pipeline}-glance-dsvm-grenade-multinode-{node-release}{suffix}':
           pipeline: gate
           node: ubuntu-xenial-2-node
@@ -5982,7 +5978,6 @@
       - gate-rally-dsvm-{name}-{node}{suffix}:
           node: ubuntu-xenial
           suffix: '-nv'
-          swift: '0'
       - api-ref-jobs:
           service: identity
       - 'gate-{name}-tox-{envlist}-{node}':
@@ -13024,7 +13019,6 @@
       - gate-rally-dsvm-{name}-{node}{suffix}:
           node: ubuntu-xenial
           suffix: ''
-          swift: '1'
       - gate-rally-dsvm-designate-{name}-{driver}-{node}{suffix}:
           node: ubuntu-xenial
           suffix: '-nv'

jenkins/jobs/rally.yaml

@@ -90,7 +90,7 @@
           ENABLED_SERVICES+=n-api,n-crt,n-cpu,n-sch,n-cond,
           ENABLED_SERVICES+=q-qos,
 
-          if [ $DEVSTACK_GATE_SWIFT -ne 1 ];
+          if [ $DEVSTACK_GATE_SWIFT -eq 1 ];
           then
               ENABLED_SERVICES+=s-proxy,s-account,s-container,s-object,
           else
@@ -599,7 +599,7 @@
           prepopulate_users: '0'
           watcher: '0'
           telemetry: '0'
-          swift: '{swift}'
+          swift: '1'
           heat: '0'
           py35: 'False'
 
@@ -631,7 +631,7 @@
           prepopulate_users: '0'
           watcher: '0'
           telemetry: '{telemetry}'
-          swift: '0'
+          swift: '1'
           heat: '0'
           py35: 'False'
 
@@ -662,7 +662,7 @@
           prepopulate_users: '0'
           watcher: '0'
           telemetry: '0'
-          swift: '0'
+          swift: '1'
           heat: '0'
           py35: 'False'
 
@@ -693,7 +693,7 @@
           prepopulate_users: '1'
           watcher: '0'
           telemetry: '0'
-          swift: '0'
+          swift: '1'
           heat: '0'
           py35: 'False'
 
@@ -725,7 +725,7 @@
           prepopulate_users: '0'
           watcher: '0'
           telemetry: '0'
-          swift: '0'
+          swift: '1'
           heat: '0'
           py35: 'False'
 
@@ -757,7 +757,7 @@
           prepopulate_users: '0'
           watcher: '0'
           telemetry: '0'
-          swift: '0'
+          swift: '1'
           heat: '0'
           py35: 'False'
 
@@ -788,7 +788,7 @@
           prepopulate_users: '0'
           watcher: '0'
           telemetry: '0'
-          swift: '0'
+          swift: '1'
           heat: '{heat}'
           py35: 'False'