Merge "Glare - Zuul/Jenkins update"

jenkins/jobs/glare.yaml

@@ -0,0 +1,43 @@
+- job-template:
+    name: '{pipeline}-glare-dsvm-{node}{suffix}'
+    node: '{node}'
+
+    wrappers:
+      - build-timeout:
+          timeout: 130
+      - timestamps
+
+    builders:
+      - link-logs
+      - net-info
+      - devstack-checkout
+      - local_conf:
+          conf: |
+            [[local|localrc]]
+            enable_plugin glare git://git.openstack.org/openstack/glare
+      - shell: |
+          #!/bin/bash -xe
+          export PYTHONUNBUFFERED=true
+          export PROJECTS="openstack/python-glareclient $PROJECTS"
+          export PROJECTS="openstack/glare $PROJECTS"
+          export ENABLED_SERVICES=tempest
+          export GLARE_CUSTOM_MODULES=glare.tests.sample_artifact
+          export GLARE_ENABLED_TYPES=heat_templates,heat_environments,murano_packages,tosca_templates,images,sample_artifact
+          function pre_test_hook {{
+              source $BASE/new/glare/glare_tempest_plugin/contrib/pre_test_hook.sh
+          }}
+          export -f pre_test_hook
+          function gate_hook {{
+              source $BASE/new/glare/glare_tempest_plugin/contrib/gate_hook.sh
+          }}
+          export -f gate_hook
+          function post_test_hook {{
+              source $BASE/new/glare/glare_tempest_plugin/contrib/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:
+      - test-results
+      - devstack-logs
+      - console-log

jenkins/jobs/projects.yaml

@@ -5053,6 +5053,11 @@
     jobs:
       - python-jobs
       - pypi-jobs
+      - '{pipeline}-glare-dsvm-{node}{suffix}':
+          pipeline: gate
+          node: ubuntu-xenial
+          suffix: ''
+          branch-override: default
 
 - project:
     name: glare-specs

zuul/layout.yaml

@@ -10210,6 +10210,10 @@ projects:
       - name: python35-jobs
       - name: check-requirements
       - name: publish-to-pypi
+    check:
+      - gate-glare-dsvm-ubuntu-xenial
+    gate:
+      - gate-glare-dsvm-ubuntu-xenial
 
   - name: openstack/glare-specs
     template: