Skip to content

Update Makefile to accept arguments in the integration target#2013

Merged
azdagron merged 5 commits intospiffe:masterfrom
ryysud:accept-args
Dec 17, 2020
Merged

Update Makefile to accept arguments in the integration target#2013
azdagron merged 5 commits intospiffe:masterfrom
ryysud:accept-args

Conversation

@ryysud
Copy link
Contributor

@ryysud ryysud commented Dec 10, 2020

Signed-off-by: Ryuma Yoshida ryuma.y1117@gmail.com

Pull Request check list

  • Commit conforms to CONTRIBUTING.md?
  • Proper tests/regressions included?
  • Documentation updated?

Affected functionality

make integration

Description of change

I updated Makefile to accept arguments in the integration target.
With this change, we can run a specific integration test via make integration as below:

SUITES=suites/join-token make integration
SUITES='suites/k8s suites/join-token' make integration

Which issue this PR fixes

Nothing.

Signed-off-by: Ryuma Yoshida <ryuma.y1117@gmail.com>
Copy link
Member

@amartinezfayo amartinezfayo left a comment

Choose a reason for hiding this comment

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

Thank you @ryysud for this improvement.

I think that it would be good to update the help target to document the existence of this.

Signed-off-by: Ryuma Yoshida <ryuma.y1117@gmail.com>
@ryysud
Copy link
Contributor Author

ryysud commented Dec 11, 2020

Thank you for your review, @amartinezfayo. I fixed it with b773231.

$ make help
...

Test:
  test                          - run unit tests
  race-test                     - run unit tests with race detection
  integration                   - run integration tests (requires Docker images)
                                  support 'SUITES' variable for executing specific tests
                                  e.g. SUITES='suites/join-token suites/k8s' make integration
...

azdagron
azdagron previously approved these changes Dec 15, 2020
Copy link
Member

@azdagron azdagron left a comment

Choose a reason for hiding this comment

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

Looks good! Do you mind resolving the merge conflict, @ryysud ?

Signed-off-by: Ryuma Yoshida <ryuma.y1117@gmail.com>
@ryysud
Copy link
Contributor Author

ryysud commented Dec 16, 2020

Thank you your review, @azdagron! I fixed the conflict.

Copy link
Member

@azdagron azdagron left a comment

Choose a reason for hiding this comment

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

\o/

@azdagron azdagron merged commit 008039c into spiffe:master Dec 17, 2020
@ryysud ryysud deleted the accept-args branch December 18, 2020 02:36
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.

3 participants