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

fix: Fixed matrix requeueAfterSeconds for PR #10915

Merged
merged 8 commits into from Jan 17, 2023

Conversation

Aym3nTN
Copy link
Contributor

@Aym3nTN Aym3nTN commented Oct 12, 2022

Fixes: #10914

Signed-off-by: Aymen Ben Tanfous aymen.bentanfous@gmail.com

Note on DCO:

If the DCO action in the integration test fails, one or more of your commits are not signed off. Please click on the Details link next to the DCO action for instructions on how to resolve this.

Checklist:

  • 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.
  • 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).

Signed-off-by: Aymen Ben Tanfous <aymen.bentanfous@gmail.com>
@codecov
Copy link

codecov bot commented Oct 12, 2022

Codecov Report

Base: 47.29% // Head: 47.31% // Increases project coverage by +0.01% 🎉

Coverage data is based on head (aeb58e9) compared to base (3b05351).
Patch coverage: 100.00% of modified lines in pull request are covered.

Additional details and impacted files
@@            Coverage Diff             @@
##           master   #10915      +/-   ##
==========================================
+ Coverage   47.29%   47.31%   +0.01%     
==========================================
  Files         245      245              
  Lines       41670    41671       +1     
==========================================
+ Hits        19707    19715       +8     
+ Misses      19978    19971       -7     
  Partials     1985     1985              
Impacted Files Coverage Δ
applicationset/generators/matrix.go 69.74% <100.00%> (+0.25%) ⬆️
util/settings/settings.go 48.67% <0.00%> (+0.24%) ⬆️
applicationset/generators/pull_request.go 50.00% <0.00%> (+3.12%) ⬆️

Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here.

☔ View full report at Codecov.
📢 Do you have feedback about the report comment? Let us know in this issue.

@mubarak-j
Copy link
Contributor

