Always reference build tags

Signed-off-by: Andrea Mazzotti <andrea.mazzotti@suse.com>
rancher · May 30, 2024 · cae5ab9 · cae5ab9
1 parent 9b289dd
commit cae5ab9
Show file tree

Hide file tree

Showing 6 changed files with 119 additions and 27 deletions.
diff --git a/channels/sle-micro-5-5.json b/channels/sle-micro-5-5.json
@@ -7,7 +7,7 @@
             "version": "v2.0.2",
             "type": "container",
             "metadata": {
-                "upgradeImage": "registry.suse.com/suse/sle-micro/5.5:2.0.2",
+                "upgradeImage": "registry.suse.com/suse/sle-micro/5.5:2.0.2-4.2.111",
                 "displayName": "SLE Micro 5.5 OS"
             }
         }
@@ -228,7 +228,20 @@
             "version": "v2.0.4",
             "type": "container",
             "metadata": {
-                "upgradeImage": "registry.suse.com/suse/sle-micro/5.5:2.0.4",
+                "upgradeImage": "registry.suse.com/suse/sle-micro/5.5:2.0.4-5.5.15",
+                "displayName": "SLE Micro 5.5 OS"
+            }
+        }
+    },
+    {
+        "metadata": {
+            "name": "v2.0.4-5.5.15"
+        },
+        "spec": {
+            "version": "v2.0.4-5.5.15",
+            "type": "container",
+            "metadata": {
+                "upgradeImage": "registry.suse.com/suse/sle-micro/5.5:2.0.4-5.5.15",
                 "displayName": "SLE Micro 5.5 OS"
             }
         }
@@ -254,7 +267,7 @@
             "version": "v2.0.2",
             "type": "iso",
             "metadata": {
-                "uri": "registry.suse.com/suse/sle-micro-iso/5.5:2.0.2",
+                "uri": "registry.suse.com/suse/sle-micro-iso/5.5:2.0.2-4.2.128",
                 "displayName": "SLE Micro 5.5 ISO"
             }
         }
@@ -306,7 +319,20 @@
             "version": "v2.0.4",
             "type": "iso",
             "metadata": {
-                "uri": "registry.suse.com/suse/sle-micro-iso/5.5:2.0.4",
+                "uri": "registry.suse.com/suse/sle-micro-iso/5.5:2.0.4-5.5.20",
+                "displayName": "SLE Micro 5.5 ISO"
+            }
+        }
+    },
+    {
+        "metadata": {
+            "name": "v2.0.4-5.5.20"
+        },
+        "spec": {
+            "version": "v2.0.4-5.5.20",
+            "type": "iso",
+            "metadata": {
+                "uri": "registry.suse.com/suse/sle-micro-iso/5.5:2.0.4-5.5.20",
                 "displayName": "SLE Micro 5.5 ISO"
             }
         }

diff --git a/channels/sle-micro-base-5-5.json b/channels/sle-micro-base-5-5.json
@@ -7,7 +7,7 @@
             "version": "v2.0.2",
             "type": "container",
             "metadata": {
-                "upgradeImage": "registry.suse.com/suse/sle-micro/base-5.5:2.0.2",
+                "upgradeImage": "registry.suse.com/suse/sle-micro/base-5.5:2.0.2-5.5.12",
                 "displayName": "SLE Micro Base 5.5 OS"
             }
         }
@@ -137,7 +137,7 @@
             "version": "v2.0.4",
             "type": "container",
             "metadata": {
-                "upgradeImage": "registry.suse.com/suse/sle-micro/base-5.5:2.0.4",
+                "upgradeImage": "registry.suse.com/suse/sle-micro/base-5.5:2.0.4-5.8.7",
                 "displayName": "SLE Micro Base 5.5 OS"
             }
         }
@@ -155,6 +155,19 @@
             }
         }
     },
