openshift · wking · Aug 11, 2020
diff --git a/channels/candidate-4.2.yaml b/channels/candidate-4.2.yaml
@@ -13,60 +13,41 @@ versions:
 - 4.1.29
 - 4.1.30
 - 4.1.31
-# no 4.1.32 because we didn't cut a release in the week after 4.1.31
-# no 4.1.33 because we didn't cut a release in the week after 4.1.32
 - 4.1.34
-# no 4.1.35 because we didn't cut a release in the week after 4.1.34
-# no 4.1.36 because we didn't cut a release in the week after 4.1.34
 - 4.1.37
 - 4.1.38
 - 4.1.41
 - 4.2.0-rc.5
 - 4.2.0
 - 4.2.1
 - 4.2.2
-# no 4.2.3 because it was rolled into 4.2.4
 - 4.2.4
-# no 4.2.5 because it was cut missing some intended update sources
-# no 4.2.6 because it pulled in CI-built images due to due to release job modification for multi-arch
 - 4.2.7
 - 4.2.8
 - 4.2.9
 - 4.2.10
 - 4.2.10-s390x
-# - 4.2.11 failed to run tests, we never officially released it, but we accidentally
-# put it in a channel! (same for s390x)   Now we shouldn't pull it, just in case
-# someone is on it
 - 4.2.11
 - 4.2.11-s390x
 - 4.2.12
 - 4.2.12-s390x
 - 4.2.13
 - 4.2.13-s390x
 - 4.2.14
-# not 4.2.15 because 4.2.16 was built with the same errata URI
 - 4.2.16
-# not 4.2.17 because we had a long quiet time after 4.2.16 with no releases
 - 4.2.18
 - 4.2.19
 - 4.2.20
 - 4.2.21
 - 4.2.22
 - 4.2.23
-# No 4.2.24 because of the service CA rotation issue: https://bugzilla.redhat.com/show_bug.cgi?id=1810036 https://bugzilla.redhat.com/show_bug.cgi?id=1801573
 - 4.2.25
 - 4.2.26
 - 4.2.27
 - 4.2.28
 - 4.2.29
-
-# 4.2.30 Errata: https://access.redhat.com/errata/RHBA-2020:1547
 - 4.2.30
-
 - 4.2.32
-
 - 4.2.33
-
 - 4.2.34
-
 - 4.2.36
diff --git a/channels/candidate-4.3.yaml b/channels/candidate-4.3.yaml
@@ -1,80 +1,47 @@
 name: candidate-4.3
 versions:
 - 4.2.36
-
 - 4.2.34
-
 - 4.2.33
-
 - 4.2.32
-
-# Allow upgrades from 4.2.30. Errata: https://access.redhat.com/errata/RHBA-2020:1547
 - 4.2.30
-
-# until s390 is released on 4.3 we may not want to include it in 4.3 channels
-# 4.2 -> 4.3 updates occasionally hit RequiredPoolsFailed, fixed in 4.2.18 and rc.0, but not in 4.2.16: https://bugzilla.redhat.com/show_bug.cgi?id=1782152 https://bugzilla.redhat.com/show_bug.cgi?id=1782149
 - 4.2.16+amd64
-# not 4.2.17 because we had a long quiet time after 4.2.16 with no releases
 - 4.2.18+amd64
 - 4.2.19+amd64
 - 4.2.20+amd64
 - 4.2.21+amd64
 - 4.2.22+amd64
 - 4.2.23+amd64
-# No 4.2.24 because of the service CA rotation issue: https://bugzilla.redhat.com/show_bug.cgi?id=1810036 https://bugzilla.redhat.com/show_bug.cgi?id=1801573
 - 4.2.25+amd64
 - 4.2.26+amd64
 - 4.2.27+amd64
 - 4.2.28
 - 4.2.29
 - 4.3.0-rc.0
-# I'm not sure what happened to rc1 and rc2. rc2 was, I think, fine
-# but it never got upgrade tests https://github.com/openshift/cincinnati-graph-data/pull/26
 - 4.3.0-rc.3
 - 4.3.0
 - 4.3.1
 - 4.3.2
 - 4.3.3
-# No 4.3.4 because of https://bugzilla.redhat.com/show_bug.cgi?id=1805726
 - 4.3.5
