Skip to content

Conversation

@LalatenduMohanty
Copy link
Member

As these versions are tombstoned in candidate-4.7 channel but accidentally promoted to fast-4.8 channel in 8da5782

These are the commit id when the versions were the tombstoned: 00045bf, a6629b7, b63be1b, 54accf9

Signed-off-by: Lalatendu Mohanty [email protected]

@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Sep 3, 2021
As these versions are tombstoned in candidate-4.7 channel but accidentally promoted to fast-4.8 channel in 8da5782

These are the commit id when the versions were the tombstoned: 00045bf, a6629b7, b63be1b, 54accf9

Signed-off-by: Lalatendu Mohanty <[email protected]>
@LalatenduMohanty LalatenduMohanty force-pushed the fix_tombstone_edges_in_fast47 branch from f1378a1 to 4c53c7b Compare September 3, 2021 21:01
@wking
Copy link
Member

wking commented Sep 3, 2021

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Sep 3, 2021
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Sep 3, 2021

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: LalatenduMohanty, wking

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Details Needs approval from an approver in each of these files:
  • OWNERS [LalatenduMohanty,wking]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@openshift-merge-robot openshift-merge-robot merged commit da3a33e into openshift:master Sep 3, 2021
wking added a commit to wking/cincinnati-graph-data that referenced this pull request Sep 3, 2021
A few releases slipped into fast-4.8, despite being tombzoned in
candidate releases, 4c53c7b (Blocking all the incoming edges to
4.7.10, 4.7.14, 4.7.15, 4.7.20, 2021-09-03, openshift#1035).  Because I'd been
comparing with fast-4.7 when developing the 4.7.28 blocker regexp,
2a70cf5 (blocked-edges: Block some edges into 4.7.24, 4.7.28,
4.8.5, and 4.8.9 on CRI-O /run leak, 2021-08-31, openshift#1022), those zombie
releases still had edges:

  $ join <(oc adm release info -o json quay.io/openshift-release-dev/ocp-release:4.7.28-x86_64 | jq -r '.metadata.previous[] | select(test("^(4[.]6[.].*|4[.]7[.][0-9]|4[.]7[.]1[1236789]|4[.]7[.]2[123])$") | not)' | sort) <(curl -s 'https://api.openshift.com/api/upgrades_info/v1/graph?channel=fast-4.8&arch=amd64' | jq -r '.nodes[].version' | sort)
  4.7.10
  4.7.14
  4.7.15
  4.7.20
  4.7.24

With this commit, I'm extending the regular expression to exclude
them, except for 4.7.24 which is already vulnerable to the bugs
impacting 4.7.28:

  $ join <(oc adm release info -o json quay.io/openshift-release-dev/ocp-release:4.7.28-x86_64 | jq -r '.metadata.previous[] | select(test("^(4[.]6[.].*|4[.]7[.][0-9]|4[.]7[.]1[0-9]|4[.]7[.]2[0123])$") | not)' | sort) <(curl -s 'https://api.openshift.com/api/upgrades_info/v1/graph?channel=fast-4.8&arch=amd64' | jq -r '.nodes[].version' | sort)
  4.7.24
wking added a commit to wking/cincinnati-graph-data that referenced this pull request Sep 3, 2021
When we have a GitHub token, we checkout a branch and create a pull
request for each promotion.  When we don't have a token, we used to
just log the changes that needed to happen.  With this commit, a
token-less call will now edit the local files to perform all
appropriate promotions.  That allows this script (which understands
about tombstones and filters and other promotion criteria) to be used
to backfill channels when we expand filters (e.g. allowing 4.(y-1) in
fast-4.y after 4.y GAs, or allowing 4.(y-1) in stable-4.y after we
feel comfortable with the fast behavior.  That should make things like
8da5782 (4.8 GA -- Fill in 4.7.z into fast-4.8, 2021-07-26, openshift#947)'s
accidental promotion of the tombstoned 4.7.10 and similar less likely.
More on that in 4c53c7b (Blocking all the incoming edges to 4.7.10,
4.7.14, 4.7.15, 4.7.20, 2021-09-03, openshift#1035).

Drop the old backfill script from 2a02325 (hack/backfill: Add a
backfilling script, 2020-11-12, openshift#549), now that this new functionality
makes it obsolete.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

approved Indicates a PR has been approved by an approver from all required OWNERS files. lgtm Indicates that a PR is ready to be merged.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants