Skip to content

Commit

Permalink
replace focal with noble
Browse files Browse the repository at this point in the history
Signed-off-by: Thomas Sjögren <konstruktoid@users.noreply.github.com>
  • Loading branch information
konstruktoid committed Jul 17, 2024
1 parent 9d93fe1 commit e452119
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 16 deletions.
24 changes: 11 additions & 13 deletions molecule/default/molecule.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,29 +17,27 @@ provisioner:
log: true
inventory:
host_vars:
focal:
stubby_idle_timeout: 10000
jammy:
stubby_idle_timeout: 5000
noble:
platforms:
- name: focal
box: bento/ubuntu-20.04
config_options:
vm.boot_timeout: 600
instance_raw_config_args:
- "vbguest.installer_options = { allow_kernel_upgrade: true }"
memory: 1024
- name: jammy
box: ubuntu/jammy64
box: bento/ubuntu-22.04
config_options:
vm.boot_timeout: 600
synced_folder: false
provider_raw_config_args:
- customize ['modifyvm', :id, '--uart1', '0x3F8', '4']
- customize ['modifyvm', :id, '--uartmode1', 'file', File::NULL]
instance_raw_config_args:
- "vbguest.installer_options = { allow_kernel_upgrade: true }"
memory: 2048
- vbguest.auto_update = false
memory: 1024
- name: noble
box: bento/ubuntu-24.04
config_options:
vm.boot_timeout: 600
instance_raw_config_args:
- vbguest.auto_update = false
memory: 1024
verifier:
name: ansible
scenario:
Expand Down
7 changes: 4 additions & 3 deletions tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -88,9 +88,10 @@
register: resolv_conf

- name: Fix systemd resolv link
when: ansible_local.systemd.version | int < 246
and (not resolv_conf.stat.exists or resolv_conf.stat.islnk)
and not resolv_conf.stat.lnk_target == "/run/systemd/resolve/resolv.conf"
when:
- ansible_local.systemd.version | int < 246
- (not resolv_conf.stat.exists or resolv_conf.stat.islnk)
- not resolv_conf.stat.lnk_target == "/run/systemd/resolve/resolv.conf"
block:
- name: Remove resolv.conf
become: true
Expand Down

0 comments on commit e452119

Please sign in to comment.