@Aym3nTN I reached out to ArgoCD maintainers on slack to review this PR (as I'm also impacted by this issue) and they asked if a unit test can be included in this PR? if not I can start a similar PR and add that. I don't think I've write permission to your branch/repo

@Aym3nTN
Copy link
Contributor Author

Aym3nTN commented Dec 22, 2022

I'll give it a look tonight Mubarak!

@Aym3nTN Aym3nTN changed the title Fixed matrix requeueAfterSeconds for PR fix: Fixed matrix requeueAfterSeconds for PR Dec 22, 2022
Signed-off-by: Aymen Ben Tanfous <aymen.bentanfous@cimpress.com>
@Aym3nTN
Copy link
Contributor Author

Aym3nTN commented Dec 22, 2022

@mubarak-j I gave you access to my repo; I tried to add some tests, but I don't believe that's good enough.. Check your email, you should have received an invitation by now to collaborate on my repo.

Aym3nTN and others added 4 commits January 7, 2023 22:49
Signed-off-by: Aymen Ben Tanfous <aymenbentanfous@gmail.com>
Signed-off-by: Aymen Ben Tanfous <aymenbentanfous@gmail.com>
@crenshaw-dev crenshaw-dev added cherry-pick/2.4 Candidate for cherry picking into the 2.4 release branch cherry-pick/2.5 labels Jan 11, 2023
@crenshaw-dev
Copy link
Collaborator

@Aym3nTN thanks for this! I will merge/release the fix one week from today.

@crenshaw-dev crenshaw-dev merged commit 8917077 into argoproj:master Jan 17, 2023
crenshaw-dev pushed a commit that referenced this pull request Jan 17, 2023
* Fixed matrix requeueAfterSeconds for PR

Signed-off-by: Aymen Ben Tanfous <aymen.bentanfous@gmail.com>

* A try to make some tests

Signed-off-by: Aymen Ben Tanfous <aymen.bentanfous@cimpress.com>

* Fixed default test returns the default time

Signed-off-by: Aymen Ben Tanfous <aymenbentanfous@gmail.com>

* Fixed default test returns the default time

Signed-off-by: Aymen Ben Tanfous <aymenbentanfous@gmail.com>

Signed-off-by: Aymen Ben Tanfous <aymen.bentanfous@gmail.com>
Signed-off-by: Aymen Ben Tanfous <aymen.bentanfous@cimpress.com>
Signed-off-by: Aymen Ben Tanfous <aymenbentanfous@gmail.com>
Co-authored-by: Aymen Ben Tanfous <aymen.bentanfous@cimpress.com>
Co-authored-by: Aymen Ben Tanfous <aymenbentanfous@gmail.com>
crenshaw-dev pushed a commit that referenced this pull request Jan 17, 2023
* Fixed matrix requeueAfterSeconds for PR

Signed-off-by: Aymen Ben Tanfous <aymen.bentanfous@gmail.com>

* A try to make some tests

Signed-off-by: Aymen Ben Tanfous <aymen.bentanfous@cimpress.com>

* Fixed default test returns the default time

Signed-off-by: Aymen Ben Tanfous <aymenbentanfous@gmail.com>

* Fixed default test returns the default time

Signed-off-by: Aymen Ben Tanfous <aymenbentanfous@gmail.com>

Signed-off-by: Aymen Ben Tanfous <aymen.bentanfous@gmail.com>
Signed-off-by: Aymen Ben Tanfous <aymen.bentanfous@cimpress.com>
Signed-off-by: Aymen Ben Tanfous <aymenbentanfous@gmail.com>
Co-authored-by: Aymen Ben Tanfous <aymen.bentanfous@cimpress.com>
Co-authored-by: Aymen Ben Tanfous <aymenbentanfous@gmail.com>
crenshaw-dev pushed a commit that referenced this pull request Jan 17, 2023
* Fixed matrix requeueAfterSeconds for PR

Signed-off-by: Aymen Ben Tanfous <aymen.bentanfous@gmail.com>

* A try to make some tests

Signed-off-by: Aymen Ben Tanfous <aymen.bentanfous@cimpress.com>

* Fixed default test returns the default time

Signed-off-by: Aymen Ben Tanfous <aymenbentanfous@gmail.com>

* Fixed default test returns the default time

Signed-off-by: Aymen Ben Tanfous <aymenbentanfous@gmail.com>

Signed-off-by: Aymen Ben Tanfous <aymen.bentanfous@gmail.com>
Signed-off-by: Aymen Ben Tanfous <aymen.bentanfous@cimpress.com>
Signed-off-by: Aymen Ben Tanfous <aymenbentanfous@gmail.com>
Co-authored-by: Aymen Ben Tanfous <aymen.bentanfous@cimpress.com>
Co-authored-by: Aymen Ben Tanfous <aymenbentanfous@gmail.com>
@crenshaw-dev
Copy link
Collaborator

Cherry-picked onto release-2.6 for 2.6.0-rc4, release-2.5 for 2.5.7, and release-2.4 for 2.4.19.

emirot pushed a commit to emirot/argo-cd that referenced this pull request Jan 27, 2023
…oj#10915)

* Fixed matrix requeueAfterSeconds for PR

Signed-off-by: Aymen Ben Tanfous <aymen.bentanfous@gmail.com>

* A try to make some tests

Signed-off-by: Aymen Ben Tanfous <aymen.bentanfous@cimpress.com>

* Fixed default test returns the default time

Signed-off-by: Aymen Ben Tanfous <aymenbentanfous@gmail.com>

* Fixed default test returns the default time

Signed-off-by: Aymen Ben Tanfous <aymenbentanfous@gmail.com>

Signed-off-by: Aymen Ben Tanfous <aymen.bentanfous@gmail.com>
Signed-off-by: Aymen Ben Tanfous <aymen.bentanfous@cimpress.com>
Signed-off-by: Aymen Ben Tanfous <aymenbentanfous@gmail.com>
Co-authored-by: Aymen Ben Tanfous <aymen.bentanfous@cimpress.com>
Co-authored-by: Aymen Ben Tanfous <aymenbentanfous@gmail.com>
Signed-off-by: emirot <emirot.nolan@gmail.com>
schakrad pushed a commit to schakrad/argo-cd that referenced this pull request Mar 14, 2023
…oj#10915)

* Fixed matrix requeueAfterSeconds for PR

Signed-off-by: Aymen Ben Tanfous <aymen.bentanfous@gmail.com>

* A try to make some tests

Signed-off-by: Aymen Ben Tanfous <aymen.bentanfous@cimpress.com>

* Fixed default test returns the default time

Signed-off-by: Aymen Ben Tanfous <aymenbentanfous@gmail.com>

* Fixed default test returns the default time

Signed-off-by: Aymen Ben Tanfous <aymenbentanfous@gmail.com>

Signed-off-by: Aymen Ben Tanfous <aymen.bentanfous@gmail.com>
Signed-off-by: Aymen Ben Tanfous <aymen.bentanfous@cimpress.com>
Signed-off-by: Aymen Ben Tanfous <aymenbentanfous@gmail.com>
Co-authored-by: Aymen Ben Tanfous <aymen.bentanfous@cimpress.com>
Co-authored-by: Aymen Ben Tanfous <aymenbentanfous@gmail.com>
Signed-off-by: schakrad <chakradari.sindhu@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
cherry-pick/2.4 Candidate for cherry picking into the 2.4 release branch cherry-pick/2.5 cherry-pick/2.6
Projects
None yet
Development

Successfully merging this pull request may close these issues.

RequeueAfterSeconds for PR generator not being detected when using Matrix generator
3 participants