From 9f94edc3c3be2166d60bea6e8feea001f767a811 Mon Sep 17 00:00:00 2001 From: "W. Trevor King" Date: Wed, 19 Feb 2020 21:18:47 -0800 Subject: [PATCH 1/2] channels: Explain why we skipped 4.2.17 Vikas on 2020-02-10: > 4.2.17 was skipped due to multiple weeks in between I'm not entirely clear on the motivation there, but have added a comment about the skip with an attempt at explaining it to all the channels in which 4.2.17 might have appeared. --- channels/candidate-4.2.yaml | 1 + channels/candidate-4.3.yaml | 1 + channels/fast-4.2.yaml | 3 ++- channels/fast-4.3.yaml | 1 + channels/stable-4.2.yaml | 3 ++- channels/stable-4.3.yaml | 1 + 6 files changed, 8 insertions(+), 2 deletions(-) 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..78d471311 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,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/fast-4.3.yaml b/channels/fast-4.3.yaml index 7c4dfeca7..afe42d52b 100644 --- a/channels/fast-4.3.yaml +++ b/channels/fast-4.3.yaml @@ -2,5 +2,6 @@ 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.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 From c641bbdc471e86611a7cc89f84a8df1c23faae6a Mon Sep 17 00:00:00 2001 From: "W. Trevor King" Date: Wed, 19 Feb 2020 15:23:39 -0800 Subject: [PATCH 2/2] channels/fast-4.2: Promote 4.2.18 (and 4.2.18+amd64 to fast-4.3) The release has been in the candidate analogs since 6ed3a35fa1 (candidate-4.2: add 4.2.18, 2020-02-12, #49), which is plenty of cook time. Also, now that we have a 4.2.18, we can drop the blocked edge from 9c77b39d8b (blocked-edges/4.3.1: Block 4.2.18 -> 4.3.1 until we have a 4.2.18 to consider, 2020-02-06, #43). Would have been nice if that had happened in 6ed3a35fa1, but better late than never ;). --- blocked-edges/4.3.1.yaml | 3 --- channels/fast-4.2.yaml | 1 + channels/fast-4.3.yaml | 1 + 3 files changed, 2 insertions(+), 3 deletions(-) delete mode 100644 blocked-edges/4.3.1.yaml 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/fast-4.2.yaml b/channels/fast-4.2.yaml index 78d471311..d1ae70f29 100644 --- a/channels/fast-4.2.yaml +++ b/channels/fast-4.2.yaml @@ -32,3 +32,4 @@ versions: # 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 afe42d52b..6c5eb389a 100644 --- a/channels/fast-4.3.yaml +++ b/channels/fast-4.3.yaml @@ -3,5 +3,6 @@ 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