From f5a9c8c71c7b663ea286fd6779997053713a05fb Mon Sep 17 00:00:00 2001
From: Mohammed Naser <mnaser@vexxhost.com>
Date: Wed, 22 Mar 2017 12:19:17 -0400
Subject: [PATCH] Gate fixes: disable bifrost-base, fix ubuntu base image

At the moment, Bifrost has caused a few failures which have
blocked the gate, the latest of which is documented in the
bug listed below (alongside with another one that caused another
gate failure).

In order to let patches flow though, we're disabling it
from the gate build checks as agreed on the Kolla meeting on
the 22nd of March 2017.  Also, the Ubuntu base image seems
to have a missing /etc/protocols which is created by the
netbase package.  This has been added to the base images.

There are issues with subunit getting a very large log all
at once which causes failures that is causing issues.  We
also enable logging to a local folder which will make
troubleshooting image builds easier to read and avoid
sending a large blob of data to subunit.

Change-Id: Iee1f8b06ec1066015ea5c6a6a245723402e35a6a
Related-Bug: #1674483
Related-Bug: #1673776
Closes-Bug: #1675101
---
 docker/base/Dockerfile.j2 |  1 +
 tests/test_build.py       | 10 ++++++++--
 tools/setup_gate.sh       |  1 +
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2
index cc1a7848fa..516e531148 100644
--- a/docker/base/Dockerfile.j2
+++ b/docker/base/Dockerfile.j2
@@ -238,6 +238,7 @@ COPY apt_preferences.{{ base_distro }} /etc/apt/preferences
    'iproute2',
    'kmod',
    'lvm2',
+   'netbase',
    'open-iscsi',
    'python',
    'sudo',
diff --git a/tests/test_build.py b/tests/test_build.py
index 260e12e97e..0a70018a17 100644
--- a/tests/test_build.py
+++ b/tests/test_build.py
@@ -92,6 +92,7 @@ class BuildTestCentosBinary(BuildTest, base.BaseTestCase):
 
 class BuildTestCentosSource(BuildTest, base.BaseTestCase):
     excluded_images = [
+        "bifrost-base",
         "kafka",
         "mistral-base",
     ]
@@ -132,7 +133,9 @@ class BuildTestUbuntuBinary(BuildTest, base.BaseTestCase):
 
 
 class BuildTestUbuntuSource(BuildTest, base.BaseTestCase):
-    excluded_images = []
+    excluded_images = [
+        "bifrost-base",
+    ]
 
     def setUp(self):
         super(BuildTestUbuntuSource, self).setUp()
@@ -170,7 +173,9 @@ class BuildTestDebianBinary(BuildTest, base.BaseTestCase):
 
 
 class BuildTestDebianSource(BuildTest, base.BaseTestCase):
-    excluded_images = []
+    excluded_images = [
+        "bifrost-base",
+    ]
 
     def setUp(self):
         super(BuildTestDebianSource, self).setUp()
@@ -206,6 +211,7 @@ class BuildTestOracleLinuxBinary(BuildTest, base.BaseTestCase):
 
 class BuildTestOracleLinuxSource(BuildTest, base.BaseTestCase):
     excluded_images = [
+        "bifrost-base",
         "kafka",
     ]
 
diff --git a/tools/setup_gate.sh b/tools/setup_gate.sh
index 8889195cd9..0d07b7ea14 100755
--- a/tools/setup_gate.sh
+++ b/tools/setup_gate.sh
@@ -87,6 +87,7 @@ namespace = lokolla
 template_override = ${TEMPLATE_OVERRIDES}
 registry = 127.0.0.1:4000
 push = true
+logs_dir = /tmp/logs/build
 EOF
 
 }