Skip to content

Conversation

@gbhat618
Copy link
Contributor

@gbhat618 gbhat618 commented Mar 13, 2025

See JENKINS-75409


This PR adds an integration test for remoting -noCertificateCheck and -cert.
It is being added in the context of fixing - upstream remoting issue jenkinsci/remoting#786

Testing done

3 Tests (webSocketNoCertificateCheck, webSocketWithCertByValue, tcpWithCertByValue) are is expected to fail until the upstream remoting incremental build referred. Then tests are expected to succeed.

  • failure is correctly simulated for now ✅ (build 6)
  • tests are passing after using remoting incremental version (build 8) ✅
  • EDIT: The upstream remoting change has been merged, and the new release is now reflected in Jenkins' pom.xml.

Proposed changelog entries

  • Adding an integration test for inbound agent when Jenkins running with https.

Proposed changelog category

/label skip-changelog

Proposed upgrade guidelines

N/A

Submitter checklist

  • The Jira issue, if it exists, is well-described.
  • The changelog entries and upgrade guidelines are appropriate for the audience affected by the change (users or developers, depending on the change) and are in the imperative mood (see examples). Fill in the Proposed upgrade guidelines section only if there are breaking changes or changes that may require extra steps from users during upgrade.
  • There is automated testing or an explanation as to why this change has no tests.
  • New public classes, fields, and methods are annotated with @Restricted or have @since TODO Javadocs, as appropriate.
  • New deprecations are annotated with @Deprecated(since = "TODO") or @Deprecated(forRemoval = true, since = "TODO"), if applicable.
  • New or substantially changed JavaScript is not defined inline and does not call eval to ease future introduction of Content Security Policy (CSP) directives (see documentation).
  • For dependency updates, there are links to external changelogs and, if possible, full differentials.
  • For new APIs and extension points, there is a link to at least one consumer.

Desired reviewers

@jglick , @Vlatombe

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

Maintainer checklist

  • There are at least two (2) approvals for the pull request and no outstanding requests for change.
  • Conversations in the pull request are over, or it is explicit that a reviewer is not blocking the change.
  • Changelog entries in the pull request title and/or Proposed changelog entries are accurate, human-readable, and in the imperative mood.
  • Proper changelog labels are set so that the changelog can be generated automatically.
  • 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).
  • 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).

@welcome
Copy link

welcome bot commented Mar 13, 2025

Yay, your first pull request towards Jenkins core was created successfully! Thank you so much!

A contributor will provide feedback soon. Meanwhile, you can join the chats and community forums to connect with other Jenkins users, developers, and maintainers.

@comment-ops-bot comment-ops-bot bot added the skip-changelog Should not be shown in the changelog label Mar 14, 2025
@github-actions github-actions bot added the unresolved-merge-conflict There is a merge conflict with the target branch. label Mar 18, 2025
@github-actions
Copy link
Contributor

Please take a moment and address the merge conflicts of your pull request. Thanks!

@github-actions github-actions bot removed the unresolved-merge-conflict There is a merge conflict with the target branch. label Mar 18, 2025
@gbhat618
Copy link
Contributor Author

not sure if DisconnectNodeCommandTest#disconnectNodeShouldSucceedWithCause is a flake, it failed on linux-java17 (but passed in java21). In my local works for both java 17 and java 21.

Retriggered the CI by sending empty commit.

@gbhat618
Copy link
Contributor Author

gbhat618 commented Mar 18, 2025

failed again on JDK17 (passes on JDK21); checking 👀
DisconnectNodeCommandTest#disconnectNodeManyShouldSucceed

Previously failed was,
DisconnectNodeCommandTest#disconnectNodeShouldSucceedWithCause

@gbhat618
Copy link
Contributor Author

both case assertions are same, seems like flake tests - as each of these succeeded once and failed again.

java.lang.AssertionError: 

Expected: an instance of hudson.slaves.OfflineCause$ByCLI
     but: <Connection was broken> is a hudson.slaves.OfflineCause$ChannelTermination

It seems like the CLI's disconnect command terminating agent - may not always gracefully terminate the agent (?) and Connection was broken gets recorded as the disconnect cause 🤔

@gbhat618
Copy link
Contributor Author

for the flake fix, there was a PR merged #10307

@github-actions github-actions bot added the unresolved-merge-conflict There is a merge conflict with the target branch. label Mar 19, 2025
@github-actions
Copy link
Contributor

Please take a moment and address the merge conflicts of your pull request. Thanks!

@gbhat618
Copy link
Contributor Author

Noted about the flakey tests in https://issues.jenkins.io/browse/JENKINS-75456 will work on that first, and then come back to this task.

@gbhat618
Copy link
Contributor Author

Deflaking tests PR: #10425

@github-actions github-actions bot removed the unresolved-merge-conflict There is a merge conflict with the target branch. label Mar 21, 2025
@github-actions github-actions bot added the unresolved-merge-conflict There is a merge conflict with the target branch. label Mar 22, 2025
@github-actions
Copy link
Contributor

Please take a moment and address the merge conflicts of your pull request. Thanks!

@gbhat618
Copy link
Contributor Author

Please take a moment and address the merge conflicts of your pull request. Thanks!

will wait #10455 to merge as that contains the upstream changes required

@github-actions github-actions bot removed the unresolved-merge-conflict There is a merge conflict with the target branch. label Mar 24, 2025
@gbhat618 gbhat618 marked this pull request as ready for review March 25, 2025 03:49
@gbhat618
Copy link
Contributor Author

This PR is ready

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.

LGTM

@timja timja requested a review from jglick March 25, 2025 11:48
@krisstern
Copy link
Member

/label ready-for-merge

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

@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 25, 2025
Copy link

@A1exKH A1exKH left a comment

Choose a reason for hiding this comment

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

LGTM.

@krisstern krisstern merged commit 17c7de0 into jenkinsci:master Apr 2, 2025
17 checks passed
@gbhat618 gbhat618 deleted the agent-custom-ssl-cert-cli-arg-test branch April 2, 2025 16:06
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

ready-for-merge The PR is ready to go, and it will be merged soon if there is no negative feedback skip-changelog Should not be shown in the changelog tests This PR adds/removes/updates test cases

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants