Skip to content

Commit a13acac

Browse files
anmazzottianmazzotti
committed
Add limits
Signed-off-by: Andrea Mazzotti <[email protected]>
1 parent cae5ab9 commit a13acac

File tree

4 files changed

+19
-247
lines changed

4 files changed

+19
-247
lines changed

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

Lines changed: 0 additions & 169 deletions
Original file line numberDiff line numberDiff line change
@@ -51,175 +51,6 @@
5151
}
5252
}
5353
},
54-
{
55-
"metadata": {
56-
"name": "v2.0.2-4.2.109"
57-
},
58-
"spec": {
59-
"version": "v2.0.2-4.2.109",
60-
"type": "container",
61-
"metadata": {
62-
"upgradeImage": "registry.suse.com/suse/sle-micro/5.5:2.0.2-4.2.109",
63-
"displayName": "SLE Micro 5.5 OS"
64-
}
65-
}
66-
},
67-
{
68-
"metadata": {
69-
"name": "v2.0.2-4.2.111"
70-
},
71-
"spec": {
72-
"version": "v2.0.2-4.2.111",
73-
"type": "container",
74-
"metadata": {
75-
"upgradeImage": "registry.suse.com/suse/sle-micro/5.5:2.0.2-4.2.111",
76-
"displayName": "SLE Micro 5.5 OS"
77-
}
78-
}
79-
},
80-
{
81-
"metadata": {
82-
"name": "v2.0.2-4.2.20"
83-
},
84-
"spec": {
85-
"version": "v2.0.2-4.2.20",
86-
"type": "container",
87-
"metadata": {
88-
"upgradeImage": "registry.suse.com/suse/sle-micro/5.5:2.0.2-4.2.20",
89-
"displayName": "SLE Micro 5.5 OS"
90-
}
91-
}
92-
},
93-
{
94-
"metadata": {
95-
"name": "v2.0.2-4.2.70"
96-
},
97-
"spec": {
98-
"version": "v2.0.2-4.2.70",
99-
"type": "container",
100-
"metadata": {
101-
"upgradeImage": "registry.suse.com/suse/sle-micro/5.5:2.0.2-4.2.70",
102-
"displayName": "SLE Micro 5.5 OS"
103-
}
104-
}
105-
},
106-
{
107-
"metadata": {
108-
"name": "v2.0.2-4.2.85"
109-
},
110-
"spec": {
111-
"version": "v2.0.2-4.2.85",
112-
"type": "container",
113-
"metadata": {
114-
"upgradeImage": "registry.suse.com/suse/sle-micro/5.5:2.0.2-4.2.85",
115-
"displayName": "SLE Micro 5.5 OS"
116-
}
117-
}
118-
},
119-
{
120-
"metadata": {
121-
"name": "v2.0.2-4.2.87"
122-
},
123-
"spec": {
124-
"version": "v2.0.2-4.2.87",
125-
"type": "container",
126-
"metadata": {
127-
"upgradeImage": "registry.suse.com/suse/sle-micro/5.5:2.0.2-4.2.87",
128-
"displayName": "SLE Micro 5.5 OS"
129-
}
130-
}
131-
},
132-
{
133-
"metadata": {
134-
"name": "v2.0.2-4.2.89"
135-
},
136-
"spec": {
137-
"version": "v2.0.2-4.2.89",
138-
"type": "container",
139-
"metadata": {
140-
"upgradeImage": "registry.suse.com/suse/sle-micro/5.5:2.0.2-4.2.89",
141-
"displayName": "SLE Micro 5.5 OS"
142-
}
143-
}
144-
},
145-
{
146-
"metadata": {
147-
"name": "v2.0.2-4.2.91"
148-
},
149-
"spec": {
150-
"version": "v2.0.2-4.2.91",
151-
"type": "container",
152-
"metadata": {
153-
"upgradeImage": "registry.suse.com/suse/sle-micro/5.5:2.0.2-4.2.91",
154-
"displayName": "SLE Micro 5.5 OS"
155-
}
156-
}
157-
},
158-
{
159-
"metadata": {
160-
"name": "v2.0.2-4.2.93"
161-
},
162-
"spec": {
163-
"version": "v2.0.2-4.2.93",
164-
"type": "container",
165-
"metadata": {
166-
"upgradeImage": "registry.suse.com/suse/sle-micro/5.5:2.0.2-4.2.93",
167-
"displayName": "SLE Micro 5.5 OS"
168-
}
169-
}
170-
},
171-
{
172-
"metadata": {
173-
"name": "v2.0.2-4.2.94"
174-
},
175-
"spec": {
176-
"version": "v2.0.2-4.2.94",
177-
"type": "container",
178-
"metadata": {
179-
"upgradeImage": "registry.suse.com/suse/sle-micro/5.5:2.0.2-4.2.94",
180-
"displayName": "SLE Micro 5.5 OS"
181-
}
182-
}
183-
},
184-
{
185-
"metadata": {
186-
"name": "v2.0.2-4.2.96"
187-
},
188-
"spec": {
189-
"version": "v2.0.2-4.2.96",
190-
"type": "container",
191-
"metadata": {
192-
"upgradeImage": "registry.suse.com/suse/sle-micro/5.5:2.0.2-4.2.96",
193-
"displayName": "SLE Micro 5.5 OS"
194-
}
195-
}
196-
},
197-
{
198-
"metadata": {
199-
"name": "v2.0.2-4.2.97"
200-
},
201-
"spec": {
202-
"version": "v2.0.2-4.2.97",
203-
"type": "container",
204-
"metadata": {
205-
"upgradeImage": "registry.suse.com/suse/sle-micro/5.5:2.0.2-4.2.97",
206-
"displayName": "SLE Micro 5.5 OS"
207-
}
208-
}
209-
},
210-
{
211-
"metadata": {
212-
"name": "v2.0.2-4.2.99"
213-
},
214-
"spec": {
215-
"version": "v2.0.2-4.2.99",
216-
"type": "container",
217-
"metadata": {
218-
"upgradeImage": "registry.suse.com/suse/sle-micro/5.5:2.0.2-4.2.99",
219-
"displayName": "SLE Micro 5.5 OS"
220-
}
221-
}
222-
},
22354
{
22455
"metadata": {
22556
"name": "v2.0.4"

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

Lines changed: 0 additions & 78 deletions
Original file line numberDiff line numberDiff line change
@@ -51,84 +51,6 @@
5151
}
5252
}
5353
},
54-
{
55-
"metadata": {
56-
"name": "base-v2.0.2-4.2.65"
57-
},
58-
"spec": {
59-
"version": "v2.0.2-4.2.65",
60-
"type": "container",
61-
"metadata": {
62-
"upgradeImage": "registry.suse.com/suse/sle-micro/base-5.5:2.0.2-4.2.65",
63-
"displayName": "SLE Micro Base 5.5 OS"
64-
}
65-
}
66-
},
67-
{
68-
"metadata": {
69-
"name": "base-v2.0.2-5.5.1"
70-
},
71-
"spec": {
72-
"version": "v2.0.2-5.5.1",
73-
"type": "container",
74-
"metadata": {
75-
"upgradeImage": "registry.suse.com/suse/sle-micro/base-5.5:2.0.2-5.5.1",
76-
"displayName": "SLE Micro Base 5.5 OS"
77-
}
78-
}
79-
},
80-
{
81-
"metadata": {
82-
"name": "base-v2.0.2-5.5.12"
83-
},
84-
"spec": {
85-
"version": "v2.0.2-5.5.12",
86-
"type": "container",
87-
"metadata": {
88-
"upgradeImage": "registry.suse.com/suse/sle-micro/base-5.5:2.0.2-5.5.12",
89-
"displayName": "SLE Micro Base 5.5 OS"
90-
}
91-
}
92-
},
93-
{
94-
"metadata": {
95-
"name": "base-v2.0.2-5.5.2"
96-
},
97-
"spec": {
98-
"version": "v2.0.2-5.5.2",
99-
"type": "container",
100-
"metadata": {
101-
"upgradeImage": "registry.suse.com/suse/sle-micro/base-5.5:2.0.2-5.5.2",
102-
"displayName": "SLE Micro Base 5.5 OS"
103-
}
104-
}
105-
},
106-
{
107-
"metadata": {
108-
"name": "base-v2.0.2-5.5.6"
109-
},
110-
"spec": {
111-
"version": "v2.0.2-5.5.6",
112-
"type": "container",
113-
"metadata": {
114-
"upgradeImage": "registry.suse.com/suse/sle-micro/base-5.5:2.0.2-5.5.6",
115-
"displayName": "SLE Micro Base 5.5 OS"
116-
}
117-
}
118-
},
119-
{
120-
"metadata": {
121-
"name": "base-v2.0.2-5.5.9"
122-
},
123-
"spec": {
124-
"version": "v2.0.2-5.5.9",
125-
"type": "container",
126-
"metadata": {
127-
"upgradeImage": "registry.suse.com/suse/sle-micro/base-5.5:2.0.2-5.5.9",
128-
"displayName": "SLE Micro Base 5.5 OS"
129-
}
130-
}
131-
},
13254
{
13355
"metadata": {
13456
"name": "base-v2.0.4"

‎config.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,19 +4,23 @@ watches:
44
displayName: "SLE Micro 5.5"
55
osRepo: registry.suse.com/suse/sle-micro/5.5
66
isoRepo: registry.suse.com/suse/sle-micro-iso/5.5
7+
limit: 3
78
- flavor: "base"
89
fileName: "sle-micro-base-5-5"
910
displayName: "SLE Micro Base 5.5"
1011
osRepo: registry.suse.com/suse/sle-micro/base-5.5
1112
isoRepo: registry.suse.com/suse/sle-micro-iso/base-5.5
13+
limit: 3
1214
- flavor: "kvm"
1315
fileName: "sle-micro-kvm-5-5"
1416
displayName: "SLE Micro KVM 5.5"
1517
osRepo: registry.suse.com/suse/sle-micro/kvm-5.5
1618
isoRepo: "N/A"
19+
limit: -2
1720
- flavor: "rt"
1821
fileName: "sle-micro-rt-5-5"
1922
displayName: "SLE Micro RT 5.5"
2023
osRepo: registry.suse.com/suse/sle-micro/rt-5.5
2124
isoRepo: "N/A"
25+
limit: -2
2226

‎populate_channels.sh

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ while IFS=\= read watch; do
1212
displayName=$(echo "$watch" | yq e '.displayName')
1313
osRepo=$(echo "$watch" | yq e '.osRepo')
1414
isoRepo=$(echo "$watch" | yq e '.isoRepo')
15+
limit=$(echo "$watch" | yq e '.limit')
1516

1617
# Fetch the OS Image tags
1718
osTags=($(skopeo list-tags docker://$osRepo | jq '.Tags[]' | grep -v '.att\|.sig\|latest' | sed 's/"//g'))
@@ -27,6 +28,13 @@ while IFS=\= read watch; do
2728
else
2829
name="${flavor}-v${tag}"
2930
fi
31+
# Reset counter on non-build tags (ex. v1.2.3)
32+
if [[ $tag =~ ^(0|[1-9]\d*)\.(0|[1-9]\d*)\.(0|[1-9]\d*)$ ]]; then
33+
counter=$((limit+1))
34+
elif [[ "$counter" -eq 0 ]]; then
35+
continue
36+
fi
37+
((counter--))
3038
# Fetch image tag
3139
#
3240
# Note that we use the 'org.opencontainers.image.version'
@@ -60,6 +68,13 @@ EOF
6068
else
6169
name="${flavor}-v${tag}"
6270
fi
71+
# Reset counter on non-build tags (ex. v1.2.3)
72+
if [[ $tag =~ ^(0|[1-9]\d*)\.(0|[1-9]\d*)\.(0|[1-9]\d*)$ ]]; then
73+
counter=$((limit+1))
74+
elif [[ "$counter" -eq 0 ]]; then
75+
continue
76+
fi
77+
((counter--))
6378
# Fetch image tag
6479
#
6580
# Note that we use the 'org.opencontainers.image.version'

0 commit comments

Comments
 (0)