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

[JENKINS-72799] Apply SlaveComputer.decorate also to openLogFile #9009

Merged

Conversation

jglick
Copy link
Member

@jglick jglick commented Mar 1, 2024

See JENKINS-72799. Otherwise the decoration is applied to SlaveComputer.taskListener, used for many purposes, but not log messages printed from DefaultJnlpSlaveReceiver on inbound agents.

Amending 4c43671 and ultimately 0ddb0c5.

Testing done

Integration test in jenkinsci/support-core-plugin#517: SlaveLaunchLogsTest.onlineInboundAgent.

Proposed changelog entries

  • Customization of agent log files did not work for inbound agents.

Before the changes are marked as ready-for-merge:

Maintainer checklist

Edit tasklist title
Beta Give feedback Tasklist Maintainer checklist, more options

Delete tasklist

Delete tasklist block?
Are you sure? All relationships in this tasklist will be removed.
  1. There are at least two (2) approvals for the pull request and no outstanding requests for change.
    Options
  2. Conversations in the pull request are over, or it is explicit that a reviewer is not blocking the change.
    Options
  3. Changelog entries in the pull request title and/or Proposed changelog entries are accurate, human-readable, and in the imperative mood.
    Options
  4. Proper changelog labels are set so that the changelog can be generated automatically.
    Options
  5. If the change needs additional upgrade steps from users, the upgrade-guide-needed label is set and there is a Proposed upgrade guidelines section in the pull request title (see example).
    Options
  6. If it would make sense to backport the change to LTS, a Jira issue must exist, be a Bug or Improvement, and be labeled as lts-candidate to be considered (see query).
    Options

Copy link
Member

@timja timja left a comment

Choose a reason for hiding this comment

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

/label ready-for-merge


This PR is now ready for merge, after ~24 hours, we will merge it if there's no negative feedback.

Thanks!

@comment-ops-bot comment-ops-bot bot added the ready-for-merge The PR is ready to go, and it will be merged soon if there is no negative feedback label Mar 2, 2024
@NotMyFault NotMyFault added the bug For changelog: Minor bug. Will be listed after features label Mar 4, 2024
@NotMyFault NotMyFault merged commit c7ccbfd into jenkinsci:master Mar 4, 2024
16 checks passed
@jglick jglick deleted the SlaveComputer.decorate-JENKINS-72799 branch March 4, 2024 15:31
jglick added a commit to jglick/support-core-plugin that referenced this pull request Mar 5, 2024
jglick added a commit to jenkinsci/support-core-plugin that referenced this pull request Mar 18, 2024
* agent-logs sketch

* `SlaveLaunchLogsTest.onlineInboundAgent`

* `SlaveLaunchLogsTest.offlineAgent`

* Javadoc

* Exploring `SlaveLaunchLogs` behavior

* More `SlaveLaunchLogsTest`

* `SlaveLaunchLogsTest.passwords`

* Worked out a better `SlaveLaunchLogs`, but depends on patch to `SlaveComputer`

* Need to flush logs also for `deletedAgent`

* Reverting changes extracted to #518

* Setting a timestamp, switching category

* RC

* No need to assert that `SupportTestUtils.invokeComponentToString` is non-null

* `Security2186Test` failure caused by renamed bundle entry

* File handle leak caught by Windows tests

* Better handling of rotated logs

* More robust way to wait for `Connection terminated` message

* `SlaveLaunchLogsTest.offlineAgent` still flaky on Windows

* jenkinsci/jenkins#9009 released

* Working around lack of JENKINS-72799 to avoid requiring a weekly core

* SpotBugs

---------

Co-authored-by: Allan Burdajewicz <aburdajewicz@cloudbees.com>
krisstern pushed a commit to krisstern/jenkins that referenced this pull request Apr 2, 2024
krisstern pushed a commit to krisstern/jenkins that referenced this pull request Apr 4, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug For changelog: Minor bug. Will be listed after features ready-for-merge The PR is ready to go, and it will be merged soon if there is no negative feedback
Projects
None yet
3 participants