Templatize freezer dsvm gate job

Change-Id: I4e039baaac1af2047167232ff8657bf82c12b2a8

jenkins/jobs/freezer.yaml

@@ -1,7 +1,6 @@
-- job:
+- job-template:
-    name: gate-freezer-devstack-dsvm
+    name: 'gate-osbackup-{name}-dsvm-{node}{job-suffix}'
-    node: ubuntu-trusty
+    node: '{node}'
-
     wrappers:
       - build-timeout:
           timeout: 70
@@ -14,109 +13,37 @@
       - shell: |
           #!/bin/bash -xe
           export PYTHONUNBUFFERED=true
+          # checkout freezer components
           export PROJECTS="openstack/freezer-api $PROJECTS"
           export PROJECTS="openstack/freezer-web-ui $PROJECTS"
           export PROJECTS="openstack/freezer $PROJECTS"
+          # export PROJECTS="openstack/python-freezerclient $PROJECTS"
+          # tempest config
           export DEVSTACK_GATE_TEMPEST=1
           export DEVSTACK_GATE_TEMPEST_ALL_PLUGINS=1
-          export DEVSTACK_GATE_TEMPEST_REGEX="freezer_tempest_plugin"
+          export DEVSTACK_GATE_TEMPEST_REGEX="{name}_tempest_plugin"
+          # enable freezer-agent and freezer-scheduler
           export DEVSTACK_LOCAL_CONFIG="enable_plugin freezer https://git.openstack.org/openstack/freezer"
+          # enable freezer-api and python-freezerclient
           export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin freezer-api https://git.openstack.org/openstack/freezer-api"
+          # enable freezer-web-ui and python-freezerclient
+          export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin freezer-web-ui https://git.openstack.org/openstack/freezer-web-ui"
 
-          function gate_hook {
+          # which repo is being tested
-              source $BASE/new/freezer/devstack/gate_hook.sh
+          export DEVSTACK_PROJECT_FROM_GIT={name}
-          }
+
+          # This ensures that if we set override branch to something
+          # else, we still take repo being tested from the zuul branch
+          # name. So override branch can be 'stable/mitaka' but we can
+          # test master changes.
+          uc_project=`echo $DEVSTACK_PROJECT_FROM_GIT | tr [:lower:] [:upper:] | tr '-' '_' | sed 's/[^A-Z_]//'`
+          export "OVERRIDE_"$uc_project"_PROJECT_BRANCH"=$ZUUL_BRANCH
+
+          function gate_hook {{
+              source $BASE/new/{name}/devstack/gate_hook.sh
+          }}
           export -f gate_hook
 
-          function post_test_hook {
-              cd /opt/stack/new/freezer/tests/integration/
-              ./post_test_hook.sh
-          }
-          export -f post_test_hook
-
-          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:
-    name: gate-freezer-web-ui-devstack-dsvm
-    node: ubuntu-trusty
-
-    wrappers:
-      - build-timeout:
-          timeout: 70
-      - timestamps
-
-    builders:
-      - link-logs
-      - net-info
-      - devstack-checkout
-      - shell: |
-          #!/bin/bash -xe
-          export PYTHONUNBUFFERED=true
-          export PROJECTS="openstack/freezer-api $PROJECTS"
-          export PROJECTS="openstack/freezer-web-ui $PROJECTS"
-          export PROJECTS="openstack/freezer $PROJECTS"
-          export PROJECTS="openstack/python-freezerclient $PROJECTS"
-
-          function gate_hook {
-              $BASE/new/freezer-api/devstack/gate_hook.sh
-          }
-          export -f gate_hook
-
-          function post_test_hook {
-              cd /opt/stack/new/freezer-api/freezer_api/tests/
-              ./post_test_hook.sh
-          }
-          export -f post_test_hook
-
-          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:
-    name: gate-freezer-api-devstack-dsvm
-    node: ubuntu-trusty
-
-    wrappers:
-      - build-timeout:
-          timeout: 70
-      - timestamps
-
-    builders:
-      - link-logs
-      - net-info
-      - devstack-checkout
-      - shell: |
-          #!/bin/bash -xe
-          export PYTHONUNBUFFERED=true
-          export PROJECTS="openstack/freezer-api $PROJECTS"
-          export DEVSTACK_GATE_TEMPEST=1
-          export DEVSTACK_GATE_TEMPEST_ALL_PLUGINS=1
-          export DEVSTACK_GATE_TEMPEST_REGEX="freezer_api_tempest_plugin"
-          export DEVSTACK_LOCAL_CONFIG="enable_plugin freezer-api https://git.openstack.org/openstack/freezer-api"
-
-          function pre_test_hook {
-              source $BASE/new/freezer-api/freezer_api/tests/pre_test_hook.sh
-          }
-          export -f pre_test_hook
-
-          function gate_hook {
-              source $BASE/new/freezer-api/devstack/gate_hook.sh
-          }
-          export -f gate_hook
-
-          function post_test_hook {
-              source $BASE/new/freezer-api/freezer_api/tests/post_test_hook.sh
-          }
-          export -f post_test_hook
-
           cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh
           ./safe-devstack-vm-gate-wrap.sh
 

