From ceb4b4df478040dc8698f7f4501bef08ae7dabcc Mon Sep 17 00:00:00 2001
From: ale <ale@incal.net>
Date: Mon, 15 Mar 2021 13:02:37 +0000
Subject: [PATCH] Support CI env var APT_PROXY
---
.gitlab-ci.yml | 1 +
test-driver | 4 +---
2 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 2ebc7f68..5db71a36 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -24,6 +24,7 @@ variables:
-e ansible_cfg.defaults.log_path=ansible.log
${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}
+ ${APT_PROXY:+-e config.apt_proxy=${APT_PROXY} -e config.apt_proxy_enable_https=true}
$CREATE_ENV_VARS $BUILD_DIR
- with-ssh-key ./test-driver init $BUILD_DIR
diff --git a/test-driver b/test-driver
index bfbecb3e..6e17a00c 100755
--- a/test-driver
+++ b/test-driver
@@ -67,10 +67,8 @@ run_init() {
|| die "failed to run the init-credentials playbook"
log Running main playbook
- env ANSIBLE_STDOUT_CALLBACK=debug \
- ${float_dir}/float run -vvv site.yml \
+ ${float_dir}/float run -vv site.yml \
|| die "failed to run the main playbook"
-
}
run_cleanup() {
--
GitLab