From 7a109ff338394e8c0ee355ec0a10b2e9439d431d Mon Sep 17 00:00:00 2001
From: Deklan Dieterly <deklan.dieterly@hpe.com>
Date: Thu, 10 Mar 2016 14:14:02 -0700
Subject: [PATCH] Modify gate-freezer-api-devstack-dsvm job
This change is needed to have
the tempest plugin integrated in the
freezer-api gate job.
Needed-By: Ife68257a4c281299cedc4ed79db50ca5290375c5
We are currently blocked.
Changes details:
- Add freezer-api pre_test_hook.
- Source freezer-api gate_hook script.
- Source freezer-api post_test_hook script.
- Source freezer gate_hook script.
- Run freezer post_test_hook script.
- Remove unneeded projects from freezer-api: freezer-web-ui and freezer.
- Put Freezer API devstack plugin env var in job.
- Put Freezer devstack plugin env var in job.
Change-Id: Idbbd4ef8b6f5c767523beb439c4f2aa041cb6dd9
---
jenkins/jobs/freezer.yaml | 18 +++++++++++-------
1 file changed, 11 insertions(+), 7 deletions(-)
diff --git a/jenkins/jobs/freezer.yaml b/jenkins/jobs/freezer.yaml
index 96b000abc8..0e66acab2c 100644
--- a/jenkins/jobs/freezer.yaml
+++ b/jenkins/jobs/freezer.yaml
@@ -20,14 +20,15 @@
export DEVSTACK_GATE_TEMPEST=1
export DEVSTACK_GATE_TEMPEST_ALL_PLUGINS=1
export DEVSTACK_GATE_TEMPEST_REGEX="freezer_tempest_plugin"
+ export DEVSTACK_LOCAL_CONFIG="enable_plugin freezer https://git.openstack.org/openstack/freezer"
function gate_hook {
- $BASE/new/freezer-api/devstack/gate_hook.sh
+ source $BASE/new/freezer/devstack/gate_hook.sh
}
export -f gate_hook
function post_test_hook {
- cd /opt/stack/new/freezer-api/freezer_api/tests/
+ cd /opt/stack/new/freezer/tests/integration/
./post_test_hook.sh
}
export -f post_test_hook
@@ -94,20 +95,23 @@
#!/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 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 {
- $BASE/new/freezer-api/devstack/gate_hook.sh
+ source $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
+ source $BASE/new/freezer-api/freezer_api/tests/post_test_hook.sh
}
export -f post_test_hook