Add override_repos into tripleo-ci tripleo-repos role
The tripleo-repos role in tripleo-ci defaults to current-tripleo for master and current for everything else. There is no support for the tripleo-ci-testing repo. This adds 2 params: i) override_repos as a param to tripleo-ci tripleo-repos and ii) buildcontainers_override_repos as a param in the tripleo-buildcontainers job. ii) is passed from periodic version of buildcontainers in [1] and is then used to set the value of override_repos, passed into ci tripleo-repos. The depends-on adds tripleo-ci-testing as an option for tripleo-repos itself as it is currently unsupported. Tracked by tripleo ci squad with [2]. See test review at [3] which runs the periodic container build in check with this code. Also adds /etc/yum.repos.d/ into collected buildcontainer logs. [1] https://review.rdoproject.org/r/18975 [2] https://tree.taiga.io/project/tripleo-ci-board/task/773 [3] https://review.rdoproject.org/r/19000 Depends-On: https://review.openstack.org/638651 # tripleo-repos Change-Id: I37bc90881ef19ae4aeace65750da4dd93da5f4e2
This commit is contained in:
parent
9a5df5d480
commit
d427ed641d
|
@ -2,3 +2,4 @@ push_registry: "127.0.0.1:8787"
|
|||
push_tag: "latest"
|
||||
push_containers: "false"
|
||||
use_buildah: false
|
||||
buildcontainers_override_repos: ""
|
||||
|
|
|
@ -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 }}"
|
||||
|
|
|
@ -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:
|
||||
|
|
|
@ -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: ""
|
||||
|
||||
|
|
|
@ -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') }}" \
|
||||
|
|
Loading…
Reference in New Issue