Refactoring dsvm gate job

Remove un-wanted pre, post files
Install python-freezerclient

Depends-On: I4b5370c36ed238242e64b23ffcbf155f06b0d65d
Change-Id: I37478a21709496146718110c7f6702fe304a26f5
This commit is contained in:
Saad Zaher 2016-10-13 16:53:45 +00:00
parent 06721248d6
commit 164faf00cc
6 changed files with 15 additions and 48 deletions

View File

@ -20,5 +20,7 @@ export DEVSTACK_LOCAL_CONFIG="enable_plugin freezer-api https://git.openstack.or
export DEVSTACK_GATE_TEMPEST_REGEX="freezer_api_tempest_plugin"
export PROJECTS="openstack/python-freezerclient $PROJECTS"
# Invoke default behavior.
$BASE/new/devstack-gate/devstack-vm-gate.sh

View File

@ -88,6 +88,13 @@ function install_freezer_api {
fi
}
# Setup python-freezerclient
function install_freezerclient {
git_clone $FREEZERCLIENT_REPO $FREEZERCLIENT_DIR $FREEZERCLIENT_BRANCH
setup_develop $FREEZERCLIENT_DIR
}
# executed during: stack post-config
function configure_freezer_api {

View File

@ -31,6 +31,7 @@ if is_service_enabled freezer-api; then
echo_summary "Initializing Freezer API"
init_freezer_api
start_freezer_api
install_freezerclient
fi
if [[ "$1" == "unstack" ]]; then

View File

@ -32,6 +32,11 @@ FREEZER_API_SERVER_TYPE=${FREEZER_API_SERVER_TYPE:-apache2}
FREEZER_API_SERVICE_PROTOCOL=http
FREEZER_API_PORT=9090
# Setup python-freezerclient
FREEZERCLIENT_DIR=$DEST/python-freezerclient
FREEZERCLIENT_REPO=${FREEZERCLIENT_REPO:-${GIT_BASE}/openstack/python-freezerclient.git}
FREEZERCLIENT_BRANCH=${FREEZERCLIENT_BRANCH:-master}
enable_service freezer-api
# Tell Tempest this project is present

View File

@ -1,27 +0,0 @@
#!/bin/bash
#(c) Copyright 2014,2015 Hewlett-Packard Development Company, L.P.
#
# Licensed under the Apache License, Version 2.0 (the "License"); you may
# not use this file except in compliance with the License. You may obtain
# a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
# License for the specific language governing permissions and limitations
# under the License.
# Called by gate-freezer-api-devstack-dsvm job.
# This script is executed inside post_test_hook function in devstack gate.
echo 'Running freezer-api post_test_hook'
# Install packages from test-requirements.txt
sudo pip install -r /opt/stack/new/freezer-api/test-requirements.txt
cd /opt/stack/new/freezer-api/freezer_api/tests
# Here it goes the command to execute integration tests
#sudo ./run_tests.sh

View File

@ -1,21 +0,0 @@
#!/bin/bash -xe
# (C) Copyright 2016 Hewlett Packard Enterprise Development Company LP
#
# Licensed under the Apache License, Version 2.0 (the "License"); you may
# not use this file except in compliance with the License. You may obtain
# a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
# License for the specific language governing permissions and limitations
# under the License.
# Called by gate-freezer-api-devstack-dsvm job.
echo 'Running freezer-api pre_test_hook'
# Nothing to do. Can be used when needed.