-# No 4.3.6 because of https://bugzilla.redhat.com/show_bug.cgi?id=1811886
-# No 4.3.7 because of the service CA rotation issue: https://bugzilla.redhat.com/show_bug.cgi?id=1810036 https://bugzilla.redhat.com/show_bug.cgi?id=1801573
 - 4.3.8
 - 4.3.9
 - 4.3.10
 - 4.3.11
 - 4.3.12
 - 4.3.13
-
 - 4.3.14
-
-# 4.3.15 Errata: https://access.redhat.com/errata/RHBA-2020:1529
 - 4.3.15
-
-# No 4.3.16 because ovn container image had unsigned RPMs
-
 - 4.3.17
-
 - 4.3.18
-
 - 4.3.19
-
 - 4.3.21
-
 - 4.3.22
-
 - 4.3.23
-
 - 4.3.24
-
 - 4.3.25
-
 - 4.3.26
-
 - 4.3.27
-
 - 4.3.28
-
 - 4.3.29
-
 - 4.3.31
diff --git a/channels/candidate-4.4.yaml b/channels/candidate-4.4.yaml
@@ -1,95 +1,52 @@
 name: candidate-4.4
 versions:
 - 4.3.31
-
 - 4.3.29
-
 - 4.3.28
-
 - 4.3.27
-
 - 4.3.26
-
 - 4.3.25
-
 - 4.3.24
-
 - 4.3.23
-
 - 4.3.22
-
 - 4.3.21
-
 - 4.3.19
-
 - 4.3.18
-
 - 4.3.17+amd64
-
-# No 4.3.16 because ovn container image had unsigned RPMs
-
-# Allow upgrades from 4.3.15. Errata: https://access.redhat.com/errata/RHBA-2020:1529
 - 4.3.15+amd64
-
 - 4.3.14+amd64
 - 4.3.5
-# No 4.3.6 because of https://bugzilla.redhat.com/show_bug.cgi?id=1811886
-# No 4.3.7 because of the service CA rotation issue: https://bugzilla.redhat.com/show_bug.cgi?id=1810036 https://bugzilla.redhat.com/show_bug.cgi?id=1801573
 - 4.3.8
 - 4.3.9
 - 4.3.10
 - 4.3.11
 - 4.3.12
 - 4.3.13
-# No 4.3.14 because it was missing version which 4.3.14 can be upgraded. It is rebuilt as 4.3.15
 - 4.4.0-rc.0
 - 4.4.0-rc.1
 - 4.4.0-rc.2
 - 4.4.0-rc.4
-# 4.4.0-rc.5 was rejected due to lack of upgrade definitions
 - 4.4.0-rc.6
 - 4.4.0-rc.7
 - 4.4.0-rc.8
 - 4.4.0-rc.9
-
-# 4.4.0-rc.10 Errata: https://access.redhat.com/errata/RHBA-2020:0581
 - 4.4.0-rc.10
-
-# 4.4.0-rc.11 Errata: https://access.redhat.com/errata/RHBA-2020:0581
 - 4.4.0-rc.11
-
 - 4.4.0-rc.12
-
 - 4.4.0-rc.13
-
 - 4.4.0
-
 - 4.4.2
-
 - 4.4.3
-
 - 4.4.4
-
 - 4.4.5
-
 - 4.4.6
-
 - 4.4.7
-
 - 4.4.8
-
 - 4.4.9
-
 - 4.4.10
-
 - 4.4.11
-
 - 4.4.12
-
 - 4.4.13
-
 - 4.4.14
-
 - 4.4.15
-
 - 4.4.16
diff --git a/channels/candidate-4.5.yaml b/channels/candidate-4.5.yaml
@@ -1,47 +1,25 @@
 name: candidate-4.5
 versions: 
 - 4.4.16
-
 - 4.4.15
-
 - 4.4.14
-
 - 4.4.13
-
 - 4.4.12
-
 - 4.4.11
-
 - 4.4.10
-
 - 4.4.9
-
 - 4.4.8
-
 - 4.4.6
-
 - 4.5.0-rc.1
-
 - 4.5.0-rc.2
-
 - 4.5.0-rc.4
-
 - 4.5.0-rc.5
-
 - 4.5.0-rc.6
-
 - 4.5.0-rc.7
-
 - 4.5.0
-
 - 4.5.1-rc.0
-
 - 4.5.1
-
 - 4.5.2
-
 - 4.5.3
-
 - 4.5.4
-
 - 4.5.5
diff --git a/channels/candidate-4.6.yaml b/channels/candidate-4.6.yaml
@@ -1,4 +1,3 @@
 name: candidate-4.6
 versions:
-
 - 4.6.0-fc.0