Make legacy gates working

- make pep8 working by removing ChangeLog that is not generated
- make maven working by removing condidation for user
- make legacy dsvm working by using $USER intstead of hardcoded jenkins

Change-Id: I30f2edc4d34d0fad63f961f99dcecaf5c767f57f
This commit is contained in:
Tomasz Trębski 2017-10-18 08:26:31 +02:00
parent a352660295
commit dae93af09d
5 changed files with 5 additions and 21 deletions

View File

@ -6,24 +6,15 @@ MVN=$1
VERSION=$2 VERSION=$2
BRANCH=$3 BRANCH=$3
check_user() {
ME=$1
if [ "${ME}" != "jenkins" ]; then
echo "\nERROR: Download monasca-common and do a mvn install to install the monasca-commom jars\n" 1>&2
exit 1
fi
}
BUILD_COMMON=false BUILD_COMMON=false
POM_FILE=~/.m2/repository/monasca-common/monasca-common/${VERSION}/monasca-common-${VERSION}.pom POM_FILE=~/.m2/repository/monasca-common/monasca-common/${VERSION}/monasca-common-${VERSION}.pom
if [ ! -r "${POM_FILE}" ]; then if [ ! -r "${POM_FILE}" ]; then
check_user ${ME}
BUILD_COMMON=true BUILD_COMMON=true
fi fi
# This should only be done on the stack forge system # This should only be done on the stack forge system
if [ "${BUILD_COMMON}" = "true" ]; then if [ "${BUILD_COMMON}" = "true" ]; then
git clone -b ${BRANCH} https://git.openstack.org/openstack/monasca-common git clone -b ${BRANCH} https://git.openstack.org/openstack/monasca-common --depth 1
cd monasca-common cd monasca-common
${MVN} clean ${MVN} clean
${MVN} install ${MVN} install

View File

@ -86,8 +86,8 @@ echo_summary "monasca's post_test_hook.sh was called..."
export MONASCA_API_DIR="$BASE/new/monasca-api" export MONASCA_API_DIR="$BASE/new/monasca-api"
export TEMPEST_DIR="$BASE/new/tempest" export TEMPEST_DIR="$BASE/new/tempest"
sudo chown -R jenkins:stack $MONASCA_API_DIR sudo chown -R "${USER}":stack $MONASCA_API_DIR
sudo chown -R jenkins:stack $TEMPEST_DIR sudo chown -R "${USER}":stack $TEMPEST_DIR
load_devstack_utilities load_devstack_utilities
setup_monasca_api setup_monasca_api

View File

@ -1 +0,0 @@
.. include:: ../../../ChangeLog

View File

@ -103,14 +103,6 @@ Developer reference
code code
Changelog
---------
.. toctree::
:maxdepth: 1
history
This documentation is generated by the Sphinx toolkit and lives in the source This documentation is generated by the Sphinx toolkit and lives in the source
tree. Additional documentation on Monasca and other components of OpenStack can tree. Additional documentation on Monasca and other components of OpenStack can
be found on the `OpenStack wiki <http://wiki.openstack.org>`_. be found on the `OpenStack wiki <http://wiki.openstack.org>`_.

View File

@ -153,3 +153,5 @@ show-source = True
[hacking] [hacking]
local-check-factory = monasca_api.hacking.checks.factory local-check-factory = monasca_api.hacking.checks.factory
import_exceptions =
six.moves