From 63d16c51ea3a7136edb802cde2c73160f13bd6a4 Mon Sep 17 00:00:00 2001
From: Gerald Pinder <gmpinder@gmail.com>
Date: Sat, 29 Jul 2023 15:59:09 -0400
Subject: [PATCH] Switch to new matrix

---
 .gitlab-ci.yml                                            | 8 +++-----
 Containerfile.c => Containerfile.cp                       | 2 +-
 Containerfile.j => Containerfile.jp                       | 2 +-
 recipe-c.yml                                              | 2 +-
 {usr-c => usr-cp}/etc/tlp.conf                            | 0
 .../etc/firewalld/services/steam-local-transfer.xml       | 0
 {usr-j => usr-jp}/etc/tlp.conf                            | 0
 .../etc/udev/rules.d/99-8bitdo-ultimate-xinput.rules      | 0
 .../lib/systemd/system/8bitdo-ultimate-xinput@.service    | 0
 9 files changed, 6 insertions(+), 8 deletions(-)
 rename Containerfile.c => Containerfile.cp (98%)
 rename Containerfile.j => Containerfile.jp (99%)
 rename {usr-c => usr-cp}/etc/tlp.conf (100%)
 rename {usr-j => usr-jp}/etc/firewalld/services/steam-local-transfer.xml (100%)
 rename {usr-j => usr-jp}/etc/tlp.conf (100%)
 rename {usr-j => usr-jp}/etc/udev/rules.d/99-8bitdo-ultimate-xinput.rules (100%)
 rename {usr-j => usr-jp}/lib/systemd/system/8bitdo-ultimate-xinput@.service (100%)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 15bd2c8..4fab615 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -8,8 +8,6 @@ include:
       - RECIPE:
           - recipe-desktop.yml
           - recipe-framework-13.yml
-        CONTAINERFILE: Containerfile.j
-        USR_DIR: usr-j
-      - RECIPE: recipe-c.yml
-        CONTAINERFILE: Containerfile.c
-        USR_DIR: usr-c
+        USER: jp
+      - RECIPE: recipe-cp.yml
+        USER: cp
diff --git a/Containerfile.c b/Containerfile.cp
similarity index 98%
rename from Containerfile.c
rename to Containerfile.cp
index e197b67..0af3b54 100644
--- a/Containerfile.c
+++ b/Containerfile.cp
@@ -11,7 +11,7 @@ ARG BASE_IMAGE_URL=ghcr.io/ublue-os/cinnamon-main
 
 FROM ${BASE_IMAGE_URL}:${FEDORA_MAJOR_VERSION}
 
-ARG USR_DIR=usr-c
+ARG USR_DIR=usr-cp
 
 # The default recipe set to the recipe's default filename
 # so that `podman build` should just work for many people.
diff --git a/Containerfile.j b/Containerfile.jp
similarity index 99%
rename from Containerfile.j
rename to Containerfile.jp
index 2f2ec49..6ab31ee 100644
--- a/Containerfile.j
+++ b/Containerfile.jp
@@ -11,7 +11,7 @@ ARG BASE_IMAGE_URL=ghcr.io/ublue-os/kinoite-main
 
 FROM ${BASE_IMAGE_URL}:${FEDORA_MAJOR_VERSION}
 
-ARG USR_DIR=usr-j
+ARG USR_DIR=usr-jp
 
 # The default recipe set to the recipe's default filename
 # so that `podman build` should just work for many people.
diff --git a/recipe-c.yml b/recipe-c.yml
index 5af9c6d..e9ec9fc 100644
--- a/recipe-c.yml
+++ b/recipe-c.yml
@@ -1,4 +1,4 @@
-name: laptop-c
+name: laptop
 base-image: ghcr.io/ublue-os/cinnamon-main
 fedora-version: 38
 description: The image of Wunker OS for a regular Cinnaomon user.
diff --git a/usr-c/etc/tlp.conf b/usr-cp/etc/tlp.conf
similarity index 100%
rename from usr-c/etc/tlp.conf
rename to usr-cp/etc/tlp.conf
diff --git a/usr-j/etc/firewalld/services/steam-local-transfer.xml b/usr-jp/etc/firewalld/services/steam-local-transfer.xml
similarity index 100%
rename from usr-j/etc/firewalld/services/steam-local-transfer.xml
rename to usr-jp/etc/firewalld/services/steam-local-transfer.xml
diff --git a/usr-j/etc/tlp.conf b/usr-jp/etc/tlp.conf
similarity index 100%
rename from usr-j/etc/tlp.conf
rename to usr-jp/etc/tlp.conf
diff --git a/usr-j/etc/udev/rules.d/99-8bitdo-ultimate-xinput.rules b/usr-jp/etc/udev/rules.d/99-8bitdo-ultimate-xinput.rules
similarity index 100%
rename from usr-j/etc/udev/rules.d/99-8bitdo-ultimate-xinput.rules
rename to usr-jp/etc/udev/rules.d/99-8bitdo-ultimate-xinput.rules
diff --git a/usr-j/lib/systemd/system/8bitdo-ultimate-xinput@.service b/usr-jp/lib/systemd/system/8bitdo-ultimate-xinput@.service
similarity index 100%
rename from usr-j/lib/systemd/system/8bitdo-ultimate-xinput@.service
rename to usr-jp/lib/systemd/system/8bitdo-ultimate-xinput@.service