Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
F
float
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Container registry
Model registry
Operate
Environments
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
ai3
float
Commits
ceb4b4df
Commit
ceb4b4df
authored
4 years ago
by
ale
Browse files
Options
Downloads
Patches
Plain Diff
Support CI env var APT_PROXY
parent
888f11b0
No related branches found
No related tags found
1 merge request
!177
Refactor create-env and tests
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
.gitlab-ci.yml
+1
-0
1 addition, 0 deletions
.gitlab-ci.yml
test-driver
+1
-3
1 addition, 3 deletions
test-driver
with
2 additions
and
3 deletions
.gitlab-ci.yml
+
1
−
0
View file @
ceb4b4df
...
@@ -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
...
...
This diff is collapsed.
Click to expand it.
test-driver
+
1
−
3
View file @
ceb4b4df
...
@@ -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
()
{
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment