Suffix flavor to filenames for better sorting

Signed-off-by: Andrea Mazzotti <[email protected]>
rancher · Jun 4, 2024 · 0c508c4 · 0c508c4
1 parent 8f9257e
commit 0c508c4
Show file tree

Hide file tree

Showing 7 changed files with 17 additions and 12 deletions.
diff --git a/.github/workflows/publish-all-channels.yaml b/.github/workflows/publish-all-channels.yaml
@@ -24,14 +24,11 @@ jobs:
           - tag: "5.5"
             file: "sle-micro-5-5.json"
             baseOS: "sle-micro"
-          - tag:  "5.5-base"
-            file: "sle-micro-base-5-5.json"
-            baseOS: "sle-micro"
           - tag:  "5.5-kvm"
-            file: "sle-micro-kvm-5-5.json"
+            file: "sle-micro-5-5-kvm.json"
             baseOS: "sle-micro"
           - tag: "5.5-rt"
-            file: "sle-micro-rt-5-5.json"
+            file: "sle-micro-5-5-rt.json"
             baseOS: "sle-micro"
     runs-on: ubuntu-latest
     steps:

diff --git a/.obs/dockerfile/Dockerfile.sle-micro-kvm-5-5 → .obs/dockerfile/Dockerfile.sle-micro-5-5-kvm b/.obs/dockerfile/Dockerfile.sle-micro-kvm-5-5 → .obs/dockerfile/Dockerfile.sle-micro-5-5-kvm
diff --git a/.obs/dockerfile/Dockerfile.sle-micro-rt-5-5 → .obs/dockerfile/Dockerfile.sle-micro-5-5-rt b/.obs/dockerfile/Dockerfile.sle-micro-rt-5-5 → .obs/dockerfile/Dockerfile.sle-micro-5-5-rt
diff --git a/channels/sle-micro-kvm-5-5.json → channels/sle-micro-5-5-kvm.json b/channels/sle-micro-kvm-5-5.json → channels/sle-micro-5-5-kvm.json
diff --git a/channels/sle-micro-rt-5-5.json → channels/sle-micro-5-5-rt.json b/channels/sle-micro-rt-5-5.json → channels/sle-micro-5-5-rt.json
diff --git a/channels/sle-micro-5-5.json b/channels/sle-micro-5-5.json
@@ -272,6 +272,19 @@
             }
         }
     },
+    {
+        "metadata": {
+            "name": "v2.0.4-5.5.30"
+        },
+        "spec": {
+            "version": "v2.0.4-5.5.30",
+            "type": "container",
+            "metadata": {
+                "upgradeImage": "registry.suse.com/suse/sle-micro/5.5:2.0.4-5.5.30",
+                "displayName": "SLE Micro 5.5 OS"
+            }
+        }
+    },
     {
         "metadata": {
             "name": "v2.0.2-4.2.128"

diff --git a/config.yaml b/config.yaml
@@ -4,18 +4,13 @@ watches:
     displayName: "SLE Micro 5.5"
     osRepo: registry.suse.com/suse/sle-micro/5.5
     isoRepo: registry.suse.com/suse/sle-micro-iso/5.5
-  - flavor: "base"
-    fileName: "sle-micro-base-5-5"
-    displayName: "SLE Micro Base 5.5"
-    osRepo: registry.suse.com/suse/sle-micro/base-5.5
-    isoRepo: registry.suse.com/suse/sle-micro-iso/base-5.5
   - flavor: "kvm"
-    fileName: "sle-micro-kvm-5-5"
+    fileName: "sle-micro-5-5-kvm"
     displayName: "SLE Micro KVM 5.5"
     osRepo: registry.suse.com/suse/sle-micro/kvm-5.5
     isoRepo: "N/A"
   - flavor: "rt"
-    fileName: "sle-micro-rt-5-5"
+    fileName: "sle-micro-5-5-rt"
     displayName: "SLE Micro RT 5.5"
     osRepo: registry.suse.com/suse/sle-micro/rt-5.5
     isoRepo: "N/A"