Merge "Stop gating on sample generation check"

This commit is contained in:
Jenkins 2015-08-05 04:57:48 +00:00 committed by Gerrit Code Review
commit 4ec06d749a
5 changed files with 8 additions and 1273 deletions

1
.gitignore vendored
View File

@ -2,6 +2,7 @@ AUTHORS
ChangeLog
*.pyc
etc/tempest.conf
etc/tempest.conf.sample
etc/logging.conf
include/swift_objects/swift_small
include/swift_objects/swift_medium

File diff suppressed because it is too large Load Diff

View File

@ -99,6 +99,11 @@ class TempestInit(command.Command):
def copy_config(self, etc_dir, config_dir):
shutil.copytree(config_dir, etc_dir)
def generate_sample_config(self, local_dir):
subprocess.call(['oslo-config-generator', '--config-file',
'tools/config/config-generator.tempest.conf'],
cwd=local_dir)
def create_working_dir(self, local_dir, config_dir):
# Create local dir if missing
if not os.path.isdir(local_dir):
@ -119,6 +124,8 @@ class TempestInit(command.Command):
os.mkdir(log_dir)
# Create and copy local etc dir
self.copy_config(etc_dir, config_dir)
# Generate the sample config file
self.generate_sample_config(local_dir)
# Update local confs to reflect local paths
self.update_local_conf(config_path, lock_dir, log_dir)
# Generate a testr conf file

View File

@ -1,29 +0,0 @@
#!/usr/bin/env bash
PROJECT_NAME=${PROJECT_NAME:-tempest}
CFGFILE_NAME=${PROJECT_NAME}.conf.sample
if [ -e etc/${PROJECT_NAME}/${CFGFILE_NAME} ]; then
CFGFILE=etc/${PROJECT_NAME}/${CFGFILE_NAME}
elif [ -e etc/${CFGFILE_NAME} ]; then
CFGFILE=etc/${CFGFILE_NAME}
else
echo "${0##*/}: can not find config file"
exit 1
fi
TEMPDIR=`mktemp -d /tmp/${PROJECT_NAME}.XXXXXX`
trap "rm -rf $TEMPDIR" EXIT
oslo-config-generator --config-file tools/config/config-generator.tempest.conf --output-file ${TEMPDIR}/${CFGFILE_NAME}
if [ $? != 0 ]
then
exit 1
fi
if ! diff -u ${TEMPDIR}/${CFGFILE_NAME} ${CFGFILE}
then
echo "${0##*/}: ${PROJECT_NAME}.conf.sample is not up to date."
echo "${0##*/}: Please run tox -egenconfig."
exit 1
fi

View File

@ -116,7 +116,6 @@ commands =
[testenv:pep8]
commands =
flake8 {posargs}
{toxinidir}/tools/config/check_uptodate.sh
python tools/check_uuid.py
[testenv:uuidgen]