jenkins/jobs/projects.yaml

@@ -4232,6 +4232,11 @@
           suffix: '-nv'
       - pypi-jobs
       - gate-{name}-pylint
+      - gate-osbackup-{name}-dsvm-{node}{job-suffix}:
+          node:
+            - ubuntu-trusty
+            - ubuntu-xenial
+          job-suffix: ''
 
 - project:
     name: freezer-api
@@ -4243,6 +4248,11 @@
           suffix: '-nv'
       - pypi-jobs
       - gate-{name}-pylint
+      - gate-osbackup-{name}-dsvm-{node}{job-suffix}:
+          node:
+            - ubuntu-trusty
+            - ubuntu-xenial
+          job-suffix: ''
 
 - project:
     name: freezer-dr
@@ -4273,6 +4283,11 @@
       - pypi-jobs
       - gate-{name}-pylint
       - translation-jobs
+      - gate-osbackup-{name}-dsvm-{node}{job-suffix}:
+          node:
+            - ubuntu-trusty
+            - ubuntu-xenial
+          job-suffix: ''
 
 - project:
     name: fuel-agent

zuul/layout.yaml

@@ -8796,10 +8796,12 @@ projects:
       - name: python35-jobs-nv
       - name: check-requirements
     check:
-      - gate-freezer-devstack-dsvm
+      - gate-osbackup-freezer-dsvm-ubuntu-trusty
+      - gate-osbackup-freezer-dsvm-ubuntu-xenial
       - gate-freezer-pylint
     gate:
-      - gate-freezer-devstack-dsvm
+      - gate-osbackup-freezer-dsvm-ubuntu-trusty
+      - gate-osbackup-freezer-dsvm-ubuntu-xenial
       - gate-freezer-pylint
 
   - name: openstack/freezer-api
@@ -8811,10 +8813,12 @@ projects:
       - name: python35-jobs-nv
       - name: check-requirements
     check:
-      - gate-freezer-api-devstack-dsvm
+      - gate-osbackup-freezer-api-dsvm-ubuntu-trusty
+      - gate-osbackup-freezer-api-dsvm-ubuntu-xenial
       - gate-freezer-api-pylint
     gate:
-      - gate-freezer-api-devstack-dsvm
+      - gate-osbackup-freezer-api-dsvm-ubuntu-trusty
+      - gate-osbackup-freezer-api-dsvm-ubuntu-xenial
       - gate-freezer-api-pylint
 
   - name: openstack/freezer-dr
@@ -8849,10 +8853,12 @@ projects:
       - name: check-requirements
       - name: translation-jobs
     check:
-      - gate-freezer-web-ui-devstack-dsvm
+      - gate-osbackup-freezer-web-ui-dsvm-ubuntu-trusty
+      - gate-osbackup-freezer-web-ui-dsvm-ubuntu-xenial
       - gate-freezer-web-ui-pylint
     gate:
-      - gate-freezer-web-ui-devstack-dsvm
+      - gate-osbackup-freezer-web-ui-dsvm-ubuntu-trusty
+      - gate-osbackup-freezer-web-ui-dsvm-ubuntu-xenial
       - gate-freezer-web-ui-pylint
 
   - name: openstack/fuel-agent