summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZuul <zuul@review.openstack.org>2019-03-18 14:10:57 +0000
committerGerrit Code Review <review@openstack.org>2019-03-18 14:10:57 +0000
commita195df7af8591ff63ae705418f0a07585a8391f1 (patch)
treed7ccae8ec462fd7b8bddfd507c81cf13ff14aa32
parentda7a8592ae22344de1b1fa6ffdcc4455c5ce6e89 (diff)
parent175cfeef5c98e67299842d5ff3e36ed5e1978c4b (diff)
downloadosprofiler-a195df7af8591ff63ae705418f0a07585a8391f1.tar.gz
Merge "Add a job to run full Tempest with enabled profiler"
-rw-r--r--.zuul.yaml18
-rw-r--r--devstack/lib/osprofiler5
-rw-r--r--devstack/plugin.sh5
3 files changed, 28 insertions, 0 deletions
diff --git a/.zuul.yaml b/.zuul.yaml
index f855232..f4f58d0 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -15,7 +15,25 @@
jobs:
- openstack-tox-functional
- openstack-tox-functional-py35
+ - tempest-full-py3-profiler-enabled
gate:
jobs:
- openstack-tox-functional
- openstack-tox-functional-py35
+ - tempest-full-py3-profiler-enabled
+
+- job:
+ name: tempest-full-py3-profiler-enabled
+ parent: tempest-full-py3
+ voting: false
+ description: |
+ Run full tempest on py3 with profiling enabled
+ required-projects:
+ - openstack/osprofiler
+ vars:
+ tox_envlist: full
+ devstack_localrc:
+ OSPROFILER_COLLECTOR: redis
+ OSPROFILER_HMAC_KEYS: SECRET_KEY
+ devstack_plugins:
+ osprofiler: https://git.openstack.org/openstack/osprofiler
diff --git a/devstack/lib/osprofiler b/devstack/lib/osprofiler
index c8055db..8a7351b 100644
--- a/devstack/lib/osprofiler
+++ b/devstack/lib/osprofiler
@@ -133,6 +133,11 @@ function configure_osprofiler() {
reload_service devstack@keystone
}
+function configure_osprofiler_in_tempest() {
+
+ iniset $TEMPEST_CONFIG profiler key $OSPROFILER_HMAC_KEYS
+}
+
# Restore xtrace
$XTRACE
diff --git a/devstack/plugin.sh b/devstack/plugin.sh
index 600c86e..72c0bca 100644
--- a/devstack/plugin.sh
+++ b/devstack/plugin.sh
@@ -14,6 +14,11 @@ if [[ "$1" == "stack" && "$2" == "install" ]]; then
elif [[ "$1" == "stack" && "$2" == "post-config" ]]; then
echo_summary "Configuring OSProfiler"
configure_osprofiler
+
+elif [[ "$1" == "stack" && "$2" == "test-config" ]]; then
+ echo_summary "Configuring Tempest"
+ configure_osprofiler_in_tempest
+
fi
# Restore xtrace