+    {
+        "metadata": {
+            "name": "base-v2.0.4-5.8.7"
+        },
+        "spec": {
+            "version": "v2.0.4-5.8.7",
+            "type": "container",
+            "metadata": {
+                "upgradeImage": "registry.suse.com/suse/sle-micro/base-5.5:2.0.4-5.8.7",
+                "displayName": "SLE Micro Base 5.5 OS"
+            }
+        }
+    },
     {
         "metadata": {
             "name": "base-v2.0.2"
@@ -163,7 +176,7 @@
             "version": "v2.0.2",
             "type": "iso",
             "metadata": {
-                "uri": "registry.suse.com/suse/sle-micro-iso/base-5.5:2.0.2",
+                "uri": "registry.suse.com/suse/sle-micro-iso/base-5.5:2.0.2-4.2.203",
                 "displayName": "SLE Micro Base 5.5 ISO"
             }
         }
@@ -215,7 +228,20 @@
             "version": "v2.0.4",
             "type": "iso",
             "metadata": {
-                "uri": "registry.suse.com/suse/sle-micro-iso/base-5.5:2.0.4",
+                "uri": "registry.suse.com/suse/sle-micro-iso/base-5.5:2.0.4-5.5.29",
+                "displayName": "SLE Micro Base 5.5 ISO"
+            }
+        }
+    },
+    {
+        "metadata": {
+            "name": "base-v2.0.4-5.5.29"
+        },
+        "spec": {
+            "version": "v2.0.4-5.5.29",
+            "type": "iso",
+            "metadata": {
+                "uri": "registry.suse.com/suse/sle-micro-iso/base-5.5:2.0.4-5.5.29",
                 "displayName": "SLE Micro Base 5.5 ISO"
             }
         }

diff --git a/channels/sle-micro-kvm-5-5.json b/channels/sle-micro-kvm-5-5.json
@@ -7,7 +7,7 @@
             "version": "v2.0.2",
             "type": "container",
             "metadata": {
-                "upgradeImage": "registry.suse.com/suse/sle-micro/kvm-5.5:2.0.2",
+                "upgradeImage": "registry.suse.com/suse/sle-micro/kvm-5.5:2.0.2-2.2.115",
                 "displayName": "SLE Micro KVM 5.5 OS"
             }
         }
