diff options
| author | Zuul <zuul@review.opendev.org> | 2020-02-21 09:12:29 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2020-02-21 09:12:29 +0000 |
| commit | ea8f03da6efe48665d56fdefd8aac37f9dee145d (patch) | |
| tree | 9249a9861890b83226e17f3165f975c641a575bf /tests | |
| parent | 0b3a67eb4b97517497b4ae258cd541e69c510f02 (diff) | |
| parent | f775700a768a010141fa6c82ea94b2bb10a9fe7d (diff) | |
| download | kolla-ea8f03da6efe48665d56fdefd8aac37f9dee145d.tar.gz kolla-ea8f03da6efe48665d56fdefd8aac37f9dee145d.zip | |
Merge "CentOS 8: Add zuul build and publish jobs" into stable/train
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/playbooks/run.yml | 2 | ||||
| -rw-r--r-- | tests/test_build.py | 24 |
2 files changed, 25 insertions, 1 deletions
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 57e8a0b9a..6fdb4288c 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): |