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.

Sign up for GitHub

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

Jump to bottom

Misc CI improvements/fixes #6235

Merged
merged 3 commits into from
Sep 8, 2024
Merged

Misc CI improvements/fixes #6235

merged 3 commits into from
Sep 8, 2024

Conversation

cognifloyd
Copy link
Member

@cognifloyd cognifloyd commented Sep 6, 2024 •
edited
Loading

While debugging some GHA instability, I found 3 minor things to improve or cleanup:

  • clean up tmux usage in tools/launchdev.sh
  • Make sure eventlet patching happens early when running st2-register-content
  • drop eventlet bug workaround as the bug was fixed upstream several releases ago.

@cognifloyd
Fix CI: Handle newer tmux output of tmux ls
7bc0c9b 
tmux ls now has `:` in it. So, optionally allow the `:` to support
older tmux (without `:`) and newer tmux (with `:`).

Also drop spurious error when tmux has no sessions.
@cognifloyd
Add eventlet monkey_patch in st2-register-content
834d260
@cognifloyd
Drop workaround for eventlet bug (resolved upstream)
5ca94c3 
see: eventlet/eventlet#692
@cognifloyd cognifloyd added this to the 3.9.0 milestone Sep 6, 2024
@cognifloyd cognifloyd requested review from nzlosh, amanda11 and a team September 6, 2024 14:07
@cognifloyd cognifloyd self-assigned this Sep 6, 2024
@pull-request-size pull-request-size bot added the size/S PR that changes 10-29 lines. Very easy to review. label Sep 6, 2024
@cognifloyd cognifloyd enabled auto-merge September 6, 2024 14:07
nzlosh
nzlosh approved these changes Sep 6, 2024
View reviewed changes
Copy link
Contributor

@nzlosh nzlosh left a comment

Choose a reason for hiding this comment

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

Good find!

@cognifloyd cognifloyd requested review from a team, winem and rush-skills September 6, 2024 15:09
@cognifloyd
Copy link
Member Author

The CI failure is in a job that is not required to pass by branch protection rules. It is caused by an update to st2-auth-ldap@master. I could regenerate the lockfile, but I will save that for a PR that needs to regenerate the lockfile for some other reason.

mamercad
mamercad approved these changes Sep 8, 2024
View reviewed changes
Copy link
Contributor

@mamercad mamercad left a comment

Choose a reason for hiding this comment

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

🚢

@cognifloyd cognifloyd merged commit b905ea2 into master Sep 8, 2024
33 of 34 checks passed
@cognifloyd cognifloyd deleted the misc-ci-fixes branch September 8, 2024 13:23
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@mamercad mamercad mamercad approved these changes

@nzlosh nzlosh nzlosh approved these changes

@amanda11 amanda11 Awaiting requested review from amanda11

@winem winem Awaiting requested review from winem

@rush-skills rush-skills Awaiting requested review from rush-skills

Assignees

@cognifloyd cognifloyd

Labels
external dependency infrastructure: ci/cd no changelog No Changelog.rst needed for this PR size/S PR that changes 10-29 lines. Very easy to review.
Projects
None yet
Milestone
3.9.0
Development

Successfully merging this pull request may close these issues.
3 participants
@cognifloyd @nzlosh @mamercad