@@ -59,7 +59,20 @@
             "version": "v2.0.4",
             "type": "container",
             "metadata": {
-                "upgradeImage": "registry.suse.com/suse/sle-micro/kvm-5.5:2.0.4",
+                "upgradeImage": "registry.suse.com/suse/sle-micro/kvm-5.5:2.0.4-3.5.19",
+                "displayName": "SLE Micro KVM 5.5 OS"
+            }
+        }
+    },
+    {
+        "metadata": {
+            "name": "kvm-v2.0.4-3.5.19"
+        },
+        "spec": {
+            "version": "v2.0.4-3.5.19",
+            "type": "container",
+            "metadata": {
+                "upgradeImage": "registry.suse.com/suse/sle-micro/kvm-5.5:2.0.4-3.5.19",
                 "displayName": "SLE Micro KVM 5.5 OS"
             }
         }

diff --git a/channels/sle-micro-rt-5-5.json b/channels/sle-micro-rt-5-5.json
@@ -7,46 +7,46 @@
             "version": "v2.0.2",
             "type": "container",
             "metadata": {
-                "upgradeImage": "registry.suse.com/suse/sle-micro/kvm-5.5:2.0.2",
+                "upgradeImage": "registry.suse.com/suse/sle-micro/rt-5.5:",
                 "displayName": "SLE Micro RT 5.5 OS"
             }
         }
     },
     {
         "metadata": {
-            "name": "rt-v2.0.2-2.2.115"
+            "name": "rt-v2.0.2-3.2.119"
         },
         "spec": {
-            "version": "v2.0.2-2.2.115",
+            "version": "v2.0.2-3.2.119",
             "type": "container",
             "metadata": {
-                "upgradeImage": "registry.suse.com/suse/sle-micro/kvm-5.5:2.0.2-2.2.115",
+                "upgradeImage": "registry.suse.com/suse/sle-micro/rt-5.5:",
                 "displayName": "SLE Micro RT 5.5 OS"
             }
         }
     },
     {
         "metadata": {
-            "name": "rt-v2.0.2-2.2.20"
+            "name": "rt-v2.0.2-3.2.23"
         },
         "spec": {
-            "version": "v2.0.2-2.2.20",
+            "version": "v2.0.2-3.2.23",
             "type": "container",
             "metadata": {
-                "upgradeImage": "registry.suse.com/suse/sle-micro/kvm-5.5:2.0.2-2.2.20",
+                "upgradeImage": "registry.suse.com/suse/sle-micro/rt-5.5:",
                 "displayName": "SLE Micro RT 5.5 OS"
             }
         }
     },
     {
         "metadata": {
-            "name": "rt-v2.0.2-2.2.85"
+            "name": "rt-v2.0.2-3.2.86"
         },
         "spec": {
-            "version": "v2.0.2-2.2.85",
+            "version": "v2.0.2-3.2.86",
             "type": "container",
             "metadata": {
-                "upgradeImage": "registry.suse.com/suse/sle-micro/kvm-5.5:2.0.2-2.2.85",
+                "upgradeImage": "registry.suse.com/suse/sle-micro/rt-5.5:",
                 "displayName": "SLE Micro RT 5.5 OS"
             }
         }
@@ -59,20 +59,33 @@
             "version": "v2.0.4",
             "type": "container",
             "metadata": {
-                "upgradeImage": "registry.suse.com/suse/sle-micro/kvm-5.5:2.0.4",
+                "upgradeImage": "registry.suse.com/suse/sle-micro/rt-5.5:2.0.4-4.5.21",
                 "displayName": "SLE Micro RT 5.5 OS"
             }
         }
     },
     {
         "metadata": {
-            "name": "rt-v2.0.4-3.5.2"
+            "name": "rt-v2.0.4-4.5.21"
         },
         "spec": {
-            "version": "v2.0.4-3.5.2",
+            "version": "v2.0.4-4.5.21",
             "type": "container",
             "metadata": {
-                "upgradeImage": "registry.suse.com/suse/sle-micro/kvm-5.5:2.0.4-3.5.2",
+                "upgradeImage": "registry.suse.com/suse/sle-micro/rt-5.5:2.0.4-4.5.21",
+                "displayName": "SLE Micro RT 5.5 OS"
+            }
+        }
+    },
+    {
+        "metadata": {
+            "name": "rt-v2.0.4-4.5.3"
+        },
+        "spec": {
+            "version": "v2.0.4-4.5.3",
+            "type": "container",
+            "metadata": {
+                "upgradeImage": "registry.suse.com/suse/sle-micro/rt-5.5:2.0.4-4.5.3",
                 "displayName": "SLE Micro RT 5.5 OS"
             }
         }

diff --git a/config.yaml b/config.yaml
@@ -17,6 +17,6 @@ watches:
   - flavor: "rt"
     fileName: "sle-micro-rt-5-5"
     displayName: "SLE Micro RT 5.5"
-    osRepo: registry.suse.com/suse/sle-micro/kvm-5.5
+    osRepo: registry.suse.com/suse/sle-micro/rt-5.5
     isoRepo: "N/A"
 
diff --git a/populate_channels.sh b/populate_channels.sh
@@ -21,11 +21,18 @@ while IFS=\= read watch; do
     echo "Creating $fileName"
     echo "[" > $file
     for tag in "${osTags[@]}"; do
+        # Determine ManagedOSVersion name
         if [ -z $flavor ]; then
             name="v${tag}"
         else
             name="${flavor}-v${tag}"
         fi
+        # Fetch image tag
+        #
+        # Note that we use the 'org.opencontainers.image.version'
+        # so that we can always point to the latest build version tag.
+        # Ex. '2.0.2-4.2.102' instead of '2.0.2'
+        imageTag=($(skopeo inspect docker://$osRepo:$tag | jq '.Labels["org.opencontainers.image.version"]' | sed 's/"//g'))
         cat << EOF >> $file
     {
         "metadata": {
@@ -35,7 +42,7 @@ while IFS=\= read watch; do
             "version": "v$tag",
             "type": "container",
             "metadata": {
-                "upgradeImage": "$osRepo:$tag",
+                "upgradeImage": "$osRepo:$imageTag",
                 "displayName": "$displayName OS"
             }
         }
@@ -47,11 +54,18 @@ EOF
     if [ $isoRepo != "N/A" ]; then
         isoTags=($(skopeo list-tags docker://$isoRepo | jq '.Tags[]' | grep -v '.att\|.sig\|latest' | sed 's/"//g'))
         for tag in "${isoTags[@]}"; do
+            # Determine ManagedOSVersion name
             if [ -z $flavor ]; then
                 name="v${tag}"
             else
                 name="${flavor}-v${tag}"
             fi
+            # Fetch image tag
+            #
+            # Note that we use the 'org.opencontainers.image.version'
+            # so that we can always point to the latest build version tag.
+            # Ex. '2.0.2-4.2.102' instead of '2.0.2'
+            imageTag=($(skopeo inspect docker://$isoRepo:$tag | jq '.Labels["org.opencontainers.image.version"]' | sed 's/"//g'))
             cat << EOF >> $file
     {
         "metadata": {
@@ -61,7 +75,7 @@ EOF
             "version": "v$tag",
             "type": "iso",
             "metadata": {
-                "uri": "$isoRepo:$tag",
+                "uri": "$isoRepo:$imageTag",
                 "displayName": "$displayName ISO"
             }
         }