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

test: wait longer after repo server restarted to avoid errors on s390x #12839

Merged
merged 1 commit into from
Mar 16, 2023

Conversation

samding01
Copy link
Contributor

Add a wait time 10 seconds after repo server is restarted to avoid connection refused error on s380x
in the following 7 cases:

TestCustomToolWithGitCreds
TestCustomToolWithGitCredsTemplate
TestHelmRepo
TestHelmWithDependencies
TestHelmRepoDiffLocal
TestCanAddAppFromClientCertRepoWithCredCfg 
TestCanAccessSSHRepo    
  • Either (a) I've created an enhancement proposal and discussed it with the community, (b) this is a bug fix, or (c) this does not need to be in the release notes.
  • The title of the PR states what changed and the related issues number (used for the release note).
  • I've included "Closes [ISSUE #]" or "Fixes [ISSUE #]" in the description to automatically close the associated issue.
  • I've updated both the CLI and UI to expose my feature, or I plan to submit a second PR with them.
  • Does this PR require documentation updates?
  • I've updated documentation as required by this PR.
  • Optional. My organization is added to USERS.md.
  • [ X] I have signed off all my commits as required by DCO
  • I have written unit and/or e2e tests for my change. PRs without these are unlikely to be merged.
  • My build is green (troubleshooting builds).

@@ -811,6 +811,8 @@ func RestartRepoServer() {
}
FailOnErr(Run("", "kubectl", "rollout", "restart", "deployment", workload))
FailOnErr(Run("", "kubectl", "rollout", "status", "deployment", workload))
Copy link
Member

Choose a reason for hiding this comment

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

The rollout status should already wait until a workload is available. I think we should really avoid using introducing newSleep calls with a fixed time length.

Why is this only needed on s390x?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

See http://pastebin.test.redhat.com/1094074 for failed cases log, on s390x the rollout status does not wait enough longer, and causes the follow calling to argocd repo server failed

@jannfis
Copy link
Member

jannfis commented Mar 16, 2023

/cherry-pick release-2.4

@jannfis
Copy link
Member

jannfis commented Mar 16, 2023

/cherry-pick release-2.5

@jannfis
Copy link
Member

jannfis commented Mar 16, 2023

/cherry-pick release-2.6

Copy link
Member

@jannfis jannfis left a comment

Choose a reason for hiding this comment

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

LGTM

@jannfis jannfis changed the title fix: wait longer after repo server restarted to avoid errors on s390x test: wait longer after repo server restarted to avoid errors on s390x Mar 16, 2023
@jannfis jannfis merged commit fa18cb8 into argoproj:master Mar 16, 2023
gcp-cherry-pick-bot bot pushed a commit that referenced this pull request Mar 16, 2023
gcp-cherry-pick-bot bot pushed a commit that referenced this pull request Mar 16, 2023
gcp-cherry-pick-bot bot pushed a commit that referenced this pull request Mar 16, 2023
crenshaw-dev pushed a commit that referenced this pull request Mar 16, 2023
#12839) (#12886)

Signed-off-by: Sam Ding <samding@ca.ibm.com>
Co-authored-by: Sam Ding <samding@ca.ibm.com>
crenshaw-dev pushed a commit that referenced this pull request Mar 16, 2023
#12839) (#12885)

Signed-off-by: Sam Ding <samding@ca.ibm.com>
Co-authored-by: Sam Ding <samding@ca.ibm.com>
crenshaw-dev pushed a commit that referenced this pull request Mar 16, 2023
#12839) (#12884)

Signed-off-by: Sam Ding <samding@ca.ibm.com>
Co-authored-by: Sam Ding <samding@ca.ibm.com>
alexec pushed a commit to alexec/argo-cd that referenced this pull request Mar 19, 2023
yyzxw pushed a commit to yyzxw/argo-cd that referenced this pull request Aug 9, 2023
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.

2 participants