From b060623b907348e518bdf1afede0b641be56c415 Mon Sep 17 00:00:00 2001
From: Mark Goddard <mark@stackhpc.com>
Date: Thu, 9 Jan 2020 13:27:19 +0000
Subject: CentOS 8: Add zuul build and publish jobs

Adds build and publishing jobs for CentOS 8 images:

- kolla-build-centos8-binary
- kolla-build-centos8-source
- kolla-publish-centos8-binary
- kolla-publish-centos8-source

The 'base' image has been added to the list of unbuildable images for
CentOS 8 (now separate from the list for CentOS 7). This means that no
images will be built - the jobs should essentially be a 'noop'.

Change-Id: Ie9a0109bd4eef337358d714e4b5088b8e3de2f23
Partially-Implements: blueprint centos-rhel-8
---
 tests/playbooks/run.yml |  2 +-
 tests/test_build.py     | 24 ++++++++++++++++++++++++
 2 files changed, 25 insertions(+), 1 deletion(-)

(limited to 'tests')

diff --git a/tests/playbooks/run.yml b/tests/playbooks/run.yml
index cd2f5ca8c..6ccd38f99 100644
--- a/tests/playbooks/run.yml
+++ b/tests/playbooks/run.yml
@@ -33,6 +33,6 @@
         dest: /etc/kolla/template_overrides.j2
 
     - name: Run tox
-      command: tox -e {{ action }}-{{ base_distro }}-{{ install_type }}
+      command: tox -e {{ action }}-{{ base_distro }}{{ base_tag | default('') }}-{{ install_type }}
       args:
         chdir: "{{ zuul.project.src_dir }}"
diff --git a/tests/test_build.py b/tests/test_build.py
index eac241265..395ceccf6 100644
--- a/tests/test_build.py
+++ b/tests/test_build.py
@@ -79,6 +79,30 @@ class BuildTestCentosSource(BuildTest, base.BaseTestCase):
                                 "--type", "source"])
 
 
+class BuildTestCentos8Binary(BuildTest, base.BaseTestCase):
+
+    def setUp(self):
+        super(BuildTestCentos8Binary, self).setUp()
+        # TODO(mgoddard): Remove --base-tag and --tag arguments when CentOS 8
+        # is the default.
+        self.build_args.extend(["--base", "centos",
+                                "--base-tag", "8",
+                                "--tag", "master-centos8",
+                                "--type", "binary"])
+
+
+class BuildTestCentos8Source(BuildTest, base.BaseTestCase):
+
+    def setUp(self):
+        super(BuildTestCentos8Source, self).setUp()
+        # TODO(mgoddard): Remove --base-tag and --tag arguments when CentOS 8
+        # is the default.
+        self.build_args.extend(["--base", "centos",
+                                "--base-tag", "8",
+                                "--tag", "master-centos8",
+                                "--type", "source"])
+
+
 class BuildTestUbuntuBinary(BuildTest, base.BaseTestCase):
 
     def setUp(self):
-- 
cgit v1.2.3