run_syntax_tests: add logic to find which puppet version to test
In Project Config, we dropped the logic that exported FUTURE_PARSER for us, and we now do it in the run_syntax_tests.sh script. Change-Id: I9aee6cf261722ed773058bc00b964e2f9d630e45
This commit is contained in:
parent
aa4b9f2c5f
commit
42c8003c1d
|
@ -14,9 +14,17 @@
|
||||||
# under the License.
|
# under the License.
|
||||||
|
|
||||||
export SCRIPT_DIR=$(cd `dirname $0` && pwd -P)
|
export SCRIPT_DIR=$(cd `dirname $0` && pwd -P)
|
||||||
export FUTURE_PARSER=${FUTURE_PARSER:-no}
|
|
||||||
source $SCRIPT_DIR/functions
|
source $SCRIPT_DIR/functions
|
||||||
|
|
||||||
|
export PUPPET_VERSION=${PUPPET_VERSION:-4}
|
||||||
|
PUPPET_MAJOR_VERSION=`echo $PUPPET_VERSION | cut -c 1`
|
||||||
|
export PUPPET_GEM_VERSION="~> $PUPPET_MAJOR_VERSION"
|
||||||
|
if [ "$PUPPET_MAJOR_VERSION" -lt "4" ]; then
|
||||||
|
export FUTURE_PARSER=${FUTURE_PARSER:-yes}
|
||||||
|
else
|
||||||
|
export FUTURE_PARSER=${FUTURE_PARSER:-no}
|
||||||
|
fi
|
||||||
|
|
||||||
install_gems
|
install_gems
|
||||||
|
|
||||||
# run unit tests
|
# run unit tests
|
||||||
|
|
Loading…
Reference in New Issue