From f78e45c304177a4478e4612578c8de896983a918 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Evrard <jean-philippe@evrard.me>
Date: Wed, 17 Oct 2018 14:34:25 +0200
Subject: [PATCH] Build OpenSUSE Leap 15 by default

This includes the building of OpenSUSE Leap 15 in checks/gates.

As the build of each project requires the building of the
requirements first, added to the fact that a new distro is added
into the jobs, this extends the timeout for the base job beyond
the maximum time for requirements, so that all the projects
(excluding requirements) have more time to complete.

Change-Id: I73b055b3942a6d80b8474544a9d65df0b3005e15
---
 .zuul.d/base.yaml             |  2 +-
 dockerfiles/leap15/Dockerfile | 10 ++++++++++
 playbooks/vars.yaml           | 15 +++++++++++++++
 3 files changed, 26 insertions(+), 1 deletion(-)
 create mode 100644 dockerfiles/leap15/Dockerfile

diff --git a/.zuul.d/base.yaml b/.zuul.d/base.yaml
index 803989c..b6cfe56 100644
--- a/.zuul.d/base.yaml
+++ b/.zuul.d/base.yaml
@@ -3,4 +3,4 @@
     pre-run: playbooks/setup-gate.yaml
     run: playbooks/loci-builder.yaml
     post-run: playbooks/post.yaml
-    timeout: 1200
+    timeout: 3600
diff --git a/dockerfiles/leap15/Dockerfile b/dockerfiles/leap15/Dockerfile
new file mode 100644
index 0000000..07076db
--- /dev/null
+++ b/dockerfiles/leap15/Dockerfile
@@ -0,0 +1,10 @@
+ARG FROM=opensuse/leap:15
+FROM ${FROM}
+
+ARG PACKAGE_MIRROR=http://download.opensuse.org/
+ARG PIP_INDEX_URL=https://pypi.python.org/simple/
+ARG PIP_TRUSTED_HOST=pypi.python.org
+ENV PIP_INDEX_URL=${PIP_INDEX_URL}
+ENV PIP_TRUSTED_HOST=${PIP_TRUSTED_HOST}
+
+RUN for filename in $(grep -Rl enabled=1 /etc/zypp/repos.d/); do sed -i "s|http://download.opensuse.org/|${PACKAGE_MIRROR}|" $filename; done && zypper refresh && zypper up -y && zypper install -y tar gzip which unzip
diff --git a/playbooks/vars.yaml b/playbooks/vars.yaml
index 735d60b..ed04330 100644
--- a/playbooks/vars.yaml
+++ b/playbooks/vars.yaml
@@ -51,6 +51,21 @@ distros:
         PROJECT: requirements
         PROJECT_REPO: http://172.17.0.1/git/openstack/requirements
         FROM: base:ubuntu
+  - name: leap15
+    buildargs:
+      base:
+        PACKAGE_MIRROR: "http://{{ zuul_site_mirror_fqdn }}/opensuse/"
+        PIP_INDEX_URL: http://{{ zuul_site_mirror_fqdn }}/pypi/simple
+        PIP_TRUSTED_HOST: "{{ zuul_site_mirror_fqdn }}"
+      project:
+        PROJECT: "{{ project }}"
+        PROJECT_REPO: http://172.17.0.1/git/openstack/{{ project }}
+        WHEELS: 172.17.0.1:5000/loci/requirements:{{ branch }}-leap15
+        FROM: base:leap15
+      requirements:
+        PROJECT: requirements
+        PROJECT_REPO: http://172.17.0.1/git/openstack/requirements
+        FROM: base:leap15
 #  - name: debian
 #    image: debian:stretch
 #    buildargs: