Skip to content

Commit 2b0985d

Browse files
martinpittrichm
authored andcommitted
feat: support this role in container builds
Feature: Support running the timesync role during container builds. Reason: This is particularly useful for building bootc derivative OSes. Result: These flags enable running the bootc container scenarios in CI, which ensures that the role works in buildah build environment. This allows us to officially support this role for image mode builds. Signed-off-by: Rich Megginson <rmeggins@redhat.com>
1 parent 3df2be4 commit 2b0985d

File tree

64 files changed

+2242
-1304
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

64 files changed

+2242
-1304
lines changed

.github/workflows/qemu-kvm-integration-tests.yml

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,6 @@ on: # yamllint disable-line rule:truthy
88
types:
99
- checks_requested
1010
push:
11-
branches:
12-
- main
1311
workflow_dispatch:
1412

1513
permissions:
@@ -35,13 +33,6 @@ jobs:
3533
# container
3634
- { image: "centos-9", env: "container-ansible-core-2.16" }
3735
- { image: "centos-9-bootc", env: "container-ansible-core-2.16" }
38-
# broken on non-running dbus
39-
# - { image: "centos-10", env: "container-ansible-core-2.17" }
40-
- { image: "centos-10-bootc", env: "container-ansible-core-2.17" }
41-
- { image: "fedora-41", env: "container-ansible-core-2.17" }
42-
- { image: "fedora-42", env: "container-ansible-core-2.17" }
43-
- { image: "fedora-41-bootc", env: "container-ansible-core-2.17" }
44-
- { image: "fedora-42-bootc", env: "container-ansible-core-2.17" }
4536

4637
env:
4738
TOX_ARGS: "--skip-tags tests::infiniband,tests::nvme,tests::scsi"

defaults/main.yml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,10 @@ network_provider_os_default: "{{
3131
ansible_distribution_major_version is version('7', '<')
3232
else 'nm' }}"
3333
# If NetworkManager.service is running, assume that 'nm' is currently in-use,
34-
# otherwise initscripts
34+
# otherwise initscripts. However, in non-booted environments we don't have
35+
# ansible_facts.services, so use the above OS default.
3536
__network_provider_current: "{{
37+
network_provider_os_default if ansible_facts.services is not defined else
3638
'nm' if 'NetworkManager.service' in ansible_facts.services and
3739
ansible_facts.services['NetworkManager.service']['state'] == 'running'
3840
else 'initscripts' }}"
@@ -136,6 +138,9 @@ __network_provider_setup:
136138
nm:
137139
service_name: "{{ __network_service_name_default_nm }}"
138140
packages: "{{ __network_packages_default_nm }}"
141+
nm_offline:
142+
service_name: "{{ __network_service_name_default_nm }}"
143+
packages: "{{ __network_packages_default_nm }}"
139144
initscripts:
140145
service_name: "{{ __network_service_name_default_initscripts }}"
141146
packages: "{{ __network_packages_default_initscripts }}"

0 commit comments

Comments
 (0)