From 7f698a8bf602b6265322ed857a932c3fcf2a7d86 Mon Sep 17 00:00:00 2001
From: Jonathan Lebon <jonathan@jlebon.com>
Date: Tue, 19 Nov 2024 15:09:17 -0500
Subject: [PATCH] manifests: move from `rojig` to `metadata`

Now that cosa supports looking at the `metadata` key, let's finally stop
abusing the `rojig` key.
---
 manifest-c9s.yaml          | 2 +-
 manifest-ocp-rhel-9.4.yaml | 2 +-
 manifest-ocp-rhel-9.6.yaml | 2 +-
 manifest-okd-c9s.yaml      | 2 +-
 manifest-rhel-9.4.yaml     | 2 +-
 manifest-rhel-9.6.yaml     | 2 +-
 packages-openshift.yaml    | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/manifest-c9s.yaml b/manifest-c9s.yaml
index eda07c7b..1cc708b9 100644
--- a/manifest-c9s.yaml
+++ b/manifest-c9s.yaml
@@ -1,6 +1,6 @@
 # Manifest for CentOS Stream CoreOS 9
 
-rojig:
+metadata:
   license: MIT
   name: scos
   summary: CentOS Stream CoreOS 9
diff --git a/manifest-ocp-rhel-9.4.yaml b/manifest-ocp-rhel-9.4.yaml
index d8d83702..7fecb802 100644
--- a/manifest-ocp-rhel-9.4.yaml
+++ b/manifest-ocp-rhel-9.4.yaml
@@ -1,7 +1,7 @@
 # Manifest for OCP node based on RHEL 9.4
 # Note: this manifest is temporary; in the future, OCP components will be layered instead.
 
-rojig:
+metadata:
   license: MIT
   name: rhcos
   summary: OpenShift 4.18
diff --git a/manifest-ocp-rhel-9.6.yaml b/manifest-ocp-rhel-9.6.yaml
index 7e7666b9..2f1bc358 100644
--- a/manifest-ocp-rhel-9.6.yaml
+++ b/manifest-ocp-rhel-9.6.yaml
@@ -1,7 +1,7 @@
 # Manifest for OCP node based on RHEL 9.6
 # Note: this manifest is temporary; in the future, OCP components will be layered instead.
 
-rojig:
+metadata:
   license: MIT
   name: rhcos
   summary: OpenShift 4.18
diff --git a/manifest-okd-c9s.yaml b/manifest-okd-c9s.yaml
index bad153ba..dc38e916 100644
--- a/manifest-okd-c9s.yaml
+++ b/manifest-okd-c9s.yaml
@@ -1,7 +1,7 @@
 # Manifest for OKD node based on CentOS Stream CoreOS 9
 # Note: this manifest is temporary; in the future, OKD components will be layered instead.
 
-rojig:
+metadata:
   license: MIT
   name: scos
   summary: OKD 4.18
diff --git a/manifest-rhel-9.4.yaml b/manifest-rhel-9.4.yaml
index 6a2cb4e1..d6276bfd 100644
--- a/manifest-rhel-9.4.yaml
+++ b/manifest-rhel-9.4.yaml
@@ -1,6 +1,6 @@
 # Manifest for RHCOS based on RHEL 9.4
 
-rojig:
+metadata:
   license: MIT
   name: rhcos
   summary: RHEL CoreOS 9.4
diff --git a/manifest-rhel-9.6.yaml b/manifest-rhel-9.6.yaml
index 7f217cbb..455004df 100644
--- a/manifest-rhel-9.6.yaml
+++ b/manifest-rhel-9.6.yaml
@@ -1,6 +1,6 @@
 # Manifest for RHCOS based on RHEL 9.6
 
-rojig:
+metadata:
   license: MIT
   name: rhcos
   summary: RHEL CoreOS 9.6
diff --git a/packages-openshift.yaml b/packages-openshift.yaml
index b9be6cfe..fb1aacd7 100644
--- a/packages-openshift.yaml
+++ b/packages-openshift.yaml
@@ -106,7 +106,7 @@ postprocess:
     # This works around the fact that we can't currently access manifest
     # variables from postprocess scripts, though we just use the name, since
     # it's easier.
-    variant=$(jq -r .rojig.name /usr/share/rpm-ostree/treefile.json)
+    variant=$(jq -r .metadata.name /usr/share/rpm-ostree/treefile.json)
     if [ $variant = "scos" ]; then
       colloquial_name=SCOS
       project_name=OKD