Merge "Drop more Xenial testing from system-config"

This commit is contained in:
Zuul 2024-10-09 17:35:19 +00:00 committed by Gerrit Code Review
commit 0e8bd76019
3 changed files with 9 additions and 43 deletions

View File

@ -39,17 +39,6 @@ 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 package.is_installed
if host.system_info.distribution in ['ubuntu', 'debian']:
service = host.service("ntp")
else:
service = host.service("ntpd")
assert service.is_running
assert service.is_enabled
else:
assert not package.is_installed assert not package.is_installed
service = host.service('systemd-timesyncd') service = host.service('systemd-timesyncd')

View File

@ -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
@ -236,7 +218,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

View File

@ -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
@ -99,8 +97,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