From 99fe89794f7c6bb00031dd469cb376360f7e51ec Mon Sep 17 00:00:00 2001 From: Noorul Islam K M Date: Wed, 8 Jan 2014 09:06:00 +0530 Subject: [PATCH] Move devstack hooks from infra config to solum repo To minimize the work done in infra project and reduce the dependency, let us have code in solum repository and invoke the same from devstack job. Solum part is here [1]. [1] https://review.openstack.org/65507 Change-Id: I0f763b20f60d56ffd7e1630303c1e936f80f61d8 --- .../files/jenkins_job_builder/config/solum.yaml | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/modules/openstack_project/files/jenkins_job_builder/config/solum.yaml b/modules/openstack_project/files/jenkins_job_builder/config/solum.yaml index 7c6f53a99c..db4b5de30d 100644 --- a/modules/openstack_project/files/jenkins_job_builder/config/solum.yaml +++ b/modules/openstack_project/files/jenkins_job_builder/config/solum.yaml @@ -18,20 +18,14 @@ export PROJECTS="stackforge/solum" function pre_test_hook { - # Install packages from test-requirements.txt - sudo pip install -r /opt/stack/new/solum/test-requirements.txt - - # Install solum devstack integration - SOLUM_BASE=/opt/stack/new/solum/contrib/devstack - DEVSTACK_BASE=/opt/stack/new/devstack - cp $SOLUM_BASE/lib/* $DEVSTACK_BASE/lib - cp $SOLUM_BASE/extras.d/* $DEVSTACK_BASE/extras.d + cd /opt/stack/new/solum/functionaltests + ./pre_test_hook.sh } export -f pre_test_hook function post_test_hook { cd /opt/stack/new/solum/functionaltests - ./run_tests.sh + ./post_test_hook.sh } export -f post_test_hook