puppet: split integration job in 2

One integration job does not scale, we're running out of RAM and Tempest
fails to run all the tests we want.

This patch split single node integration job in 2 to support 2
scenarios.

Change-Id: I1968a650fadd2c659b1dd3148ee0f86ec21b04de

jenkins/jobs/puppet-module-jobs.yaml

@@ -243,7 +243,7 @@
       - console-log
 
 - job-template:
-    name: 'gate-puppet-openstack-integration-dsvm-{ostype}'
+    name: 'gate-puppet-openstack-integration-{scenario}-dsvm-{ostype}'
     node: 'devstack-{ostype}'
 
     builders:
@@ -252,6 +252,7 @@
           project: openstack/puppet-openstack-integration
       - shell: |
           #!/bin/bash -xe
+          export SCENARIO={scenario}
           cd openstack/puppet-openstack-integration
           mkdir .bundled_gems
           export GEM_HOME=`pwd`/.bundled_gems
@@ -311,5 +312,8 @@
     ostype:
       - trusty
       - centos7
+    scenario:
+      - scenario001
+      - scenario002
     jobs:
-      - 'gate-puppet-openstack-integration-dsvm-{ostype}'
+      - 'gate-puppet-openstack-integration-{scenario}-dsvm-{ostype}'

zuul/layout.yaml

@@ -511,8 +511,10 @@ project-templates:
 
   - name: puppet-openstack-integration-jobs
     check:
-      - gate-puppet-openstack-integration-dsvm-trusty
-      - gate-puppet-openstack-integration-dsvm-centos7
+      - gate-puppet-openstack-integration-scenario001-dsvm-trusty
+      - gate-puppet-openstack-integration-scenario001-dsvm-centos7
+      - gate-puppet-openstack-integration-scenario002-dsvm-trusty
+      - gate-puppet-openstack-integration-scenario002-dsvm-centos7
 
   - name: puppet-syntax
     check:
@@ -767,7 +769,7 @@ jobs:
   - name: ^gate-openstackci-beaker-.*$
     voting: false
 
-  - name: ^gate-puppet-openstack-integration-dsvm-.*$
+  - name: ^gate-puppet-openstack-integration-.*-dsvm-.*$
     voting: false
     branch: ^(?!stable/kilo).*$