Read suites from Kubernetes testrun resource #74
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
andmat900
requested review from
t-persson and
fredjn
and removed request for
a team
andmat900
force-pushed
the
20241119_read_testruns
branch
from
d44fcb9 to
cead2dc
Compare
t-persson
requested changes
Nov 29, 2024
Comment on lines
155
to
165
| tercc = EiffelTestExecutionRecipeCollectionCreatedEvent() | ||
| tercc_json = None | ||
| if os.getenv("TERCC") is not None: | ||
| # first option for backwards compatibility | ||
| self.logger.info("Reading TERCC from environment variable") | ||
| tercc_json = json.loads(os.getenv("TERCC", "{}")) | ||
| tercc.rebuild(tercc_json) | ||
| else: | ||
| # requires testrun custom resource defined in Kubernetes | ||
| self.logger.info("Reading TERCC from Kubernetes testrun resource") | ||
| tercc = TestRun(Kubernetes()).get(os.getenv("TESTRUN")) |
There was a problem hiding this comment.
A few problems with this.
- This property should only be used as a fallback for when we're not running in the controller environment (line 123).
- The TestRun resource from Kubernetes is not equivalent to a TERCC.
- The code for requesting a TestRun resource from Kubernetes instead of loading the TERCC environment variable as a TestRun should be in the
test_suiteproperty (line 174)
andmat900
force-pushed
the
20241119_read_testruns
branch
from
cf63faf to
e7b07fa
Compare
t-persson
requested changes
Nov 29, 2024
Comment on lines
162
to
163
| if isinstance(tercc, list): | ||
| test_suite = [Suite(**suite) for suite in tercc] |
There was a problem hiding this comment.
This part was the part that handled TESTRUN before. It shouldn't be needed here.
Comment on lines
182
to
185
| if os.environ.get("TERCC") is not None: | ||
| self.__test_suite = self._get_test_suite_list_from_tercc() | ||
| else: | ||
| test_suite = self._eiffel_test_suite(tercc) | ||
| # The dataset is not necessary for the suite runner. | ||
| self.__test_suite = [Suite.from_tercc(suite, {}) for suite in test_suite] | ||
| self.__test_suite = self._get_test_suite_list_from_kubernetes_testrun() |
There was a problem hiding this comment.
Why not just
if testrun_id := os.getenv("TESTRUN") is not None:
testrun = TestRun(Kubernetes()).get(testrun_id)
self.__test_suite = testrun.spec.suites
else:
self.__test_suite = self._eiffel_test_suite(os.getenv("TERCC", "{}"))
There was a problem hiding this comment.
Parentheses are needed in the if-line, because otherwise testrun_id evaluates to a boolean.
The else block seems to need this line too:
test_suite = [Suite.from_tercc(suite, {}) for suite in test_suite]
t-persson
reviewed
Nov 29, 2024
t-persson
approved these changes
Dec 2, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Applicable Issues
Description of the Change
This change enables ETOS Suite Runner to read suites from Kubernetes' TestRun.
Alternate Designs
Possible Drawbacks
Sign-off
Developer's Certificate of Origin 1.1
By making a contribution to this project, I certify that:
(a) The contribution was created in whole or in part by me and I
have the right to submit it under the open source license
indicated in the file; or
(b) The contribution is based upon previous work that, to the best
of my knowledge, is covered under an appropriate open source
license and I have the right under that license to submit that
work with modifications, whether created in whole or in part
by me, under the same open source license (unless I am
permitted to submit under a different license), as indicated
in the file; or
(c) The contribution was provided directly to me by some other
person who certified (a), (b) or (c) and I have not modified
it.
(d) I understand and agree that this project and the contribution
are public and that a record of the contribution (including all
personal information I submit with it, including my sign-off) is
maintained indefinitely and may be redistributed consistent with
this project or the open source license(s) involved.
Signed-off-by: Andrei Matveyeu, [email protected]