Merge pull request #1044 from mlibrary/no_bullseye_imaging

drop support for imaging bullseye vms

Author: rrotter

manifests/virtual_machine.pp

@@ -60,7 +60,7 @@
 #   }
 define nebula::virtual_machine (
   String  $addr            = '127.0.0.1',
-  String  $build           = 'bullseye',
+  String  $build           = 'trixie',
   Integer $cpus            = 2,
   Integer $disk            = 16,
   Integer $ram             = 1,
@@ -103,7 +103,7 @@
     }
   } else {
     # If the VM does not already exist, create it.
-    if $build == 'bullseye' or $build == 'bookworm' or $build == 'trixie' {
+    if $build == 'bookworm' or $build == 'trixie' {
       file { "${tmpdir}/preseed.cfg":
         content => template("nebula/virtual_machine/${build}.cfg.erb"),
       }

spec/classes/profile/vmhost/host_spec.rb

@@ -50,7 +50,7 @@ def contain_vm(name)
           }
         end
 
-        it { is_expected.to contain_vm("vmname").with_build("bullseye") }
+        it { is_expected.to contain_vm("vmname").with_build("trixie") }
         it { is_expected.to contain_vm("vmname").with_cpus(0) }
         it { is_expected.to contain_vm("vmname").with_disk(0) }
         it { is_expected.to contain_vm("vmname").with_ram(0) }

spec/defines/virtual_machine_spec.rb

@@ -47,7 +47,7 @@ def contain_preseed
           %r{^d-i netcfg/get_hostname string vmname\.default\.invalid$},
           %r{^d-i netcfg/get_domain string default\.invalid$},
           %r{^d-i netcfg/hostname string vmname\.default\.invalid$},
-          %r{^d-i apt-setup/local0/repository string https://apt\.voxpupuli\.org debian11 openvox8$.*^d-i apt-setup/local0/key string https://apt\.voxpupuli\.org/openvox-keyring\.gpg$}m,
+          %r{^d-i apt-setup/local0/repository string https://apt\.voxpupuli\.org debian13 openvox8$.*^d-i apt-setup/local0/key string https://apt\.voxpupuli\.org/openvox-keyring\.gpg$}m,
           %r{\swget -O /target/etc/puppetlabs/puppet/puppet\.conf\s.*https://files\.default\.invalid/puppet\.conf}m
         ].each do |line|
           it { is_expected.to contain_preseed.with_content(line) }
@@ -86,7 +86,7 @@ def contain_preseed
           %r{ -n 'vmname'},
           %r{ -r 1024},
           %r{ --vcpus 2},
-          %r{ --location http://ftp\.us\.debian\.org/debian/dists/bullseye/main/installer-amd64/},
+          %r{ --location http://ftp\.us\.debian\.org/debian/dists/trixie/main/installer-amd64/},
           %r{ --os-variant=debianbullseye},
           %r{ --disk '/var/lib/libvirt/images/vmname\.img,size=16'},
           %r{ --network bridge=br0,model=virtio .* --network bridge=br1,model=virtio}m,
@@ -311,8 +311,8 @@ def contain_preseed
         it { is_expected.not_to compile }
       end
 
-      context "with bullseye build name" do
-        let(:params) { {build: "bullseye"} }
+      context "with trixie build name" do
+        let(:params) { {build: "trixie"} }
 
         [
           %r{^d-i preseed/late_command string\b},

spec/fixtures/hiera/default.yaml

@@ -92,7 +92,7 @@ nebula::profile::puppet::master::fileservers:
 nebula::profile::puppet::master::autosign_whitelist: []
 nebula::profile::puppet::master::reports_dir: '/opt/puppetlabs/server/data/puppetserver/reports'
 
-nebula::profile::vmhost::host::build: 'bullseye'
+nebula::profile::vmhost::host::build: 'trixie'
 nebula::profile::vmhost::host::cpus: 0
 nebula::profile::vmhost::host::disk: 0
 nebula::profile::vmhost::host::ram: 0