github/containerd
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

vendor bump

Browse Source 
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>

containerd: linux -> runtime/linux

Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>

fix utils to properly format vendor repo

Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>

test fixup

Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
This commit is contained in:
Evan Hazlett
2018-05-24 09:03:36 -04:00
parent 40b60834a2
commit d7d2212324
102 changed files with 3770 additions and 234 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
hack/test-utils.sh
View File

@@ -46,7 +46,7 @@ test_setup() {
# Wait for containerd to be running by using the containerd client ctr to check the version
# of the containerd server. Wait an increasing amount of time after each of five attempts
readiness_check "sudo ctr version"
readiness_check "sudo ${GOPATH}/bin/crictl --runtime-endpoint=${CONTAINERD_SOCK} info"
readiness_check "sudo crictl --runtime-endpoint=${CONTAINERD_SOCK} info"
}
# test_teardown kills containerd.

2
hack/utils.sh
View File

@@ -81,7 +81,7 @@ from-vendor() {
BEGIN { rc=1 } # Assume we did not find what we were looking for.
// {
if ($1 == REPO) {
if ($3 != "") { REPO = $3 }; # Override repo.
if ($3 != "") { gsub(/http.*\/\//, "", $3); REPO = $3 }; # Override repo.
printf("%s_VERSION=%s; %s_REPO=%s\n", WHAT, $2, WHAT, REPO);
rc=0; # Note success for use in END block.
exit # No point looking further.