diff --git a/blocked-edges/4.3.1.yaml b/blocked-edges/4.3.1.yaml deleted file mode 100644 index 6b2ede705..000000000 --- a/blocked-edges/4.3.1.yaml +++ /dev/null @@ -1,3 +0,0 @@ -to: 4.3.1 -from: 4\.2\.18 -# 4.2.18 is baked into 4.3.1 as a recommended update source, but we don't have a 4.2.18 release yet. Block until we have a release, to avoid accidentally adding 4.2.18 -> 4.3.1 to channels if 4.2.18 ends up being a dud. diff --git a/channels/candidate-4.2.yaml b/channels/candidate-4.2.yaml index cb841f586..3cff91128 100644 --- a/channels/candidate-4.2.yaml +++ b/channels/candidate-4.2.yaml @@ -36,5 +36,6 @@ versions: - 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 diff --git a/channels/candidate-4.3.yaml b/channels/candidate-4.3.yaml index 463134584..f5fad4e9f 100644 --- a/channels/candidate-4.3.yaml +++ b/channels/candidate-4.3.yaml @@ -2,6 +2,7 @@ name: candidate-4.3 versions: # until s390 is released on 4.3 we may not want to include it in 4.3 channels - 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.3.0-rc.0 diff --git a/channels/fast-4.2.yaml b/channels/fast-4.2.yaml index b376d664b..d1ae70f29 100644 --- a/channels/fast-4.2.yaml +++ b/channels/fast-4.2.yaml @@ -18,7 +18,7 @@ versions: - 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 +# - 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 @@ -31,3 +31,5 @@ versions: # not 4.2.14-s390x because of https://bugzilla.redhat.com/show_bug.cgi?id=1789260 # 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 diff --git a/channels/fast-4.3.yaml b/channels/fast-4.3.yaml index 7c4dfeca7..6c5eb389a 100644 --- a/channels/fast-4.3.yaml +++ b/channels/fast-4.3.yaml @@ -2,5 +2,7 @@ name: fast-4.3 versions: # until s390 is released on 4.3 we may not want to include it in 4.3 channels - 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.3.0 - 4.3.1 diff --git a/channels/stable-4.2.yaml b/channels/stable-4.2.yaml index 22f741424..2587f7601 100644 --- a/channels/stable-4.2.yaml +++ b/channels/stable-4.2.yaml @@ -15,7 +15,7 @@ versions: - 4.2.8 - 4.2.9 - 4.2.10 - # - 4.2.11 failed to run tests, we never officially released it, but we accidentally +# - 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 @@ -28,3 +28,4 @@ versions: # not 4.2.14-s390x because of https://bugzilla.redhat.com/show_bug.cgi?id=1789260 # 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 diff --git a/channels/stable-4.3.yaml b/channels/stable-4.3.yaml index 896d4ebff..0b4fdf134 100644 --- a/channels/stable-4.3.yaml +++ b/channels/stable-4.3.yaml @@ -1,5 +1,6 @@ name: stable-4.3 versions: # until s390 is released on 4.3 we may not want to include it in 4.3 channels +# not 4.2.17 because we had a long quiet time after 4.2.16 with no releases - 4.3.0 - 4.3.1