From 3d393ce18a7d1a0b9e4acd2fdf02c88784cc2378 Mon Sep 17 00:00:00 2001
From: Gerald Pinder <gmpinder@gmail.com>
Date: Sun, 6 Oct 2024 11:25:56 -0400
Subject: [PATCH] chore: Fix akmods tests

---
 integration-tests/legacy-test-repo/.gitignore |  1 +
 .../legacy-test-repo/config/akmods.yml        | 19 ++++-----------
 .../legacy-test-repo/config/recipe.yml        |  4 ++--
 integration-tests/test-repo/.gitignore        |  1 +
 .../test-repo/recipes/akmods.yml              | 24 ++++---------------
 .../test-repo/recipes/recipe-39.yml           |  5 +++-
 .../test-repo/recipes/recipe.yml              |  5 +++-
 7 files changed, 20 insertions(+), 39 deletions(-)

diff --git a/integration-tests/legacy-test-repo/.gitignore b/integration-tests/legacy-test-repo/.gitignore
index 37ba0905..4c749b66 100644
--- a/integration-tests/legacy-test-repo/.gitignore
+++ b/integration-tests/legacy-test-repo/.gitignore
@@ -1 +1,2 @@
 /Containerfile
+/Containerfile.*
diff --git a/integration-tests/legacy-test-repo/config/akmods.yml b/integration-tests/legacy-test-repo/config/akmods.yml
index e7d5350e..2ac99d44 100644
--- a/integration-tests/legacy-test-repo/config/akmods.yml
+++ b/integration-tests/legacy-test-repo/config/akmods.yml
@@ -5,18 +5,7 @@ modules:
   - type: akmods
     base: surface
     nvidia-version: 550
-    # install:
-    #   - nvidia
-    #   - openrazer
-    #   - openrgb
-
-  # Tests pulling main image
-  - type: akmods
-
-  # Tests pulling image for main nvidia
-  - type: akmods
-    nvidia-version: 550
-
-  # Test pulling image for base asus
-  - type: akmods
-    base: asus
+    install:
+      - nvidia
+      - openrazer
+      - openrgb
diff --git a/integration-tests/legacy-test-repo/config/recipe.yml b/integration-tests/legacy-test-repo/config/recipe.yml
index 7e388f87..e6943995 100644
--- a/integration-tests/legacy-test-repo/config/recipe.yml
+++ b/integration-tests/legacy-test-repo/config/recipe.yml
@@ -1,10 +1,10 @@
+---
+# yaml-language-server: $schema=https://schema.blue-build.org/recipe-v1.json
 name: cli/test-legacy
 description: This is my personal OS image.
 base-image: ghcr.io/ublue-os/silverblue-surface
 image-version: 39
 modules:
-  - from-file: akmods.yml
-
   - type: files
     files:
       - usr: /usr
diff --git a/integration-tests/test-repo/.gitignore b/integration-tests/test-repo/.gitignore
index 37ba0905..4c749b66 100644
--- a/integration-tests/test-repo/.gitignore
+++ b/integration-tests/test-repo/.gitignore
@@ -1 +1,2 @@
 /Containerfile
+/Containerfile.*
diff --git a/integration-tests/test-repo/recipes/akmods.yml b/integration-tests/test-repo/recipes/akmods.yml
index 1e4f8ed5..9feb668b 100644
--- a/integration-tests/test-repo/recipes/akmods.yml
+++ b/integration-tests/test-repo/recipes/akmods.yml
@@ -1,23 +1,7 @@
-# TODO: Add back installs after upstream issues are fixed
-
 modules:
   # Tests installing rpms from a combo image stage
   - type: akmods
-    # install:
-    #   - nct6687d
-    #   - openrazer
-    #   - openrgb
-
-  # Tests pulling surface image
-  - type: akmods
-    base: surface
-    nvidia: true
-
-  # Tests pulling image for main nvidia
-  - type: akmods
-    nvidia: true
-
-  # Test pulling image for base asus
-  - type: akmods
-    base: asus
-    nvidia: true
+    install:
+      - nct6687d
+      - openrazer
+      - openrgb
diff --git a/integration-tests/test-repo/recipes/recipe-39.yml b/integration-tests/test-repo/recipes/recipe-39.yml
index f50e22cc..9ad3c499 100644
--- a/integration-tests/test-repo/recipes/recipe-39.yml
+++ b/integration-tests/test-repo/recipes/recipe-39.yml
@@ -1,3 +1,5 @@
+---
+# yaml-language-server: $schema=https://schema.blue-build.org/recipe-v1.json
 name: cli/test
 description: This is my personal OS image.
 base-image: ghcr.io/ublue-os/silverblue-main
@@ -11,7 +13,8 @@ modules:
 
   - type: files
     files:
-      - usr: /usr
+      - source: usr
+        destination: /usr
 
   - type: script
     scripts:
diff --git a/integration-tests/test-repo/recipes/recipe.yml b/integration-tests/test-repo/recipes/recipe.yml
index 58831f6e..19e23da8 100644
--- a/integration-tests/test-repo/recipes/recipe.yml
+++ b/integration-tests/test-repo/recipes/recipe.yml
@@ -1,3 +1,5 @@
+---
+# yaml-language-server: $schema=https://schema.blue-build.org/recipe-v1.json
 name: cli/test
 description: This is my personal OS image.
 base-image: ghcr.io/ublue-os/silverblue-main
@@ -10,7 +12,8 @@ modules:
 
   - type: files
     files:
-      - usr: /usr
+      - source: usr
+        destination: /usr
 
   - type: script
     scripts: