-
Notifications
You must be signed in to change notification settings - Fork 949
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
refactor: correct hard coding in several shell script #1452
refactor: correct hard coding in several shell script #1452
Conversation
Signed-off-by: zhuangqh <zhuangqhc@163.com>
hack/make.sh
Outdated
@@ -9,9 +9,13 @@ DIR="$( cd "$( dirname "$0" )/.." && pwd )" | |||
cd "$DIR/" | |||
|
|||
CONTAINERD_VERSION= | |||
REQUIRED_CONTAINERD_VERSION="1.0.3" |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I am wondering if we could directly use CONTAINERD_VERSION
rather than REQUIRED_CONTAINERD_VERSION
?
Or add some annotation for both two variables and tell code readers the difference between them.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
CONTAINERD_VERSION
is the version of containerd installed in this machine, getting from command containerd -v ...
. If CONTAINERD_VERSION
not equals to required version, this script will install the required version.
Maybe we can change CONTAINERD_VERSION
to CURRENT_CONTAINERD_VERSION
for better semantics? @allencloud
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
From your explanation, I have got what you mean. While I think it is OK for the variables, but there is still some comment required in the script. WDYT?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
You are right. First reading these code may be confused, I've added a comment in next commit. @allencloud
It happens to be error exists in critools testing, @starnop . Actually it says that there is one failure in the critools testing. However, I think it is quite hard for me to judge which one is failing. Is there any way for the critools to show explicit error case. In addition, I retrigger the critools testing to check if this is a flaky test. I have to say in the future we need to pay more attention on the flaky test in CRI part. It is quite important to be related with the stability of Pouchd. |
Signed-off-by: zhuangqh <zhuangqhc@163.com>
Codecov Report
@@ Coverage Diff @@
## master #1452 +/- ##
==========================================
- Coverage 40.05% 38.54% -1.51%
==========================================
Files 249 250 +1
Lines 16179 17057 +878
==========================================
+ Hits 6480 6575 +95
- Misses 8880 9635 +755
- Partials 819 847 +28
|
LGTM |
Signed-off-by: zhuangqh zhuangqhc@163.com
Ⅰ. Describe what this PR did
Correct hard coding in several shell script, using configurable variable instead.
Fix a minor bug in #1447
Ⅱ. Does this pull request fix one issue?
Ⅲ. Describe how you did it
Ⅳ. Describe how to verify it
Ⅴ. Special notes for reviews