github/kairos
7
0
Fork 0
mirror of https://github.com/kairos-io/kairos.git synced 2025-02-09 05:18:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

🤖 Update immucore dev testing (#1059)

Browse Source 
There is now less files to copy over

Signed-off-by: Itxaka <itxaka.garcia@spectrocloud.com>
This commit is contained in:
Itxaka 2023-03-09 18:57:00 +01:00 committed by GitHub
parent 69a076caa0
commit 836d81eb00
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Earthfile
View File

@ -367,11 +367,13 @@ docker:
ARG IMMUCORE_DEV ARG IMMUCORE_DEV
ARG IMMUCORE_DEV_BRANCH=master ARG IMMUCORE_DEV_BRANCH=master
IF [ "$IMMUCORE_DEV" = "true" ] IF [ "$IMMUCORE_DEV" = "true" ]
RUN rm -Rf /usr/lib/dracut/modules.d/28immucore
RUN rm /etc/dracut.conf.d/10-immucore.conf
RUN rm /etc/dracut.conf.d/02-kairos-setup-initramfs.conf || exit 0
RUN rm /etc/dracut.conf.d/50-kairos-initrd.conf || exit 0
COPY github.com/kairos-io/immucore:$IMMUCORE_DEV_BRANCH+build-immucore/immucore /usr/bin/immucore COPY github.com/kairos-io/immucore:$IMMUCORE_DEV_BRANCH+build-immucore/immucore /usr/bin/immucore
COPY github.com/kairos-io/immucore:$IMMUCORE_DEV_BRANCH+dracut-artifacts/28immucore usr/lib/dracut/modules.d/28immucore COPY github.com/kairos-io/immucore:$IMMUCORE_DEV_BRANCH+dracut-artifacts/28immucore /usr/lib/dracut/modules.d/28immucore
COPY github.com/kairos-io/immucore:$IMMUCORE_DEV_BRANCH+dracut-artifacts/02-kairos-setup-initramfs.conf /etc/dracut.conf.d/02-kairos-setup-initramfs.conf
COPY github.com/kairos-io/immucore:$IMMUCORE_DEV_BRANCH+dracut-artifacts/10-immucore.conf /etc/dracut.conf.d/10-immucore.conf COPY github.com/kairos-io/immucore:$IMMUCORE_DEV_BRANCH+dracut-artifacts/10-immucore.conf /etc/dracut.conf.d/10-immucore.conf
COPY github.com/kairos-io/immucore:$IMMUCORE_DEV_BRANCH+dracut-artifacts/50-kairos-initrd.conf /etc/dracut.conf.d/50-kairos-initrd.conf
END END
# END # END

4
tests/tests_suite_test.go
View File

@ -89,6 +89,9 @@ func gatherLogs(vm VM) {
"/run/blkid", "/run/blkid",
"/run/events.json", "/run/events.json",
"/run/cmdline", "/run/cmdline",
"/run/immucore/immucore.log",
"/run/immucore/initramfs_stage.log",
"/run/immucore/rootfs_stage.log",
}) })
} }
@ -138,7 +141,6 @@ func startVM() (context.Context, VM) {
types.WithStateDir(stateDir), types.WithStateDir(stateDir),
types.WithDataSource(os.Getenv("DATASOURCE")), types.WithDataSource(os.Getenv("DATASOURCE")),
} }
if os.Getenv("KVM") != "" { if os.Getenv("KVM") != "" {
opts = append(opts, func(m *types.MachineConfig) error { opts = append(opts, func(m *types.MachineConfig) error {
m.Args = append(m.Args, m.Args = append(m.Args,

8
tests/upgrade_cli_test.go
View File

@ -32,29 +32,33 @@ var _ = Describe("k3s upgrade manual test", Label("upgrade-with-cli"), func() {
} }
expectDefaultService(vm) expectDefaultService(vm)
By("Copying config file")
err := vm.Scp("assets/config.yaml", "/tmp/config.yaml", "0770") err := vm.Scp("assets/config.yaml", "/tmp/config.yaml", "0770")
Expect(err).ToNot(HaveOccurred()) Expect(err).ToNot(HaveOccurred())
By("Manually installing")
out, err := vm.Sudo("kairos-agent manual-install --device auto /tmp/config.yaml") out, err := vm.Sudo("kairos-agent manual-install --device auto /tmp/config.yaml")
Expect(err).ToNot(HaveOccurred()) Expect(err).ToNot(HaveOccurred())
Expect(out).Should(ContainSubstring("Running after-install hook")) Expect(out).Should(ContainSubstring("Running after-install hook"))
vm.Sudo("sync") vm.Sudo("sync")
By("Rebooting")
vm.Reboot() vm.Reboot()
}) })
It("can upgrade to current image", func() { It("can upgrade to current image", func() {
currentVersion, err := vm.Sudo(". /etc/os-release; echo $VERSION") currentVersion, err := vm.Sudo(". /etc/os-release; echo $VERSION")
Expect(err).ToNot(HaveOccurred()) Expect(err).ToNot(HaveOccurred())
By(fmt.Sprintf("Checking current version: %s", currentVersion))
Expect(currentVersion).To(ContainSubstring("v")) Expect(currentVersion).To(ContainSubstring("v"))
_, err = vm.Sudo("kairos-agent") _, err = vm.Sudo("kairos-agent")
if err == nil { if err == nil {
By(fmt.Sprintf("Upgrading to: %s", containerImage))
out, err := vm.Sudo("kairos-agent upgrade --force --image " + containerImage) out, err := vm.Sudo("kairos-agent upgrade --force --image " + containerImage)
Expect(err).ToNot(HaveOccurred(), string(out)) Expect(err).ToNot(HaveOccurred(), string(out))
Expect(out).To(ContainSubstring("Upgrade completed")) Expect(out).To(ContainSubstring("Upgrade completed"))
Expect(out).To(ContainSubstring(containerImage)) Expect(out).To(ContainSubstring(containerImage))
fmt.Println(out) fmt.Println(out)
} else { } else {
By(fmt.Sprintf("Upgrading to: %s", containerImage))
out, err := vm.Sudo("kairos upgrade --force --image " + containerImage) out, err := vm.Sudo("kairos upgrade --force --image " + containerImage)
Expect(err).ToNot(HaveOccurred(), string(out)) Expect(err).ToNot(HaveOccurred(), string(out))
Expect(out).To(ContainSubstring("Upgrade completed")) Expect(out).To(ContainSubstring("Upgrade completed"))