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

[Develop] Fix test_proxy integ test #6306

Merged
merged 5 commits into from
Jun 20, 2024

Conversation

hehe7318
Copy link
Contributor

@hehe7318 hehe7318 commented Jun 20, 2024

Description of changes

  • On Jenkins, the HN SG only allow SSH access via port 22 from the Jenkins instance public ip, but the test needs it to also allow Proxy instance IP. That will cause paramiko.ssh_exception.SSHException: No existing session and paramiko.ssh_exception.SSHException: Error reading SSH protocol banner issues.
    • Add AllowedIps: 0.0.0.0/0 in cluster config to fix it
  • Previously, the Proxy Stack delete before Cluster Stack, that will cause Proxy Stack deletion failed.
    • Minor changes on parameter order to fix it.

Tests

  • test_proxy on both local machine and Jenkins pass successfully

References

Checklist

  • Make sure you are pointing to the right branch.
  • If you're creating a patch for a branch other than develop add the branch name as prefix in the PR title (e.g. [release-3.6]).
  • Check all commits' messages are clear, describing what and why vs how.
  • Make sure to have added unit tests or integration tests to cover the new/modified code.
  • Check if documentation is impacted by this change.

Please review the guidelines for contributing and Pull Request Instructions.

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.

@hehe7318 hehe7318 added skip-changelog-update Disables the check that enforces changelog updates in PRs 3.x labels Jun 20, 2024
@hehe7318 hehe7318 requested review from a team as code owners June 20, 2024 20:17
@@ -74,7 +74,7 @@ def get_instance_public_ip(instance_id, region):


@pytest.mark.usefixtures("region", "os", "instance", "scheduler")
def test_proxy(pcluster_config_reader, clusters_factory, proxy_stack_factory, scheduler_commands_factory):
Copy link
Contributor

Choose a reason for hiding this comment

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

Even better, clusters_factory could be between proxy_stack_factory and proxy_stack_factory

Copy link
Contributor Author

Choose a reason for hiding this comment

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

You mean proxy_stack_factory and scheduler_commands_factory, right?
Done!

hanwen-pcluste
hanwen-pcluste previously approved these changes Jun 20, 2024
@hehe7318 hehe7318 enabled auto-merge (squash) June 20, 2024 20:30
@hehe7318 hehe7318 merged commit 978ecf7 into aws:develop Jun 20, 2024
28 checks passed
@@ -4,6 +4,7 @@ HeadNode:
InstanceType: {{ instance }}
Ssh:
KeyName: {{ key_name }}
AllowedIps: 0.0.0.0/0
Copy link
Contributor

Choose a reason for hiding this comment

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

This is too permissive. Can we restrict it?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
3.x skip-changelog-update Disables the check that enforces changelog updates in PRs
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants