Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[testing] tree: promote changes from next at d96411f3f604b05b79efcc072e5d4486530a95fe #2977

Merged
merged 2 commits into from
Apr 22, 2024

Conversation

coreosbot-releng
Copy link

@coreosbot-releng coreosbot-releng commented Apr 21, 2024

@dustymabe dustymabe changed the title [testing] tree: promote changes from testing-devel at 24c939e7a7c069dd20e8d72a2a2541df079f16ce [testing] tree: promote changes from next at d96411f3f604b05b79efcc072e5d4486530a95fe Apr 21, 2024
@coreosbot-releng coreosbot-releng changed the title [testing] tree: promote changes from next at d96411f3f604b05b79efcc072e5d4486530a95fe [testing] tree: promote changes from testing-devel at 0566985301cc7d1c330d02d358099e27e1ccb724 Apr 22, 2024
c4rt0
c4rt0 previously approved these changes Apr 22, 2024
Copy link
Member

@c4rt0 c4rt0 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/lgtm

@c4rt0 c4rt0 enabled auto-merge (rebase) April 22, 2024 15:20
aaradhak
aaradhak previously approved these changes Apr 22, 2024
@jlebon
Copy link
Member

jlebon commented Apr 22, 2024

Wait, no. This is missing the commit to rebase to Fedora 40.

@jlebon jlebon disabled auto-merge April 22, 2024 15:46
Just bump the manifest.yaml here. All the other bumps will come in when
we bump testing-devel to f40 and then promote in the next release.
@jlebon jlebon dismissed stale reviews from aaradhak and c4rt0 via 1a48a9f April 22, 2024 15:53
@jlebon jlebon changed the title [testing] tree: promote changes from testing-devel at 0566985301cc7d1c330d02d358099e27e1ccb724 [testing] tree: promote changes from next at d96411f3f604b05b79efcc072e5d4486530a95fe Apr 22, 2024
@jlebon
Copy link
Member

jlebon commented Apr 22, 2024

Ahhh OK, I see Dusty had done the right thing but then we retriggered the promotion GHA by re-adding the ok-to-promote label.

I've updated this now to promote again from the last next release. Do not remove and re-add the ok-to-promote label! :)

"Check promotion diffs" workflow failure is expected.

The true diff is:

$ git diff d96411f3f604b05b79efcc072e5d4486530a95fe
diff --git a/manifest.yaml b/manifest.yaml
index cced1895..4a558db0 100644
--- a/manifest.yaml
+++ b/manifest.yaml
@@ -1,5 +1,5 @@
 variables:
-  stream: next
+  stream: testing
   prod: true

 releasever: 40

@c4rt0
Copy link
Member

c4rt0 commented Apr 22, 2024

You got me scared there for a second :)

edit: Thanks for keeping an eye on this!

Copy link
Member

@c4rt0 c4rt0 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/lgtm

@jlebon jlebon merged commit e1ce9f2 into coreos:testing Apr 22, 2024
1 of 2 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants