Merge "Add override_repos into tripleo-ci tripleo-repos role"

This commit is contained in:
Zuul 2019-03-01 16:26:00 +00:00 committed by Gerrit Code Review
commit 4923664d17
5 changed files with 10 additions and 3 deletions

View File

@ -2,3 +2,4 @@ push_registry: "127.0.0.1:8787"
push_tag: "latest"
push_containers: "false"
use_buildah: false
buildcontainers_override_repos: ""

View File

@ -21,6 +21,7 @@
rsync -var --no-links /var/log/ {{ workspace }}/logs/system/ || true
rsync -var --no-links /etc/docker/ {{ workspace }}/etc/docker/ || true
rsync -var --no-links /etc/containers/ {{ workspace }}/etc/containers/ || true
rsync -var --no-links /etc/yum.repos.d/ {{ workspace }}/etc/yum.repos.d/ || true
gzip -r "{{ workspace }}/logs" "{{ workspace }}/conf" "{{ workspace }}/etc"
chmod -R a+r "{{ workspace }}"
chown -R {{ ansible_user }}: "{{ workspace }}"

View File

@ -3,6 +3,7 @@
roles:
- role: tripleo-repos
tripleo_repos_repository: "{{ ansible_user_dir }}/{{ zuul.projects['git.openstack.org/openstack/tripleo-repos'].src_dir }}"
override_repos: "{{ buildcontainers_override_repos | default('') }}"
tasks:
- name: Include common vars
include_vars:

View File

@ -4,3 +4,5 @@ tripleo_repos_repository: "git+https://git.openstack.org/openstack/tripleo-repos
workspace: "{{ ansible_user_dir }}"
centos_mirror_host: "http://mirror.centos.org"
rdo_mirror_host: "https://trunk.rdoproject.org"
override_repos: ""

View File

@ -34,10 +34,12 @@
CENTOS_MIRROR_HOST=${CENTOS_MIRROR_HOST:-"{{ centos_mirror_host }}"}
RDO_MIRROR_HOST=${NODEPOOL_RDO_PROXY:-"{{ rdo_mirror_host }}"}
if [ "{{ ci_branch | default('master') }}" == "master" ]; then
REPO=current-tripleo
if [ "{{ override_repos }}" != "" ]; then
REPO="{{ override_repos }}"
elif [ "{{ ci_branch | default('master') }}" == "master" ]; then
REPO=current-tripleo
else
REPO=current
REPO=current
fi
tripleo-repos -b "{{ ci_branch | default('master') }}" \