Allow to specify eol release for project and fix gates

There's a need to keep building images from eol releases. This commit
introduces ability to specify eol release for project and clone to
{release}-eol instead of stable/{release}

Octavia moved to eol, using ocata-eol instead.

Also fixes gates providing ensure-pip role to executor.

Also pins openSUSE image to 15.1

Change-Id: I041033bb6c9cfe193c4bae9a0b6b4028f4602c5f
Signed-off-by: Andrii Ostapenko <andrii.ostapenko@att.com>
This commit is contained in:
Andrii Ostapenko 2020-06-22 10:19:21 -05:00
parent f022ecba55
commit d910229ce9
No known key found for this signature in database
GPG Key ID: F3E83668DBB223B3
4 changed files with 8 additions and 3 deletions

View File

@ -14,6 +14,8 @@
parent: loci-base parent: loci-base
vars: vars:
project: octavia project: octavia
eol:
- ocata
required-projects: required-projects:
- openstack/loci - openstack/loci
- openstack/requirements - openstack/requirements

View File

@ -1,4 +1,4 @@
ARG FROM=opensuse/leap:15 ARG FROM=opensuse/leap:15.1
FROM ${FROM} FROM ${FROM}
ARG PACKAGE_MIRROR=http://download.opensuse.org/ ARG PACKAGE_MIRROR=http://download.opensuse.org/

View File

@ -1,4 +1,8 @@
- hosts: all - hosts: all
become: yes
roles:
- ensure-pip
tasks: tasks:
- include_vars: vars.yaml - include_vars: vars.yaml
@ -40,7 +44,6 @@
- apt: - apt:
name: name:
- docker-ce - docker-ce
- python-pip
allow_unauthenticated: True allow_unauthenticated: True
- pip: - pip:
name: docker name: docker

View File

@ -74,7 +74,7 @@ distros:
project: project:
PROJECT: "{{ project }}" PROJECT: "{{ project }}"
PROJECT_REPO: http://172.17.0.1/git/openstack/{{ project }} PROJECT_REPO: http://172.17.0.1/git/openstack/{{ project }}
PROJECT_REF: "stable/ocata" PROJECT_REF: "{% if eol is defined and 'ocata' in eol %}ocata-eol{% else %}stable/ocata{% endif %}"
PROJECT_RELEASE: "ocata" PROJECT_RELEASE: "ocata"
WHEELS: 172.17.0.1:5000/loci/requirements:ocata-ubuntu_xenial WHEELS: 172.17.0.1:5000/loci/requirements:ocata-ubuntu_xenial
FROM: base:ubuntu_xenial FROM: base:ubuntu_xenial