Skip to content

Commit cae5ab9

Browse files
anmazzottianmazzotti
committed
Always reference build tags
Signed-off-by: Andrea Mazzotti <[email protected]>
1 parent 9b289dd commit cae5ab9

File tree

6 files changed

+119
-27
lines changed

6 files changed

+119
-27
lines changed

‎channels/sle-micro-5-5.json

Lines changed: 30 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"version": "v2.0.2",
88
"type": "container",
99
"metadata": {
10-
"upgradeImage": "registry.suse.com/suse/sle-micro/5.5:2.0.2",
10+
"upgradeImage": "registry.suse.com/suse/sle-micro/5.5:2.0.2-4.2.111",
1111
"displayName": "SLE Micro 5.5 OS"
1212
}
1313
}
@@ -228,7 +228,20 @@
228228
"version": "v2.0.4",
229229
"type": "container",
230230
"metadata": {
231-
"upgradeImage": "registry.suse.com/suse/sle-micro/5.5:2.0.4",
231+
"upgradeImage": "registry.suse.com/suse/sle-micro/5.5:2.0.4-5.5.15",
232+
"displayName": "SLE Micro 5.5 OS"
233+
}
234+
}
235+
},
236+
{
237+
"metadata": {
238+
"name": "v2.0.4-5.5.15"
239+
},
240+
"spec": {
241+
"version": "v2.0.4-5.5.15",
242+
"type": "container",
243+
"metadata": {
244+
"upgradeImage": "registry.suse.com/suse/sle-micro/5.5:2.0.4-5.5.15",
232245
"displayName": "SLE Micro 5.5 OS"
233246
}
234247
}
@@ -254,7 +267,7 @@
254267
"version": "v2.0.2",
255268
"type": "iso",
256269
"metadata": {
257-
"uri": "registry.suse.com/suse/sle-micro-iso/5.5:2.0.2",
270+
"uri": "registry.suse.com/suse/sle-micro-iso/5.5:2.0.2-4.2.128",
258271
"displayName": "SLE Micro 5.5 ISO"
259272
}
260273
}
@@ -306,7 +319,20 @@
306319
"version": "v2.0.4",
307320
"type": "iso",
308321
"metadata": {
309-
"uri": "registry.suse.com/suse/sle-micro-iso/5.5:2.0.4",
322+
"uri": "registry.suse.com/suse/sle-micro-iso/5.5:2.0.4-5.5.20",
323+
"displayName": "SLE Micro 5.5 ISO"
324+
}
325+
}
326+
},
327+
{
328+
"metadata": {
329+
"name": "v2.0.4-5.5.20"
330+
},
331+
"spec": {
332+
"version": "v2.0.4-5.5.20",
333+
"type": "iso",
334+
"metadata": {
335+
"uri": "registry.suse.com/suse/sle-micro-iso/5.5:2.0.4-5.5.20",
310336
"displayName": "SLE Micro 5.5 ISO"
311337
}
312338
}

‎channels/sle-micro-base-5-5.json

Lines changed: 30 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"version": "v2.0.2",
88
"type": "container",
99
"metadata": {
10-
"upgradeImage": "registry.suse.com/suse/sle-micro/base-5.5:2.0.2",
10+
"upgradeImage": "registry.suse.com/suse/sle-micro/base-5.5:2.0.2-5.5.12",
1111
"displayName": "SLE Micro Base 5.5 OS"
1212
}
1313
}
@@ -137,7 +137,7 @@
137137
"version": "v2.0.4",
138138
"type": "container",
139139
"metadata": {
140-
"upgradeImage": "registry.suse.com/suse/sle-micro/base-5.5:2.0.4",
140+
"upgradeImage": "registry.suse.com/suse/sle-micro/base-5.5:2.0.4-5.8.7",
141141
"displayName": "SLE Micro Base 5.5 OS"
142142
}
143143
}
@@ -155,6 +155,19 @@
155155
}
156156
}
157157
},
158+
{
159+
"metadata": {
160+
"name": "base-v2.0.4-5.8.7"
161+
},
162+
"spec": {
163+
"version": "v2.0.4-5.8.7",
164+
"type": "container",
165+
"metadata": {
166+
"upgradeImage": "registry.suse.com/suse/sle-micro/base-5.5:2.0.4-5.8.7",
167+
"displayName": "SLE Micro Base 5.5 OS"
168+
}
169+
}
170+
},
158171
{
159172
"metadata": {
160173
"name": "base-v2.0.2"
@@ -163,7 +176,7 @@
163176
"version": "v2.0.2",
164177
"type": "iso",
165178
"metadata": {
166-
"uri": "registry.suse.com/suse/sle-micro-iso/base-5.5:2.0.2",
179+
"uri": "registry.suse.com/suse/sle-micro-iso/base-5.5:2.0.2-4.2.203",
167180
"displayName": "SLE Micro Base 5.5 ISO"
168181
}
169182
}
@@ -215,7 +228,20 @@
215228
"version": "v2.0.4",
216229
"type": "iso",
217230
"metadata": {
218-
"uri": "registry.suse.com/suse/sle-micro-iso/base-5.5:2.0.4",
231+
"uri": "registry.suse.com/suse/sle-micro-iso/base-5.5:2.0.4-5.5.29",
232+
"displayName": "SLE Micro Base 5.5 ISO"
233+
}
234+
}
235+
},
236+
{
237+
"metadata": {
238+
"name": "base-v2.0.4-5.5.29"
239+
},
240+
"spec": {
241+
"version": "v2.0.4-5.5.29",
242+
"type": "iso",
243+
"metadata": {
244+
"uri": "registry.suse.com/suse/sle-micro-iso/base-5.5:2.0.4-5.5.29",
219245
"displayName": "SLE Micro Base 5.5 ISO"
220246
}
221247
}

‎channels/sle-micro-kvm-5-5.json

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"version": "v2.0.2",
88
"type": "container",
99
"metadata": {
10-
"upgradeImage": "registry.suse.com/suse/sle-micro/kvm-5.5:2.0.2",
10+
"upgradeImage": "registry.suse.com/suse/sle-micro/kvm-5.5:2.0.2-2.2.115",
1111
"displayName": "SLE Micro KVM 5.5 OS"
1212
}
1313
}
@@ -59,7 +59,20 @@
5959
"version": "v2.0.4",
6060
"type": "container",
6161
"metadata": {
62-
"upgradeImage": "registry.suse.com/suse/sle-micro/kvm-5.5:2.0.4",
62+
"upgradeImage": "registry.suse.com/suse/sle-micro/kvm-5.5:2.0.4-3.5.19",
63+
"displayName": "SLE Micro KVM 5.5 OS"
64+
}
65+
}
66+
},
67+
{
68+
"metadata": {
69+
"name": "kvm-v2.0.4-3.5.19"
70+
},
71+
"spec": {
72+
"version": "v2.0.4-3.5.19",
73+
"type": "container",
74+
"metadata": {
75+
"upgradeImage": "registry.suse.com/suse/sle-micro/kvm-5.5:2.0.4-3.5.19",
6376
"displayName": "SLE Micro KVM 5.5 OS"
6477
}
6578
}

‎channels/sle-micro-rt-5-5.json

Lines changed: 27 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -7,46 +7,46 @@
77
"version": "v2.0.2",
88
"type": "container",
99
"metadata": {
10-
"upgradeImage": "registry.suse.com/suse/sle-micro/kvm-5.5:2.0.2",
10+
"upgradeImage": "registry.suse.com/suse/sle-micro/rt-5.5:",
1111
"displayName": "SLE Micro RT 5.5 OS"
1212
}
1313
}
1414
},
1515
{
1616
"metadata": {
17-
"name": "rt-v2.0.2-2.2.115"
17+
"name": "rt-v2.0.2-3.2.119"
1818
},
1919
"spec": {
20-
"version": "v2.0.2-2.2.115",
20+
"version": "v2.0.2-3.2.119",
2121
"type": "container",
2222
"metadata": {
23-
"upgradeImage": "registry.suse.com/suse/sle-micro/kvm-5.5:2.0.2-2.2.115",
23+
"upgradeImage": "registry.suse.com/suse/sle-micro/rt-5.5:",
2424
"displayName": "SLE Micro RT 5.5 OS"
2525
}
2626
}
2727
},
2828
{
2929
"metadata": {
30-
"name": "rt-v2.0.2-2.2.20"
30+
"name": "rt-v2.0.2-3.2.23"
3131
},
3232
"spec": {
33-
"version": "v2.0.2-2.2.20",
33+
"version": "v2.0.2-3.2.23",
3434
"type": "container",
3535
"metadata": {
36-
"upgradeImage": "registry.suse.com/suse/sle-micro/kvm-5.5:2.0.2-2.2.20",
36+
"upgradeImage": "registry.suse.com/suse/sle-micro/rt-5.5:",
3737
"displayName": "SLE Micro RT 5.5 OS"
3838
}
3939
}
4040
},
4141
{
4242
"metadata": {
43-
"name": "rt-v2.0.2-2.2.85"
43+
"name": "rt-v2.0.2-3.2.86"
4444
},
4545
"spec": {
46-
"version": "v2.0.2-2.2.85",
46+
"version": "v2.0.2-3.2.86",
4747
"type": "container",
4848
"metadata": {
49-
"upgradeImage": "registry.suse.com/suse/sle-micro/kvm-5.5:2.0.2-2.2.85",
49+
"upgradeImage": "registry.suse.com/suse/sle-micro/rt-5.5:",
5050
"displayName": "SLE Micro RT 5.5 OS"
5151
}
5252
}
@@ -59,20 +59,33 @@
5959
"version": "v2.0.4",
6060
"type": "container",
6161
"metadata": {
62-
"upgradeImage": "registry.suse.com/suse/sle-micro/kvm-5.5:2.0.4",
62+
"upgradeImage": "registry.suse.com/suse/sle-micro/rt-5.5:2.0.4-4.5.21",
6363
"displayName": "SLE Micro RT 5.5 OS"
6464
}
6565
}
6666
},
6767
{
6868
"metadata": {
69-
"name": "rt-v2.0.4-3.5.2"
69+
"name": "rt-v2.0.4-4.5.21"
7070
},
7171
"spec": {
72-
"version": "v2.0.4-3.5.2",
72+
"version": "v2.0.4-4.5.21",
7373
"type": "container",
7474
"metadata": {
75-
"upgradeImage": "registry.suse.com/suse/sle-micro/kvm-5.5:2.0.4-3.5.2",
75+
"upgradeImage": "registry.suse.com/suse/sle-micro/rt-5.5:2.0.4-4.5.21",
76+
"displayName": "SLE Micro RT 5.5 OS"
77+
}
78+
}
79+
},
80+
{
81+
"metadata": {
82+
"name": "rt-v2.0.4-4.5.3"
83+
},
84+
"spec": {
85+
"version": "v2.0.4-4.5.3",
86+
"type": "container",
87+
"metadata": {
88+
"upgradeImage": "registry.suse.com/suse/sle-micro/rt-5.5:2.0.4-4.5.3",
7689
"displayName": "SLE Micro RT 5.5 OS"
7790
}
7891
}

‎config.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,6 @@ watches:
1717
- flavor: "rt"
1818
fileName: "sle-micro-rt-5-5"
1919
displayName: "SLE Micro RT 5.5"
20-
osRepo: registry.suse.com/suse/sle-micro/kvm-5.5
20+
osRepo: registry.suse.com/suse/sle-micro/rt-5.5
2121
isoRepo: "N/A"
2222

‎populate_channels.sh

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,18 @@ while IFS=\= read watch; do
2121
echo "Creating $fileName"
2222
echo "[" > $file
2323
for tag in "${osTags[@]}"; do
24+
# Determine ManagedOSVersion name
2425
if [ -z $flavor ]; then
2526
name="v${tag}"
2627
else
2728
name="${flavor}-v${tag}"
2829
fi
30+
# Fetch image tag
31+
#
32+
# Note that we use the 'org.opencontainers.image.version'
33+
# so that we can always point to the latest build version tag.
34+
# Ex. '2.0.2-4.2.102' instead of '2.0.2'
35+
imageTag=($(skopeo inspect docker://$osRepo:$tag | jq '.Labels["org.opencontainers.image.version"]' | sed 's/"//g'))
2936
cat << EOF >> $file
3037
{
3138
"metadata": {
@@ -35,7 +42,7 @@ while IFS=\= read watch; do
3542
"version": "v$tag",
3643
"type": "container",
3744
"metadata": {
38-
"upgradeImage": "$osRepo:$tag",
45+
"upgradeImage": "$osRepo:$imageTag",
3946
"displayName": "$displayName OS"
4047
}
4148
}
@@ -47,11 +54,18 @@ EOF
4754
if [ $isoRepo != "N/A" ]; then
4855
isoTags=($(skopeo list-tags docker://$isoRepo | jq '.Tags[]' | grep -v '.att\|.sig\|latest' | sed 's/"//g'))
4956
for tag in "${isoTags[@]}"; do
57+
# Determine ManagedOSVersion name
5058
if [ -z $flavor ]; then
5159
name="v${tag}"
5260
else
5361
name="${flavor}-v${tag}"
5462
fi
63+
# Fetch image tag
64+
#
65+
# Note that we use the 'org.opencontainers.image.version'
66+
# so that we can always point to the latest build version tag.
67+
# Ex. '2.0.2-4.2.102' instead of '2.0.2'
68+
imageTag=($(skopeo inspect docker://$isoRepo:$tag | jq '.Labels["org.opencontainers.image.version"]' | sed 's/"//g'))
5569
cat << EOF >> $file
5670
{
5771
"metadata": {
@@ -61,7 +75,7 @@ EOF
6175
"version": "v$tag",
6276
"type": "iso",
6377
"metadata": {
64-
"uri": "$isoRepo:$tag",
78+
"uri": "$isoRepo:$imageTag",
6579
"displayName": "$displayName ISO"
6680
}
6781
}

0 commit comments

Comments
 (0)