Fixing ubuntu image boot up issue. (kairos-io#133)

* Fixing ubuntu image boot up issue. * Adding ubuntu to CI workflow Signed-off-by: vipsharm <sharma.vipin@gmail.com> * Fixing the sudoers file Signed-off-by: vipsharm <sharma.vipin@gmail.com> * Update overlay/files-ubuntu/etc/elemental/config.yaml Co-authored-by: Ettore Di Giacinto <mudler@users.noreply.github.com> Signed-off-by: vipsharm <sharma.vipin@gmail.com> * Update overlay/files-ubuntu/etc/elemental/config.yaml Co-authored-by: Ettore Di Giacinto <mudler@users.noreply.github.com> Signed-off-by: vipsharm <sharma.vipin@gmail.com> * Update overlay/files-ubuntu/etc/elemental/config.yaml Co-authored-by: Ettore Di Giacinto <mudler@users.noreply.github.com> Signed-off-by: vipsharm <sharma.vipin@gmail.com> * Update 11_persistency.yaml Signed-off-by: vipsharm <sharma.vipin@gmail.com> * Create 06_rootfs.yaml Signed-off-by: vipsharm <sharma.vipin@gmail.com> * Fixing the kernel for Ubuntu Signed-off-by: vipsharm <sharma.vipin@gmail.com> * Making partition size bigger for amd arch Signed-off-by: vipsharm <sharma.vipin@gmail.com> * ARM config file for partition sizes Signed-off-by: vipsharm <sharma.vipin@gmail.com> * 🤖 Adapt tests for ubuntu output * ⚙️ Increase default size on ubuntu images * 🤖 Increase default test images disk size * Update build_vm.sh Signed-off-by: vipsharm <sharma.vipin@gmail.com> * Adding jq to ubuntu image, needed for stylus Signed-off-by: vipsharm <sharma.vipin@gmail.com> * Update bootargs.cfg Signed-off-by: vipsharm <sharma.vipin@gmail.com> * ♻️ Drop workaround * Ubuntu VM needs to be started with OS type flag Signed-off-by: vipsharm <sharma.vipin@gmail.com> Signed-off-by: vipsharm <sharma.vipin@gmail.com> Co-authored-by: Ettore Di Giacinto <mudler@users.noreply.github.com>
c0ffee · Sep 21, 2022 · d3d9894 · d3d9894
1 parent d36c5cf
commit d3d9894
Show file tree

Hide file tree

Showing 14 changed files with 96 additions and 16 deletions.
diff --git a/.github/workflows/image.yaml b/.github/workflows/image.yaml
@@ -22,7 +22,7 @@ jobs:
          - flavor: "opensuse"
          #- flavor: "tumbleweed"
          #- flavor: "fedora"
-         #- flavor: "ubuntu"
+         - flavor: "ubuntu"
          - flavor: "alpine"
     steps:
       - uses: actions/checkout@v2
@@ -101,8 +101,8 @@ jobs:
        include:
          - flavor: "opensuse"
          - flavor: "alpine"
+         - flavor: "ubuntu"
         # - flavor: "tumbleweed"
-#         - flavor: "ubuntu"
 #         - flavor: "fedora"
     steps:
       - uses: actions/checkout@v2
@@ -231,6 +231,7 @@ jobs:
        include:
          - flavor: "alpine"
          - flavor: "opensuse"
+         - flavor: "ubuntu"
     steps:
     - uses: actions/checkout@v2
     - name: Download artifacts

diff --git a/Earthfile b/Earthfile
@@ -15,8 +15,11 @@ END
 
 ARG COSIGN_SKIP=".*quay.io/kairos/.*"
 
-# TODO: This should match for each flavor
-ARG COSIGN_REPOSITORY=raccos/releases-teal
+IF [ "$FLAVOR" = "ubuntu" ]
+    ARG COSIGN_REPOSITORY=raccos/releases-orange
+ELSE
+    ARG COSIGN_REPOSITORY=raccos/releases-teal
+END
 ARG COSIGN_EXPERIMENTAL=0
 ARG CGO_ENABLED=0
 ARG ELEMENTAL_IMAGE=quay.io/costoolkit/elemental-cli:v0.0.15-8a78e6b
@@ -148,7 +151,7 @@ framework:
 
     ENV USER=root
 
-    IF [ "$WITH_KERNEL" = "true" ] || [ "$FLAVOR" = "alpine" ] || [ "$FLAVOR" = "fedora" ] || [ "$FLAVOR" = "rockylinux" ]  || [ "$FLAVOR" = "ubuntu" ] || [ "$FLAVOR" = "alpine-arm-rpi" ]
+    IF [ "$WITH_KERNEL" = "true" ] || [ "$FLAVOR" = "alpine" ] || [ "$FLAVOR" = "fedora" ] || [ "$FLAVOR" = "rockylinux" ] || [ "$FLAVOR" = "alpine-arm-rpi" ]
         RUN /usr/bin/luet install -y --system-target /framework \
             meta/cos-verify \
             meta/cos-core \

diff --git a/images/Dockerfile.ubuntu b/images/Dockerfile.ubuntu
@@ -32,7 +32,9 @@ RUN apt install -y \
     gawk \
     haveged \
     rsync \
+    jq \
     neovim \
+    open-vm-tools \
     linux-image-generic-hwe-20.04 && apt-get clean
 
 RUN ln -s /usr/sbin/grub-install /usr/sbin/grub2-install

diff --git a/overlay/files-opensuse-arm-rpi/etc/elemental/config.yaml b/overlay/files-opensuse-arm-rpi/etc/elemental/config.yaml
@@ -0,0 +1,18 @@
+cosign: false
+verify: false
+install:
+  grub-entry-name: "kairos"
+  system:
+    size: 2000
+  recovery-system:
+    size: 2000
+upgrade:
+  grub-entry-name: "kairos"
+  recovery-system:
+    size: 2000
+  system:
+    size: 2000
+reset:
+  grub-entry-name: "kairos"
+  system:
+    size: 2000
diff --git a/overlay/files-ubuntu/etc/cos/bootargs.cfg b/overlay/files-ubuntu/etc/cos/bootargs.cfg
@@ -5,7 +5,7 @@ if [ -n "$recoverylabel" ]; then
     set kernelcmd="console=tty1 root=live:LABEL=$recoverylabel rd.live.dir=/ rd.live.squashimg=$img panic=5"
 else
     # set kernelcmd="console=tty1 root=LABEL=$label cos-img/filename=$img panic=5 security=selinux selinux=1 rd.cos.oemlabel=COS_OEM rd.neednet=0 vga=795 nomodeset"
-    set kernelcmd="console=tty1 root=LABEL=$label cos-img/filename=$img panic=5 security=selinux selinux=0 rd.cos.oemlabel=COS_OEM rd.neednet=0"
+    set kernelcmd="console=tty1 root=LABEL=$label cos-img/filename=$img panic=5 security=selinux selinux=0 rd.cos.oemlabel=COS_OEM rd.neednet=0 vga=795"
 fi
 
 set initramfs=/boot/initrd
diff --git a/overlay/files-ubuntu/etc/elemental/config.yaml b/overlay/files-ubuntu/etc/elemental/config.yaml
@@ -0,0 +1,26 @@
+cosign: false
+verify: false
+install:
+# Ubuntu rootfs is bigger.
+  partitions:
+    state:
+      size: 20000
+    recovery:
+      size: 15000
+    oem:
+      size: 64
+  grub-entry-name: "Kairos"
+  system:
+    size: 5000
+  recovery-system:
+    size: 5000
+upgrade:
+  grub-entry-name: "Kairos"
+  recovery-system:
+    size: 5000
+  system:
+    size: 5000
+reset:
+  grub-entry-name: "Kairos"
+  system:
+    size: 5000
diff --git a/overlay/files-ubuntu/system/oem/05_network.yaml b/overlay/files-ubuntu/system/oem/05_network.yaml
@@ -0,0 +1,26 @@
+name: "Default network configuration"
+stages:
+   initramfs:
+     - name: "Setup network"
+       systemctl:
+         enable: 
+         - systemd-networkd
+         disable: 
+         - NetworkManager
+       files:
+       - path: /etc/systemd/network/20-dhcp.network
+         content: |
+                  [Match]
+                  Name=en*
+                  [Network]
+                  DHCP=yes
+         permissions: 0644
+         owner: 0
+         group: 0
+       commands:
+       - rm /etc/resolv.conf
+       - ln -s /run/systemd/resolve/resolv.conf /etc/resolv.conf
+#      dns: 
+#       path: /etc/resolv.conf
+#       nameservers:
+#       - 8.8.8.8
diff --git a/overlay/files/etc/elemental/config.yaml b/overlay/files/etc/elemental/config.yaml
@@ -15,4 +15,4 @@ upgrade:
 reset:
   grub-entry-name: "kairos"
   system:
-    size: 2000
+    size: 2000
diff --git a/overlay/files/system/oem/10_accounting.yaml b/overlay/files/system/oem/10_accounting.yaml
@@ -35,6 +35,6 @@ stages:
             Defaults !insults
             root ALL=(ALL) ALL
             %admin ALL=(ALL) NOPASSWD: ALL
-            @includedir /etc/sudoers.d
+            #includedir /etc/sudoers.d
        commands:
-       - passwd -l root
+       - passwd -l root
diff --git a/overlay/files/system/oem/11_persistency.yaml b/overlay/files/system/oem/11_persistency.yaml
@@ -68,4 +68,4 @@ stages:
     commands:
     - mkdir /usr/local/cloud-config
     - chmod 600 /usr/local/cloud-config
-    name: "Ensure /usr/local/cloud-config exists"
+    name: "Ensure /usr/local/cloud-config exists"
diff --git a/scripts/build_vm.sh b/scripts/build_vm.sh
@@ -9,7 +9,7 @@ ISO=$1
 SSH_USER="${SSH_USER:-kairos}"
 SSHPASS="${SSH_PASS:-kairos}"
 export SSHPASS
-HD_SIZE="${HD_SIZE:-30000}"
+HD_SIZE="${HD_SIZE:-50000}"
 INSTALL_COMMAND="${INSTALL_COMMAND:-sudo /bin/sh -c 'elemental install /dev/sda && sync'}"
 
 HAS_SSHPASS="$(type "sshpass" &> /dev/null && echo true || echo false)"
@@ -48,7 +48,11 @@ trap cleanup EXIT
 echo "Creating VM"
 VBoxManage createmedium disk --filename $tmpdir/sda.vdi --size ${HD_SIZE}
 
-VBoxManage createvm --name "${machine_id}" --register
+if [[ "${machine_id}" == *"ubuntu"* ]]; then
+    VBoxManage createvm --name "${machine_id}" --register --ostype Ubuntu_64
+else
+    VBoxManage createvm --name "${machine_id}" --register
+fi
 VBoxManage modifyvm "${machine_id}" --memory 10240 --cpus 3
 VBoxManage modifyvm "${machine_id}" --nic1 nat --boot1 disk --boot2 dvd --natpf1 "guestssh,tcp,,2222,,22"
 VBoxManage storagectl "${machine_id}" --name "sata controller" --add sata --portcount 2 --hostiocache off
@@ -88,4 +92,4 @@ qemu-img convert -f vdi -O qcow2 $tmpdir/sda.vdi $outdir/$outfile.qcow2
 tar -cJf $outdir/$outfile.qcow2.tar.xz $outdir/$outfile.qcow2
 rm -rf $outdir/$outfile.qcow2
 echo "Exporting $outdir/$outfile.ova..."
-VBoxManage export "${machine_id}" -o $outdir/$outfile.ova
+VBoxManage export "${machine_id}" -o $outdir/$outfile.ova
diff --git a/tests/autoinstall_test.go b/tests/autoinstall_test.go
@@ -35,7 +35,7 @@ var _ = Describe("kairos autoinstall test", Label("autoinstall-test"), func() {
 				// }, 30*time.Second, 10*time.Second).Should(ContainSubstring("no network token"))
 
 				out, _ := machine.SSHCommand("sudo systemctl status kairos")
-				Expect(out).Should(ContainSubstring("loaded (/etc/systemd/system/kairos.service; enabled; vendor preset: disabled)"))
+				Expect(out).Should(ContainSubstring("loaded (/etc/systemd/system/kairos.service; enabled;"))
 				fmt.Println(out)
 			}
 

diff --git a/tests/machine/vbox.go b/tests/machine/vbox.go
@@ -49,7 +49,7 @@ func qemuRun(sshPort string) {
 	t, err := ioutil.TempDir("", "test")
 	Expect(err).ToNot(HaveOccurred())
 
-	err = CreateDisk(filepath.Join(t, "disk.img"), "40g")
+	err = CreateDisk(filepath.Join(t, "disk.img"), "50g")
 	Expect(err).ToNot(HaveOccurred())
 
 	SUT = &Config{

diff --git a/tests/upgrade_latest_cli_test.go b/tests/upgrade_latest_cli_test.go
@@ -42,7 +42,7 @@ var _ = Describe("k3s upgrade manual test", Label("upgrade-latest-with-cli"), fu
 				// }, 30*time.Second, 10*time.Second).Should(ContainSubstring("no network token"))
 
 				out, _ := machine.Sudo("systemctl status kairos")
-				Expect(out).Should(ContainSubstring("loaded (/etc/systemd/system/kairos.service; enabled; vendor preset: disabled)"))
+				Expect(out).Should(ContainSubstring("loaded (/etc/systemd/system/kairos.service; enabled"))
 			}
 		})
 	})