🤖 Don't run installation twice on installation tests (kairos-io#811)

* 🤖 Don't run installation twice on installation tests Signed-off-by: mudler <mudler@c3os.io> * 🐛 Scan provided config in manual-install Signed-off-by: mudler <mudler@c3os.io> * 🤖 Git unshallow before running tests Signed-off-by: mudler <mudler@c3os.io> --------- Signed-off-by: mudler <mudler@c3os.io>
c0ffee · Feb 3, 2023 · 028ae0e · 028ae0e
1 parent f1a9ce5
commit 028ae0e
Show file tree

Hide file tree

Showing 3 changed files with 35 additions and 16 deletions.
diff --git a/.github/workflows/image.yaml b/.github/workflows/image.yaml
@@ -107,6 +107,8 @@ jobs:
          - flavor: "opensuse-leap"
     steps:
       - uses: actions/checkout@v3
+      - run: |
+          git fetch --prune --unshallow
       - name: Download artifacts
         uses: actions/download-artifact@v3
         with:
@@ -176,6 +178,8 @@ jobs:
          - flavor: "ubuntu-22-lts"
     steps:
     - uses: actions/checkout@v3
+    - run: |
+        git fetch --prune --unshallow
     - name: Download artifacts
       uses: actions/download-artifact@v3
       with:
@@ -200,6 +204,8 @@ jobs:
          - flavor: "opensuse-leap"
     steps:
     - uses: actions/checkout@v3
+    - run: |
+        git fetch --prune --unshallow
     - name: Download artifacts
       uses: actions/download-artifact@v3
       with:
@@ -245,6 +251,8 @@ jobs:
    #      - flavor: "ubuntu"
     steps:
     - uses: actions/checkout@v3
+    - run: |
+        git fetch --prune --unshallow
     - name: Download artifacts
       uses: actions/download-artifact@v3
       with:
@@ -273,6 +281,8 @@ jobs:
          - flavor: "ubuntu"
     steps:
     - uses: actions/checkout@v3
+    - run: |
+        git fetch --prune --unshallow
     - run: |
             ./earthly.sh +run-qemu-netboot-test --TEST_SUITE=netboot-test --FLAVOR=${{ matrix.flavor }}
 
@@ -289,6 +299,8 @@ jobs:
     #     - flavor: "ubuntu"
     steps:
     - uses: actions/checkout@v3
+    - run: |
+        git fetch --prune --unshallow
     - name: Download artifacts
       uses: actions/download-artifact@v3
       with:
@@ -353,6 +365,8 @@ jobs:
     #     - flavor: "ubuntu"
     steps:
     - uses: actions/checkout@v3
+    - run: |
+        git fetch --prune --unshallow
     - name: Download artifacts
       uses: actions/download-artifact@v3
       with:

diff --git a/internal/agent/install.go b/internal/agent/install.go
@@ -6,6 +6,7 @@ import (
 	"fmt"
 	"os"
 	"os/exec"
+	"path/filepath"
 	"strings"
 	"syscall"
 	"time"
@@ -61,12 +62,28 @@ func displayInfo(agentConfig *Config) {
 	}
 }
 
-func ManualInstall(config string, options map[string]string) error {
-	dat, err := os.ReadFile(config)
+func ManualInstall(c string, options map[string]string) error {
+	dat, err := os.ReadFile(c)
 	if err != nil {
 		return err
 	}
-	options["cc"] = string(dat)
+
+	dir, err := os.MkdirTemp("", "kairos-install")
+	if err != nil {
+		return err
+	}
+	defer os.RemoveAll(dir)
+
+	if err := os.WriteFile(filepath.Join(dir, "config.yaml"), dat, 0600); err != nil {
+		return err
+	}
+
+	cc, err := config.Scan(config.Directories(dir), config.MergeBootLine)
+	if err != nil {
+		return err
+	}
+
+	options["cc"] = cc.String()
 
 	return RunInstall(options)
 }

diff --git a/tests/install_test.go b/tests/install_test.go
@@ -25,10 +25,7 @@ func testInstall(cloudConfig string, actual interface{}, m types.GomegaMatcher,
 	err = Machine.SendFile(t.Name(), "/tmp/config.yaml", "0770")
 	Expect(err).ToNot(HaveOccurred())
 
-	out, err := Sudo("sudo mv /tmp/config.yaml /oem/")
-	Expect(err).ToNot(HaveOccurred(), out)
-
-	out, err = Sudo("kairos-agent install")
+	out, err := Sudo(`kairos-agent manual-install --device "auto" /tmp/config.yaml`)
 	Expect(err).ToNot(HaveOccurred(), out)
 	Expect(out).Should(ContainSubstring("Running after-install hook"))
 	Sudo("sync")
@@ -59,9 +56,6 @@ var _ = Describe("kairos install test", Label("install-test"), func() {
 
 		It("with bundles", func() {
 			testInstall(`
-install:
-  auto: true
-  device: auto
 stages:
   initramfs:
   - name: "Set user and password"
@@ -80,9 +74,6 @@ bundles:
 		})
 		It("cloud-config syntax mixed with extended syntax", func() {
 			testInstall(`#cloud-config
-install:
-  auto: true
-  device: auto
 users:
 - name: "kairos"
   passwd: "kairos"
@@ -101,9 +92,6 @@ stages:
 		})
 		It("with config_url", func() {
 			testInstall(`
-install:
-  auto: true
-  device: auto
 config_url: "https://gist.githubusercontent.com/mudler/6db795bad8f9e29ebec14b6ae331e5c0/raw/01137c458ad62cfcdfb201cae2f8814db702c6f9/testgist.yaml"`, func() string {
 				var out string
 				out, _ = Sudo("/usr/local/bin/usr/bin/edgevpn --help")