Merge "Add sg-core integration test"
diff --git a/.zuul.yaml b/.zuul.yaml
index 07b1af8..211fc57 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -96,6 +96,7 @@
         CEILOMETER_BACKENDS: "gnocchi,sg-core"
         CEILOMETER_PIPELINE_INTERVAL: 15
         CEILOMETER_ALARM_THRESHOLD: 6000000000
+        GLOBAL_VENV: False
       devstack_local_conf:
         test-config:
           $TEMPEST_CONFIG:
@@ -103,11 +104,11 @@
               disable_ssl_certificate_validation: True
       tempest_test_regex: telemetry_tempest_plugin
       tox_envlist: all
+      branches: ^(?!stable/(ocata|pike|queens|rocky|stein)).*$
 
 - job:
     name: telemetry-dsvm-integration
     parent: telemetry-tempest-base
-    branches: ^(?!stable/(ocata|pike|queens|rocky|stein|train)).*$
 
 - job:
     name: telemetry-dsvm-integration
@@ -137,7 +138,6 @@
 - job:
     name: telemetry-dsvm-integration-ipv6-only
     parent: devstack-tempest-ipv6
-    branches: ^(?!stable/(ocata|pike|queens|rocky|stein)).*$
     description: |
       Telemetry devstack tempest tests job for IPv6-only deployment
     required-projects: *base_required_projects
@@ -155,6 +155,7 @@
     parent: telemetry-dsvm-integration
     nodeset: openstack-single-node-bionic
     override-checkout: stable/train
+    voting: false
     vars:
       devstack_localrc:
         USE_PYTHON3: True
diff --git a/doc/source/test_additions.rst b/doc/source/test_additions.rst
new file mode 100644
index 0000000..8b1e103
--- /dev/null
+++ b/doc/source/test_additions.rst
@@ -0,0 +1,12 @@
+=======================
+Adding additional tests
+=======================
+
+:Modify .zuul.yaml:
+    Make required modifications to the devstack configuration in the .zuul.yaml. Mainly add any new required projects and env variables. If you require a non-openstack project, check that it's listed in the project-config under the openstack tenant: https://opendev.org/openstack/project-config/src/branch/master/zuul/main.yaml. Create a patch for the project-config to add that project if it isn't already there, otherwise it won't be available in check and gate jobs.
+
+:Add tests:
+    Add new tests. These can be either the scenario tests using gabbi: https://gabbi.readthedocs.io/en/latest/ or python code using tempest directly. See https://docs.openstack.org/tempest/latest/field_guide/index.html. If there is some configuration required to run the tests, take a look at the telemetry_tempest_plugin/conf.py.
+
+:Example:
+    An example of adding a simple test can be seen here: https://review.opendev.org/c/openstack/telemetry-tempest-plugin/+/898201