New run_tests.sh
Change-Id: I51dc561d147a79562357a5fdfca5bf5ec0b938fa
This commit is contained in:
parent
ca224cb19b
commit
d594b64432
|
@ -18,7 +18,7 @@ SALT_PILLAR_DIR=${SALT_PILLAR_DIR:-${BUILDDIR}/pillar_root}
|
||||||
SALT_CONFIG_DIR=${SALT_CONFIG_DIR:-${BUILDDIR}/salt}
|
SALT_CONFIG_DIR=${SALT_CONFIG_DIR:-${BUILDDIR}/salt}
|
||||||
SALT_CACHE_DIR=${SALT_CACHE_DIR:-${SALT_CONFIG_DIR}/cache}
|
SALT_CACHE_DIR=${SALT_CACHE_DIR:-${SALT_CONFIG_DIR}/cache}
|
||||||
|
|
||||||
SALT_OPTS="${SALT_OPTS} --retcode-passthrough --local -c ${SALT_CONFIG_DIR}"
|
SALT_OPTS="${SALT_OPTS} --retcode-passthrough --local -c ${SALT_CONFIG_DIR} --log-file=/dev/null"
|
||||||
|
|
||||||
if [ "x${SALT_VERSION}" != "x" ]; then
|
if [ "x${SALT_VERSION}" != "x" ]; then
|
||||||
PIP_SALT_VERSION="==${SALT_VERSION}"
|
PIP_SALT_VERSION="==${SALT_VERSION}"
|
||||||
|
@ -64,6 +64,7 @@ setup_salt() {
|
||||||
file_client: local
|
file_client: local
|
||||||
cachedir: ${SALT_CACHE_DIR}
|
cachedir: ${SALT_CACHE_DIR}
|
||||||
verify_env: False
|
verify_env: False
|
||||||
|
minion_id_caching: False
|
||||||
|
|
||||||
file_roots:
|
file_roots:
|
||||||
base:
|
base:
|
||||||
|
|
Loading…
Reference in New Issue