Skip to content
Snippets Groups Projects
Commit ceb4b4df authored by ale's avatar ale
Browse files

Support CI env var APT_PROXY

parent 888f11b0
No related branches found
No related tags found
1 merge request!177Refactor create-env and tests
...@@ -24,6 +24,7 @@ variables: ...@@ -24,6 +24,7 @@ variables:
-e ansible_cfg.defaults.log_path=ansible.log -e ansible_cfg.defaults.log_path=ansible.log
${LIBVIRT:+-e libvirt.remote_host=${LIBVIRT#*@} -e libvirt.remote_user=${LIBVIRT%@*}} ${LIBVIRT:+-e libvirt.remote_host=${LIBVIRT#*@} -e libvirt.remote_user=${LIBVIRT%@*}}
${MITOGEN:+-e ansible_cfg.defaults.strategy=mitogen_linear -e ansible_cfg.defaults.strategy_plugins=${MITOGEN}/ansible_mitogen/plugins/strategy} ${MITOGEN:+-e ansible_cfg.defaults.strategy=mitogen_linear -e ansible_cfg.defaults.strategy_plugins=${MITOGEN}/ansible_mitogen/plugins/strategy}
${APT_PROXY:+-e config.apt_proxy=${APT_PROXY} -e config.apt_proxy_enable_https=true}
$CREATE_ENV_VARS $BUILD_DIR $CREATE_ENV_VARS $BUILD_DIR
- with-ssh-key ./test-driver init $BUILD_DIR - with-ssh-key ./test-driver init $BUILD_DIR
......
...@@ -67,10 +67,8 @@ run_init() { ...@@ -67,10 +67,8 @@ run_init() {
|| die "failed to run the init-credentials playbook" || die "failed to run the init-credentials playbook"
log Running main playbook log Running main playbook
env ANSIBLE_STDOUT_CALLBACK=debug \ ${float_dir}/float run -vv site.yml \
${float_dir}/float run -vvv site.yml \
|| die "failed to run the main playbook" || die "failed to run the main playbook"
} }
run_cleanup() { run_cleanup() {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment