diff --git a/molecule/default/molecule.yml b/molecule/default/molecule.yml index 937410f..db43ef2 100644 --- a/molecule/default/molecule.yml +++ b/molecule/default/molecule.yml @@ -17,20 +17,11 @@ 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 @@ -38,8 +29,15 @@ platforms: - 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: diff --git a/tasks/main.yml b/tasks/main.yml index 06b2d26..9054a23 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -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