Drop more Xenial testing from system-config
This drops xenial testing of our base roles from system-config. This Xenial cleanup change is probably one of the more risky ones while we still have Xenial nodes in the real world. The reason for that is the base roles are applied in a dedicated job and if that job fails a lot of other jobs will refuse to run. Since we're no longer testing xenial against those roles once this changes merges we may run into unexpected failures. That said we don't have much way around this if we're going to drop xenial test nodes. Perhaps we should hold off on merging this change until we're closer to removing xenial from nodepool though. Change-Id: I25bddd7455d79c2d96c36d4fb0dd1267954d6d17
This commit is contained in:
parent
4a631dd201
commit
97a2ef27f5
@ -39,29 +39,18 @@ def test_iptables(host):
|
|||||||
|
|
||||||
def test_ntp(host):
|
def test_ntp(host):
|
||||||
package = host.package("ntp")
|
package = host.package("ntp")
|
||||||
if host.system_info.codename in ('xenial'):
|
assert not package.is_installed
|
||||||
assert package.is_installed
|
|
||||||
|
|
||||||
if host.system_info.distribution in ['ubuntu', 'debian']:
|
service = host.service('systemd-timesyncd')
|
||||||
service = host.service("ntp")
|
assert service.is_running
|
||||||
else:
|
|
||||||
service = host.service("ntpd")
|
|
||||||
assert service.is_running
|
|
||||||
assert service.is_enabled
|
|
||||||
|
|
||||||
|
# Focal updates the status string to just say NTP
|
||||||
|
if host.system_info.codename == 'bionic':
|
||||||
|
stdout_string = 'systemd-timesyncd.service active'
|
||||||
else:
|
else:
|
||||||
assert not package.is_installed
|
stdout_string = 'NTP service: active'
|
||||||
|
cmd = host.run("timedatectl status")
|
||||||
service = host.service('systemd-timesyncd')
|
assert stdout_string in cmd.stdout
|
||||||
assert service.is_running
|
|
||||||
|
|
||||||
# Focal updates the status string to just say NTP
|
|
||||||
if host.system_info.codename == 'bionic':
|
|
||||||
stdout_string = 'systemd-timesyncd.service active'
|
|
||||||
else:
|
|
||||||
stdout_string = 'NTP service: active'
|
|
||||||
cmd = host.run("timedatectl status")
|
|
||||||
assert stdout_string in cmd.stdout
|
|
||||||
|
|
||||||
|
|
||||||
def test_snmp(host):
|
def test_snmp(host):
|
||||||
|
@ -26,23 +26,6 @@
|
|||||||
# for build logs
|
# for build logs
|
||||||
'/var/lib/dkms-make-logs': logs
|
'/var/lib/dkms-make-logs': logs
|
||||||
|
|
||||||
- job:
|
|
||||||
name: system-config-zuul-role-integration-xenial
|
|
||||||
parent: system-config-zuul-role-integration
|
|
||||||
nodeset:
|
|
||||||
nodes:
|
|
||||||
- name: base
|
|
||||||
label: ubuntu-xenial
|
|
||||||
- name: puppet4
|
|
||||||
label: ubuntu-xenial
|
|
||||||
groups:
|
|
||||||
- name: puppet3
|
|
||||||
nodes:
|
|
||||||
- base
|
|
||||||
- name: openafs
|
|
||||||
nodes:
|
|
||||||
- base
|
|
||||||
|
|
||||||
- job:
|
- job:
|
||||||
name: system-config-zuul-role-integration-bionic
|
name: system-config-zuul-role-integration-bionic
|
||||||
parent: system-config-zuul-role-integration
|
parent: system-config-zuul-role-integration
|
||||||
@ -216,7 +199,6 @@
|
|||||||
name: system-config-zuul-role-integration
|
name: system-config-zuul-role-integration
|
||||||
check:
|
check:
|
||||||
jobs:
|
jobs:
|
||||||
- system-config-zuul-role-integration-xenial
|
|
||||||
- system-config-zuul-role-integration-bionic
|
- system-config-zuul-role-integration-bionic
|
||||||
- system-config-zuul-role-integration-bionic-arm64
|
- system-config-zuul-role-integration-bionic-arm64
|
||||||
- system-config-zuul-role-integration-focal
|
- system-config-zuul-role-integration-focal
|
||||||
@ -233,7 +215,6 @@
|
|||||||
- system-config-zuul-role-integration-centos-9-stream-arm64
|
- system-config-zuul-role-integration-centos-9-stream-arm64
|
||||||
gate:
|
gate:
|
||||||
jobs:
|
jobs:
|
||||||
- system-config-zuul-role-integration-xenial
|
|
||||||
- system-config-zuul-role-integration-bionic
|
- system-config-zuul-role-integration-bionic
|
||||||
- system-config-zuul-role-integration-bionic-arm64
|
- system-config-zuul-role-integration-bionic-arm64
|
||||||
- system-config-zuul-role-integration-focal
|
- system-config-zuul-role-integration-focal
|
||||||
|
@ -60,8 +60,6 @@
|
|||||||
nodeset:
|
nodeset:
|
||||||
nodes:
|
nodes:
|
||||||
- &bridge_node_x86 { name: bridge99.opendev.org, label: ubuntu-jammy }
|
- &bridge_node_x86 { name: bridge99.opendev.org, label: ubuntu-jammy }
|
||||||
- name: xenial
|
|
||||||
label: ubuntu-xenial
|
|
||||||
- name: bionic
|
- name: bionic
|
||||||
label: ubuntu-bionic
|
label: ubuntu-bionic
|
||||||
- name: focal
|
- name: focal
|
||||||
@ -97,8 +95,6 @@
|
|||||||
nodeset:
|
nodeset:
|
||||||
nodes:
|
nodes:
|
||||||
- <<: *bridge_node_x86
|
- <<: *bridge_node_x86
|
||||||
- name: xenial
|
|
||||||
label: ubuntu-xenial
|
|
||||||
- name: bionic
|
- name: bionic
|
||||||
label: ubuntu-bionic
|
label: ubuntu-bionic
|
||||||
- name: focal
|
- name: focal
|
||||||
|
Loading…
Reference in New Issue
Block a user