[elbe-devel] [PATCH] Synchronize release names in schema and code

[Bastian Germann]

The schema validation for release names has less valid names than the
possible codenames. Synchronize and order them historically.

Add the upcoming LTS release jammy.

Fixes: 04d0bbbec933 ("Add schema definition for initvm/project suite restriction")
Signed-off-by: Bastian Germann <bage at linutronix.de>
---
 elbepack/debianreleases.py |  3 +++
 schema/dbsfed.xsd          | 23 +++++++++++++++++++----
 2 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/elbepack/debianreleases.py b/elbepack/debianreleases.py
index 0de0b0a397..100048f7fe 100644
--- a/elbepack/debianreleases.py
+++ b/elbepack/debianreleases.py
@@ -26,6 +26,9 @@ suite2codename = {'oldoldoldstable': 'jessie',
                   'artful': 'artful',
                   'bionic': 'bionic',
                   'cosmic': 'cosmic',
+                  'focal': 'focal',
+                  'groovy': 'groovy',
+                  'jammy': 'jammy',
                  }
 
 
diff --git a/schema/dbsfed.xsd b/schema/dbsfed.xsd
index 0ae44fc0dc..60481531f5 100644
--- a/schema/dbsfed.xsd
+++ b/schema/dbsfed.xsd
@@ -668,25 +668,40 @@
 
   <simpleType name="suite-initvm">
     <restriction base="string">
+      <enumeration value="sid" />
       <enumeration value="bullseye" />
       <enumeration value="buster" />
-      <enumeration value="sid" />
       <enumeration value="stretch" />
     </restriction>
   </simpleType>
 
   <simpleType name="suite-proj">
     <restriction base="string">
+      <enumeration value="sid" />
       <enumeration value="bookworm" />
       <enumeration value="bullseye" />
       <enumeration value="buster" />
-      <enumeration value="sid" />
       <enumeration value="stretch" />
-      <enumeration value="bionic" />
-      <enumeration value="focal" />
+      <enumeration value="jessie" />
+
+      <enumeration value="jammy" />
       <enumeration value="groovy" />
+      <enumeration value="focal" />
+      <enumeration value="cosmic" />
+      <enumeration value="bionic" />
+      <enumeration value="artful" />
+      <enumeration value="zesty" />
+      <enumeration value="yakkety" />
       <enumeration value="xenial" />
+      <enumeration value="wily" />
+      <enumeration value="vivid" />
+      <enumeration value="utopic" />
       <enumeration value="trusty" />
+      <enumeration value="saucy" />
+      <enumeration value="raring" />
+      <enumeration value="quantal" />
+      <enumeration value="precise" />
+      <enumeration value="lucid" />
     </restriction>
   </simpleType>
 
-- 
2.30.2