openstack/kolla-ansible
Code Issues Proposed changes

Merge "Drop remnants of install_type"

Browse Source
This commit is contained in:
Zuul 2023-01-16 10:07:37 +00:00 committed by Gerrit Code Review
commit b2a7d2d750
3 changed files with 6 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
tests/templates/globals-default.j2
View File

@ -11,9 +11,6 @@ kolla_ansible_setup_any_errors_fatal: true
kolla_base_distro: "{{ base_distro }}"
# Zed dropped install_type so we have it only on upgrades
{% if is_upgrade %}
kolla_install_type: "{{ install_type }}"
{% endif %}
network_interface: "{{ api_interface_name }}"
network_address_family: "{{ address_family }}"
docker_restart_policy: "no"

20
tests/test_kolla_docker.py
View File

@ -197,9 +197,7 @@ FAKE_DATA = {
'container_inspect': {
'Config': {
'Env': ['KOLLA_BASE_DISTRO=ubuntu',
'KOLLA_INSTALL_TYPE=source',
'KOLLA_INSTALL_METATYPE=rdo'],
'Env': ['KOLLA_BASE_DISTRO=ubuntu'],
'Hostname': 'node2',
'Volumes': {'/var/lib/kolla/config_files/': {}}},
'Mounts': {},
@ -543,9 +541,7 @@ class TestContainer(base.BaseTestCase):
)
def test_get_container_env(self):
fake_env = dict(KOLLA_BASE_DISTRO='ubuntu',
KOLLA_INSTALL_TYPE='source',
KOLLA_INSTALL_METATYPE='rdo')
fake_env = dict(KOLLA_BASE_DISTRO='ubuntu')
self.dw = get_DockerWorker({'name': 'my_container',
'action': 'get_container_env'})
self.dw.dc.containers.return_value = self.fake_data['containers']
@ -1211,26 +1207,22 @@ class TestAttrComp(base.BaseTestCase):
def test_compare_environment_neg(self):
container_info = {'Config': dict(
Env=['KOLLA_CONFIG_STRATEGY=COPY_ALWAYS',
'KOLLA_BASE_DISTRO=ubuntu',
'KOLLA_INSTALL_TYPE=source']
'KOLLA_BASE_DISTRO=ubuntu']
)}
self.dw = get_DockerWorker({
'environment': dict(KOLLA_CONFIG_STRATEGY='COPY_ALWAYS',
KOLLA_BASE_DISTRO='ubuntu',
KOLLA_INSTALL_TYPE='source')})
KOLLA_BASE_DISTRO='ubuntu')})
self.assertFalse(self.dw.compare_environment(container_info))
def test_compare_environment_pos(self):
container_info = {'Config': dict(
Env=['KOLLA_CONFIG_STRATEGY=COPY_ALWAYS',
'KOLLA_BASE_DISTRO=ubuntu',
'KOLLA_INSTALL_TYPE=source']
'KOLLA_BASE_DISTRO=ubuntu']
)}
self.dw = get_DockerWorker({
'environment': dict(KOLLA_CONFIG_STRATEGY='COPY_ALWAYS',
KOLLA_BASE_DISTRO='centos',
KOLLA_INSTALL_TYPE='source')})
KOLLA_BASE_DISTRO='centos')})
self.assertTrue(self.dw.compare_environment(container_info))

7
zuul.d/jobs.yaml
View File

@ -118,7 +118,6 @@
timeout: 9000
vars:
base_distro: debian
install_type: source
is_upgrade: yes
tls_enabled: true
@ -134,7 +133,6 @@
timeout: 9000
vars:
base_distro: ubuntu
install_type: binary
is_upgrade: yes
tls_enabled: true
@ -145,7 +143,6 @@
timeout: 9000
vars:
base_distro: ubuntu
install_type: source
is_upgrade: yes
tls_enabled: true
@ -156,7 +153,6 @@
timeout: 9000
vars:
base_distro: ubuntu
install_type: source
is_upgrade: yes
- job:
@ -166,7 +162,6 @@
timeout: 9000
vars:
base_distro: ubuntu
install_type: source
is_upgrade: yes
- job:
@ -231,7 +226,6 @@
timeout: 10800
vars:
base_distro: ubuntu
install_type: source
is_upgrade: yes
- job:
@ -352,7 +346,6 @@
nodeset: kolla-ansible-focal
vars:
base_distro: ubuntu
install_type: source
is_upgrade: yes
- job: