From 7b021309ee002ad591cf1754ae96a9337b0437f1 Mon Sep 17 00:00:00 2001 From: Kaifeng Wang Date: Sat, 29 Sep 2018 15:09:12 +0800 Subject: [PATCH] Remove tox checkconfig As we are not maintaining sample config file in the repo now, the checkconfig can be removed since it's always generated from the code. Change-Id: I5bfd7c5cbb048a71864fac4fcfebb940529f87f1 --- tools/config/check_uptodate.sh | 28 ---------------------------- tox.ini | 7 ------- 2 files changed, 35 deletions(-) delete mode 100755 tools/config/check_uptodate.sh diff --git a/tools/config/check_uptodate.sh b/tools/config/check_uptodate.sh deleted file mode 100755 index 0fecc45679..0000000000 --- a/tools/config/check_uptodate.sh +++ /dev/null @@ -1,28 +0,0 @@ -#!/usr/bin/env bash - -PROJECT_NAME=${PROJECT_NAME:-ironic} -CFGFILE_NAME=${PROJECT_NAME}.conf.sample -OSLO_CFGFILE_OPTION=${OSLO_CFGFILE_OPTION:-tools/config/ironic-config-generator.conf} - -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=${OSLO_CFGFILE_OPTION} --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 oslo-config-generator --config-file=${OSLO_CFGFILE_OPTION}" - exit 1 -fi diff --git a/tox.ini b/tox.ini index 0738d56c62..30a6dedd5c 100644 --- a/tox.ini +++ b/tox.ini @@ -56,13 +56,6 @@ commands = coverage report --omit='*tests*' coverage html -d ./cover --omit='*tests*' -[testenv:checkconfig] -basepython = python3 -sitepackages = False -envdir = {toxworkdir}/venv -commands = - {toxinidir}/tools/config/check_uptodate.sh - [testenv:genconfig] basepython = python3 sitepackages = False