neutron-vpnaas: Move tempest job from experimental to non-voting

Move gate-neutron-dsvm-tempest-vpnaas-ubuntu-xenial-nv out of
experimental.

Also, retire gate-neutron-vpnaas-dsvm-api-ubuntu-xenial-nv
because it only runs a subset of the new job.

Closes-Bug: #1659691
Depends-On: I81e712503a20623bf43bd61c39f79efc306f8e9a
Change-Id: I5a4511db59a4beb344d94f1ffd8826e1a4a35726

grafana/neutron-vpnaas.yaml

@@ -32,7 +32,7 @@ dashboard:
         - title: Tempest Failure Rates (check)
           span: 4
           targets:
-            - target: alias(movingAverage(asPercent(transformNull(stats_counts.zuul.pipeline.check.job.gate-neutron-vpnaas-dsvm-api-nv.FAILURE),sum(stats_counts.zuul.pipeline.check.job.gate-neutron-vpnaas-dsvm-api-nv.{SUCCESS,FAILURE})),'24hours'), 'gate-neutron-vpnaas-dsvm-api-nv')
+            - target: alias(movingAverage(asPercent(transformNull(stats_counts.zuul.pipeline.check.job.gate-neutron-dsvm-tempest-vpnaas-ubuntu-xenial-nv.FAILURE),sum(stats_counts.zuul.pipeline.check.job.gate-neutron-dsvm-tempest-vpnaas-ubuntu-xenial-nv.{SUCCESS,FAILURE})),'24hours'), 'gate-neutron-dsvm-tempest-vpnaas-ubuntu-xenial-nv')
           type: graph
     - title: Gate Queue
       height: 320px

jenkins/jobs/projects.yaml

@@ -8389,13 +8389,11 @@
           node:
             - ubuntu-trusty
             - ubuntu-xenial
-          suffix: ''
+          suffix: '-nv'
           branch-override: default
       - '{pipeline}-neutron-vpnaas-dsvm-api{which}-{node}{suffix}':
           pipeline: gate
-          node:
-            - ubuntu-trusty
-            - ubuntu-xenial
+          node: ubuntu-trusty
           suffix: '-nv'
           branch-override: default
           which: ''

zuul/layout.yaml

@@ -2344,7 +2344,7 @@ jobs:
   - name: gate-novaclient-dsvm-functional-ubuntu-xenial
     branch: ^stable/newton$
 
-  - name: gate-neutron-dsvm-tempest-vpnaas-ubuntu-trusty
+  - name: gate-neutron-dsvm-tempest-vpnaas-ubuntu-trusty-nv
     branch: ^stable/mitaka$
 
   # Do not run magnum migration tests on doc changes and
@@ -13249,7 +13249,7 @@ projects:
       - gate-neutron-vpnaas-dsvm-functional-sswan-ubuntu-trusty
       - gate-neutron-vpnaas-dsvm-functional-sswan-ubuntu-xenial
       - gate-neutron-vpnaas-dsvm-api-ubuntu-trusty-nv
-      - gate-neutron-vpnaas-dsvm-api-ubuntu-xenial-nv
+      - gate-neutron-dsvm-tempest-vpnaas-ubuntu-xenial-nv
     gate:
       - gate-neutron-vpnaas-releasenotes
       - gate-neutron-vpnaas-dsvm-functional-ubuntu-trusty
@@ -13258,8 +13258,7 @@ projects:
     experimental:
       - gate-neutron-vpnaas-dsvm-rally-ubuntu-trusty
       - gate-neutron-vpnaas-dsvm-rally-ubuntu-xenial
-      - gate-neutron-dsvm-tempest-vpnaas-ubuntu-trusty
-      - gate-neutron-dsvm-tempest-vpnaas-ubuntu-xenial
+      - gate-neutron-dsvm-tempest-vpnaas-ubuntu-trusty-nv
     post:
       - neutron-vpnaas-coverage-ubuntu-trusty
       - neutron-vpnaas-coverage-ubuntu-xenial