Merge "Add branching in LOCI"
This commit is contained in:
commit
886620357f
|
@ -17,7 +17,17 @@ reuse_requirements: False
|
|||
# Override Zuul inferrence of source directory from project name to always
|
||||
# use "loci".
|
||||
loci_src_dir: "src/git.openstack.org/openstack/loci"
|
||||
branch: "{{ zuul_execution_branch.split('/')[-1] }}"
|
||||
# Branch name used for image building and publishing
|
||||
# If running in an environment with zuul and under a branched project
|
||||
# (like openstack/cinder, openstack/nova, ... but not openstack/loci)
|
||||
# this will be automatically be set to the appropriate branch name (rocky, queens, ...)
|
||||
branch: "{{ branchname | default(zuul_execution_branch.split('/')[-1]) }}"
|
||||
# Upstream code reference.
|
||||
# As LOCI is not building images on a per-commit basis on upstream openstack projects,
|
||||
# pointing to upstream zuul_branch for gating is enough.
|
||||
# If a project_ref is passed in a gating variable (like how you would do directly
|
||||
# in the command line), it will get consumed during image building.
|
||||
project_reference: "{% if project_ref is defined %}{{ project_ref }}{% elif zuul_branch is defined %}{{ zuul_branch }}{% else %}master{% endif %}"
|
||||
|
||||
distros:
|
||||
- name: centos
|
||||
|
@ -30,6 +40,7 @@ distros:
|
|||
project:
|
||||
PROJECT: "{{ project }}"
|
||||
PROJECT_REPO: http://172.17.0.1/git/openstack/{{ project }}
|
||||
PROJECT_REF: "{{ project_reference }}"
|
||||
WHEELS: 172.17.0.1:5000/loci/requirements:{{ branch }}-centos
|
||||
FROM: base:centos
|
||||
requirements:
|
||||
|
@ -49,6 +60,7 @@ distros:
|
|||
project:
|
||||
PROJECT: "{{ project }}"
|
||||
PROJECT_REPO: http://172.17.0.1/git/openstack/{{ project }}
|
||||
PROJECT_REF: "{{ project_reference }}"
|
||||
WHEELS: 172.17.0.1:5000/loci/requirements:{{ branch }}-ubuntu
|
||||
FROM: base:ubuntu
|
||||
requirements:
|
||||
|
@ -84,6 +96,7 @@ distros:
|
|||
# project:
|
||||
# PROJECT: "{{ project }}"
|
||||
# PROJECT_REPO: http://172.17.0.1/git/openstack/{{ project }}
|
||||
# PROJECT_REF: "{{ project_reference }}"
|
||||
# WHEELS: 172.17.0.1:5000/loci/requirements:master-debian
|
||||
# FROM: base:debian
|
||||
# requirements:
|
||||
|
|
Loading…
Reference in New Issue