openstack/tripleo-ci
Code Issues Proposed changes

Merge "Use Docker v2 registry mirrors from Opendev infra"

Browse Source
This commit is contained in:
Zuul 2019-03-13 21:13:30 +00:00 committed by Gerrit Code Review
commit dce9416f94
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
roles/run-test/templates/common_vars.bash.j2
View File

@ -44,7 +44,7 @@ export PATH=/sbin:/usr/sbin:$PATH
export UNDERCLOUD_VM_NAME=instack
export NODEPOOL_DOCKER_REGISTRY_PROXY=${NODEPOOL_DOCKER_REGISTRY_PROXY:-""}
export NODEPOOL_DOCKER_REGISTRY_V2_PROXY=${NODEPOOL_DOCKER_REGISTRY_V2_PROXY:-""}
# post ci chores to run at the end of ci
SSH_OPTIONS='-o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -o LogLevel=Verbose -o PasswordAuthentication=no -o ConnectionAttempts=32'

2
scripts/common_vars.bash
View File

@ -47,7 +47,7 @@ export PATH=/sbin:/usr/sbin:$PATH
export UNDERCLOUD_VM_NAME=instack
export REMAINING_TIME=${REMAINING_TIME:-180}
export NODEPOOL_DOCKER_REGISTRY_PROXY=${NODEPOOL_DOCKER_REGISTRY_PROXY:-""}
export NODEPOOL_DOCKER_REGISTRY_V2_PROXY=${NODEPOOL_DOCKER_REGISTRY_V2_PROXY:-""}
# post ci chores to run at the end of ci
SSH_OPTIONS='-o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -o LogLevel=Verbose -o PasswordAuthentication=no -o ConnectionAttempts=32'

2
toci-quickstart/config/testenv/multinode.yml
View File

@ -8,7 +8,7 @@ workers_args: >-
-e {{ tripleo_root }}/tripleo-ci/test-environments/worker-config.yaml
-e {{ overcloud_templates_path }}/environments/debug.yaml
# undercloud deployment
undercloud_docker_registry_mirror: "{{ lookup('env','NODEPOOL_DOCKER_REGISTRY_PROXY') }}"
undercloud_docker_registry_mirror: "{{ lookup('env','NODEPOOL_DOCKER_REGISTRY_V2_PROXY') }}"
dlrn_use_local_mirrors: true

2
toci-quickstart/config/testenv/ovb.yml
View File

@ -18,7 +18,7 @@ undercloud_ironic_ipxe_port: 3816
non_root_user_setup: false
step_set_undercloud_hostname: true
undercloud_hostname: undercloud
undercloud_docker_registry_mirror: "{{ lookup('env','NODEPOOL_DOCKER_REGISTRY_PROXY') }}"
undercloud_docker_registry_mirror: "{{ lookup('env','NODEPOOL_DOCKER_REGISTRY_V2_PROXY') }}"
dlrn_use_local_mirrors: true
run_validate_undercloud: true
step_overcloud_prep_flavors: false