test: reconfigure how runtimes are passed in #4100
Conversation
|
@fgiudici PTAL |
Codecov Report
@@ Coverage Diff @@
## master #4100 +/- ##
=======================================
Coverage 40.53% 40.53%
=======================================
Files 115 115
Lines 9442 9442
=======================================
Hits 3827 3827
Misses 5182 5182
Partials 433 433 |
test/README.md
Outdated
| For example, to use [kata](https://github.com/kata-containers/runtime) with shim v2: | ||
| ``` | ||
| make localintegration RUNTIME=cc-runtime | ||
| make CONTAINER_DEFAULT_RUNTIME=kata RUNTIME_TYPE=vm localintegration |
There was a problem hiding this comment.
The kata shim v2 binary has a slightly cumbersome name ;-)
| make CONTAINER_DEFAULT_RUNTIME=kata RUNTIME_TYPE=vm localintegration | |
| make CONTAINER_DEFAULT_RUNTIME=containerd-shim-kata-v2 RUNTIME_TYPE=vm localintegration |
Not all tests will work with it (at least for now), but nonetheless we support specifying the RUNTIME_TYPE, so would be good to have this documented.
test/helpers.bash
Outdated
| --runtimes "$RUNTIME_NAME:$RUNTIME_BINARY:$RUNTIME_ROOT:$RUNTIME_TYPE" \ | ||
| -r "$TESTDIR/crio" \ | ||
| --runroot "$TESTDIR/crio-run" \ | ||
| --runtimes "$CONTAINER_RUNTIMES" \ |
There was a problem hiding this comment.
If we export CONTAINER_RUNTIMES can we also skip the --runtimes parameter here?
There was a problem hiding this comment.
I found some weirdness without it, but I forget what that was. Let's try!
test/helpers.bash
Outdated
| RUNTIME_BINARY_PATH=$(command -v $CONTAINER_DEFAULT_RUNTIME || true) | ||
| RUNTIME_TYPE=${RUNTIME_TYPE:-oci} | ||
| # export here so direct calls to crio later inherit the variable | ||
| export CONTAINER_RUNTIMES=${CONTAINER_RUNTIMES:-$CONTAINER_DEFAULT_RUNTIME:$RUNTIME_BINARY_PATH:$RUNTIME_ROOT:$RUNTIME_TYPE} |
f462b4e to
607f7e4
Compare
607f7e4 to
9ff287a
Compare
|
/lgtm |
|
/retest |
1 similar comment
|
/retest |
9ff287a to
604a666
Compare
|
conflict resolved can I have my tag back |
|
/retest |
bc8aab7 to
7378c4b
Compare
|
/retest |
|
|
test/helpers.bash
Outdated
| fi | ||
| # export here so direct calls to crio later inherit the variable | ||
| export CONTAINER_RUNTIMES=${CONTAINER_RUNTIMES:-$CONTAINER_DEFAULT_RUNTIME:$RUNTIME_BINARY_PATH:$RUNTIME_ROOT:$RUNTIME_TYPE} | ||
| CONTAINER_UID_MAPPINGS=${CONTAINER_UID_MAPPINGS:-} |
There was a problem hiding this comment.
Apparently this one is duplicated?
Signed-off-by: Peter Hunt <[email protected]>
17f7b9d to
2cbd1a1
Compare
|
so all tests can properly access the runtime root without hardcoding Signed-off-by: Peter Hunt <[email protected]>
As well as update documentation describing how to specify an alternative runtime And fix some inconsistencies in how the runtime is called in restore.bats Signed-off-by: Peter Hunt <[email protected]>
2cbd1a1 to
146d47d
Compare
okay, I have implemented point 1. For point 2, I have updated the second commit to not change the variable name in the |
|
/test kata-containers |
|
@mrunalp @saschagrunert @fidencio @kolyshkin @umohnani8 @QiWang19 plz merge |
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: giuseppe, haircommander, kolyshkin, saschagrunert The full list of commands accepted by this bot can be found here. The pull request process is described here DetailsNeeds approval from an approver in each of these files:
Approvers can indicate their approval by writing |
|
/retest |
|
/test kata-containers |
|
/retest Please review the full test history for this PR and help us cut down flakes. |
4 similar comments
|
/retest Please review the full test history for this PR and help us cut down flakes. |
|
/retest Please review the full test history for this PR and help us cut down flakes. |
|
/retest Please review the full test history for this PR and help us cut down flakes. |
|
/retest Please review the full test history for this PR and help us cut down flakes. |
|
@haircommander: The following test failed, say
DetailsInstructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. I understand the commands that are listed here. |
|
/override ci/kata-jenkins |
|
@haircommander: Overrode contexts on behalf of haircommander: ci/kata-jenkins DetailsIn response to this:
Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. |
|
@haircommander: The following tests failed, say
Full PR test history. Your PR dashboard. DetailsInstructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. I understand the commands that are listed here. |
|
/test critest_fedora |
What type of PR is this?
/kind cleanup
What this PR does / why we need it:
As well as update documentation describing how to specify an alternative runtime
And fix some inconsistencies in how the runtime is called in restore.bats
Signed-off-by: Peter Hunt [email protected]
Which issue(s) this PR fixes:
Special notes for your reviewer:
replaces #4099
Does this PR introduce a user-facing change?