diff --git a/channels/candidate-4.3.yaml b/channels/candidate-4.3.yaml index a75b10d80..99d75a1b0 100644 --- a/channels/candidate-4.3.yaml +++ b/channels/candidate-4.3.yaml @@ -1,90 +1,52 @@ 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.2.28 +- 4.2.27+amd64 +- 4.2.26+amd64 +- 4.2.25+amd64 +- 4.2.23+amd64 +- 4.2.22+amd64 +- 4.2.21+amd64 +- 4.2.20+amd64 +- 4.2.19+amd64 +- 4.2.18+amd64 +- 4.2.16+amd64 +- 4.3.0 +- 4.3.0-0.hotfix-2020-09-30-133631 - 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 - - 4.3.33 - - 4.3.35 - - 4.3.38 - -- 4.3.0-0.hotfix-2020-09-30-133631 - - 4.3.40 diff --git a/channels/candidate-4.4.yaml b/channels/candidate-4.4.yaml index fd26399a3..1bb178a3b 100644 --- a/channels/candidate-4.4.yaml +++ b/channels/candidate-4.4.yaml @@ -1,131 +1,71 @@ name: candidate-4.4 versions: - 4.3.40 - - 4.3.38 - - 4.3.35 - - 4.3.33 - - 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.3.12 +- 4.3.11 +- 4.3.10 +- 4.3.9 +- 4.3.8 +- 4.3.5 +- 4.4.0 - 4.4.0-rc.0 - 4.4.0-rc.1 +- 4.4.0-rc.10 +- 4.4.0-rc.11 +- 4.4.0-rc.12 +- 4.4.0-rc.13 - 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 - - 4.4.17 - - 4.4.18 - - 4.4.19 - - 4.4.20 - - 4.4.21 - - 4.4.22 - - 4.4.23 - - 4.4.24 - - 4.4.25 - - 4.4.26 - - 4.4.27 - - 4.4.28 - - 4.4.29 - 4.4.30 diff --git a/channels/candidate-4.5.yaml b/channels/candidate-4.5.yaml index f943061ab..3e3660706 100644 --- a/channels/candidate-4.5.yaml +++ b/channels/candidate-4.5.yaml @@ -1,103 +1,54 @@ name: candidate-4.5 versions: - 4.4.30 - - 4.4.29 - - 4.4.28 - - 4.4.27 - - 4.4.26 - - 4.4.25 - - 4.4.24 - - 4.4.23 - - 4.4.22 - - 4.4.21 - - 4.4.20 - - 4.4.19 - - 4.4.18 - - 4.4.17 - - 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 +- 4.5.0-0.hotfix-2020-08-24-185832 - 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.1-rc.0 - 4.5.2 - - 4.5.3 - - 4.5.4 - - 4.5.5 - - 4.5.6 - - 4.5.7 - -- 4.5.0-0.hotfix-2020-08-24-185832 - - 4.5.8 - - 4.5.9 - - 4.5.10 - - 4.5.11 - - 4.5.12 - - 4.5.13 - - 4.5.14 - - 4.5.15 - - 4.5.16 - - 4.5.17 - 4.5.18 diff --git a/channels/candidate-4.6.yaml b/channels/candidate-4.6.yaml index daa8b9c16..eeb421c44 100644 --- a/channels/candidate-4.6.yaml +++ b/channels/candidate-4.6.yaml @@ -3,58 +3,38 @@ versions: - 4.5.18 - 4.5.17 - - 4.5.16 - - 4.5.15 - - 4.5.14 - - 4.5.13 - - 4.5.12 - - 4.5.11 - - 4.5.10 - - 4.5.9 - - 4.5.8 - - 4.5.7 - - 4.5.6 +- 4.5.5 +- 4.5.4 +- 4.5.3 +- 4.5.2 +- 4.5.1 +- 4.5.0-0.hotfix-2020-08-24-185832 - +- 4.6.0 - 4.6.0-fc.0 - - 4.6.0-fc.1 - - 4.6.0-fc.2 - - 4.6.0-fc.3 - - 4.6.0-fc.4 - - 4.6.0-fc.5 - - 4.6.0-fc.7 - - 4.6.0-fc.8 - - 4.6.0-rc.0 - - 4.6.0-rc.1 - - 4.6.0-rc.2 - - 4.6.0-rc.3 - - 4.6.0-rc.4 - -- 4.6.0 - - 4.6.1 - 4.6.2 diff --git a/channels/fast-4.3.yaml b/channels/fast-4.3.yaml index bdee05777..46bca4d11 100644 --- a/channels/fast-4.3.yaml +++ b/channels/fast-4.3.yaml @@ -1,74 +1,43 @@ name: fast-4.3 versions: - 4.2.36 - - 4.2.34 - - 4.2.33 - -# 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+amd64 - 4.2.29+amd64 +- 4.2.28+amd64 +- 4.2.27+amd64 +- 4.2.26+amd64 +- 4.2.25+amd64 +- 4.2.23+amd64 +- 4.2.22+amd64 +- 4.2.21+amd64 +- 4.2.20+amd64 +- 4.2.19+amd64 +- 4.2.18+amd64 +- 4.2.16+amd64 - 4.3.0 +- 4.3.0-0.hotfix-2020-09-30-133631 - 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 -# No 4.3.11 because of build issues: https://bugzilla.redhat.com/show_bug.cgi?id=1823378 - 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 -# No 4.3.15 because it did not clear DefaultSecurityContextConstraints_Mutated: https://bugzilla.redhat.com/show_bug.cgi?id=1827337 -# No 4.3.16 because ovn container image had unsigned RPMs -# No 4.3.17 because it lacked OCICNI context for robust recovery from network I/O timeouts: https://bugzilla.redhat.com/show_bug.cgi?id=1828104 - - 4.3.18 - - 4.3.19 - - 4.3.21 - - 4.3.22 - - 4.3.23 - - 4.3.25 - - 4.3.26 - - 4.3.27 - - 4.3.28 - - 4.3.29 - - 4.3.31 - - 4.3.33 - - 4.3.35 - - 4.3.38 - -- 4.3.0-0.hotfix-2020-09-30-133631 - - 4.3.40 diff --git a/channels/fast-4.4.yaml b/channels/fast-4.4.yaml index 6bf8de978..d2fe31b57 100644 --- a/channels/fast-4.4.yaml +++ b/channels/fast-4.4.yaml @@ -1,82 +1,41 @@ name: fast-4.4 versions: - 4.3.40 - - 4.3.38 - - 4.3.35 - - 4.3.33 - - 4.3.31 - - 4.3.29 - - 4.3.28 - - 4.3.27 - - 4.3.26 - - 4.3.25 - - 4.3.23 - - 4.3.22 - - 4.3.21 - - 4.3.19 - -- 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 -# No 4.3.15 because it did not clear DefaultSecurityContextConstraints_Mutated: https://bugzilla.redhat.com/show_bug.cgi?id=1827337 -# No 4.3.16 because ovn container image had unsigned RPMs -# No 4.3.17 because it lacked OCICNI context for robust recovery from network I/O timeouts: https://bugzilla.redhat.com/show_bug.cgi?id=1828104 - - 4.3.18 - +- 4.3.13 +- 4.3.12 - 4.4.3 - - 4.4.4 - - 4.4.5 - - 4.4.6 - - 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 - - 4.4.17 - - 4.4.18 - - 4.4.19 - - 4.4.20 - - 4.4.21 - - 4.4.23 - - 4.4.26 - - 4.4.27 - - 4.4.29 diff --git a/channels/fast-4.5.yaml b/channels/fast-4.5.yaml index e4b4eebd4..c76599c42 100644 --- a/channels/fast-4.5.yaml +++ b/channels/fast-4.5.yaml @@ -1,65 +1,35 @@ name: fast-4.5 versions: - 4.4.29 - - 4.4.27 - - 4.4.26 - - 4.4.23 - - 4.4.21 - - 4.4.20 - - 4.4.19 - - 4.4.18 - - 4.4.17 - - 4.4.16 - - 4.4.15 - - 4.4.14 - - 4.4.13 - -- 4.4.10 - -- 4.4.11 - - 4.4.12 - +- 4.4.11 +- 4.4.10 +- 4.5.0-0.hotfix-2020-08-24-185832 - 4.5.1 - - 4.5.2 - - 4.5.3 - - 4.5.4 - - 4.5.5 - - 4.5.6 - - 4.5.7 - -- 4.5.0-0.hotfix-2020-08-24-185832 - - 4.5.8 - - 4.5.9 - - 4.5.11 - - 4.5.13 - - 4.5.14 - - 4.5.15 - - 4.5.16 - 4.5.17 diff --git a/channels/fast-4.6.yaml b/channels/fast-4.6.yaml index ad844b993..80dc417b7 100644 --- a/channels/fast-4.6.yaml +++ b/channels/fast-4.6.yaml @@ -1,7 +1,22 @@ name: fast-4.6 versions: - 4.5.17 - - 4.5.16 +- 4.5.15 +- 4.5.14 +- 4.5.13 +- 4.5.12 +- 4.5.11 +- 4.5.10 +- 4.5.9 +- 4.5.8 +- 4.5.7 +- 4.5.6 +- 4.5.5 +- 4.5.4 +- 4.5.3 +- 4.5.2 +- 4.5.1 +- 4.5.0-0.hotfix-2020-08-24-185832 - 4.6.1 diff --git a/channels/stable-4.3.yaml b/channels/stable-4.3.yaml index b21445692..c3eeb557e 100644 --- a/channels/stable-4.3.yaml +++ b/channels/stable-4.3.yaml @@ -2,71 +2,42 @@ name: stable-4.3 versions: - 4.2.36 - 4.2.34 - - 4.2.33 - -- 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+amd64 - 4.2.29+amd64 -# 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 -# not 4.2.17 because we had a long quiet time after 4.2.16 with no releases -# 4.2.21 edge into stable-4.3 pending further review +- 4.2.28+amd64 +- 4.2.27+amd64 +- 4.2.26+amd64 +- 4.2.25+amd64 +- 4.2.23+amd64 +- 4.2.22+amd64 +- 4.2.21+amd64 +- 4.2.20+amd64 +- 4.2.19+amd64 +- 4.2.18+amd64 +- 4.2.16+amd64 - 4.3.0 +- 4.3.0-0.hotfix-2020-09-30-133631 - 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 -# No 4.3.11 because of build issues: https://bugzilla.redhat.com/show_bug.cgi?id=1823378 - 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 -# No 4.3.15 because it did not clear DefaultSecurityContextConstraints_Mutated: https://bugzilla.redhat.com/show_bug.cgi?id=1827337 -# No 4.3.16 because ovn container image had unsigned RPMs -# No 4.3.17 because it lacked OCICNI context for robust recovery from network I/O timeouts: https://bugzilla.redhat.com/show_bug.cgi?id=1828104 - - 4.3.18 - - 4.3.19 - - 4.3.21 - 4.3.22 - - 4.3.23 - - 4.3.25 - 4.3.26 - - 4.3.27 - - 4.3.28 - 4.3.29 - - 4.3.31 - - 4.3.33 - - 4.3.35 - - 4.3.38 - -- 4.3.0-0.hotfix-2020-09-30-133631 - - 4.3.40 diff --git a/channels/stable-4.4.yaml b/channels/stable-4.4.yaml index 2314dbc51..ba33da504 100644 --- a/channels/stable-4.4.yaml +++ b/channels/stable-4.4.yaml @@ -1,72 +1,42 @@ name: stable-4.4 versions: - 4.3.40 - - 4.3.38 - - 4.3.35 - - 4.3.33 - - 4.3.31 - - 4.3.29 - - 4.3.28 - - 4.3.27 - -- 4.3.25 - 4.3.26 - +- 4.3.25 - 4.3.23 - -- 4.3.21 - 4.3.22 - +- 4.3.21 - 4.3.19 - -- 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 -# No 4.3.15 because it did not clear DefaultSecurityContextConstraints_Mutated: https://bugzilla.redhat.com/show_bug.cgi?id=1827337 -# No 4.3.16 because ovn container image had unsigned RPMs -# No 4.3.17 because it lacked OCICNI context for robust recovery from network I/O timeouts: https://bugzilla.redhat.com/show_bug.cgi?id=1828104 - 4.3.18 - +- 4.3.13 +- 4.3.12 - 4.4.3 - 4.4.4 - - 4.4.5 - 4.4.6 - - 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 - - 4.4.17 - 4.4.18 - - 4.4.19 - 4.4.20 - - 4.4.21 - - 4.4.23 - - 4.4.26 - - 4.4.27 - 4.4.29 diff --git a/channels/stable-4.5.yaml b/channels/stable-4.5.yaml index 315e2959c..73c0cfd6a 100644 --- a/channels/stable-4.5.yaml +++ b/channels/stable-4.5.yaml @@ -3,60 +3,32 @@ versions: - 4.4.29 - 4.4.27 - - 4.4.26 - - 4.4.23 - - 4.4.21 - - 4.4.20 - - 4.4.19 - - 4.4.18 - - 4.4.17 - - 4.4.16 - - - 4.4.15 - - 4.4.14 - - 4.4.13 - -- 4.4.10 - -- 4.4.11 - - 4.4.12 - +- 4.4.11 +- 4.4.10 +- 4.5.0-0.hotfix-2020-08-24-185832 - 4.5.1 - - 4.5.2 - - 4.5.3 - - 4.5.4 - - 4.5.5 - 4.5.6 - -- 4.5.0-0.hotfix-2020-08-24-185832 - 4.5.7 - - 4.5.8 - - 4.5.9 - - 4.5.11 - - 4.5.13 - - 4.5.14 - - 4.5.15 - - 4.5.16 diff --git a/channels/stable-4.6.yaml b/channels/stable-4.6.yaml index 638046122..8e8baf126 100644 --- a/channels/stable-4.6.yaml +++ b/channels/stable-4.6.yaml @@ -1,4 +1,3 @@ name: stable-4.6 versions: - - 4.6.1