From d910229ce9fb9193ca4505d3b8f09d7e536a71ef Mon Sep 17 00:00:00 2001
From: Andrii Ostapenko <andrii.ostapenko@att.com>
Date: Mon, 22 Jun 2020 10:19:21 -0500
Subject: [PATCH] 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>
---
 .zuul.d/octavia.yaml          | 2 ++
 dockerfiles/leap15/Dockerfile | 2 +-
 playbooks/setup-gate.yaml     | 5 ++++-
 playbooks/vars.yaml           | 2 +-
 4 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/.zuul.d/octavia.yaml b/.zuul.d/octavia.yaml
index d64542b9..719ede85 100644
--- a/.zuul.d/octavia.yaml
+++ b/.zuul.d/octavia.yaml
@@ -14,6 +14,8 @@
     parent: loci-base
     vars:
       project: octavia
+      eol:
+        - ocata
     required-projects:
       - openstack/loci
       - openstack/requirements
diff --git a/dockerfiles/leap15/Dockerfile b/dockerfiles/leap15/Dockerfile
index 07076dbb..098bd3d6 100644
--- a/dockerfiles/leap15/Dockerfile
+++ b/dockerfiles/leap15/Dockerfile
@@ -1,4 +1,4 @@
-ARG FROM=opensuse/leap:15
+ARG FROM=opensuse/leap:15.1
 FROM ${FROM}
 
 ARG PACKAGE_MIRROR=http://download.opensuse.org/
diff --git a/playbooks/setup-gate.yaml b/playbooks/setup-gate.yaml
index a5694f7d..2af0f5b7 100644
--- a/playbooks/setup-gate.yaml
+++ b/playbooks/setup-gate.yaml
@@ -1,4 +1,8 @@
 - hosts: all
+  become: yes
+  roles:
+    - ensure-pip
+
   tasks:
     - include_vars: vars.yaml
 
@@ -40,7 +44,6 @@
         - apt:
             name:
               - docker-ce
-              - python-pip
             allow_unauthenticated: True
         - pip:
             name: docker
diff --git a/playbooks/vars.yaml b/playbooks/vars.yaml
index 2b50176a..a5a0a6b2 100644
--- a/playbooks/vars.yaml
+++ b/playbooks/vars.yaml
@@ -74,7 +74,7 @@ distros:
       project:
         PROJECT: "{{ 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"
         WHEELS: 172.17.0.1:5000/loci/requirements:ocata-ubuntu_xenial
         FROM: base:ubuntu_xenial