From 0ee4b31561bd9496422a639d67c57a836c2dc946 Mon Sep 17 00:00:00 2001
From: Daniel Canter <dcanter@microsoft.com>
Date: Wed, 29 Dec 2021 15:41:54 -0800
Subject: [PATCH] Fix cri-dockerd CI runs

github.com/Mirantis/cri-dockerd has changed a couple things that were
affecting the CI. The code has moved to a src/ subdirectory so running
'go install .' at the root of the repo fails on finding anything. The
default addresses have also changed from /var/run/dockershim.sock
(and //./pipe/dockershim) to /var/run/cri-dockerd.sock. This change just
cds to the src subdirectory before trying to build/install anything and
passes the right addresses to the dockershim critest runs.

Signed-off-by: Daniel Canter <dcanter@microsoft.com>
---
 .github/workflows/dockershim.yml | 6 ++++--
 hack/install-cri-dockerd.sh      | 2 +-
 hack/run-dockershim-critest.sh   | 6 +++---
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/dockershim.yml b/.github/workflows/dockershim.yml
index 96d04fb366..316626ea4f 100644
--- a/.github/workflows/dockershim.yml
+++ b/.github/workflows/dockershim.yml
@@ -71,7 +71,7 @@ jobs:
           set -o pipefail
 
           git clone https://github.com/Mirantis/cri-dockerd $GOPATH/src/github.com/Mirantis/cri-dockerd
-          cd $GOPATH/src/github.com/Mirantis/cri-dockerd
+          cd $GOPATH/src/github.com/Mirantis/cri-dockerd/src
           go mod tidy
 
           # Need the flag for errors building on Windows
@@ -107,7 +107,8 @@ jobs:
           SKIP="runtime should support execSync|runtime should support portforward|runtime should support starting container with log|runtime should support execSync with timeout|runtime should support removing running container|runtime should support port mapping with only container port|runtime should support creating container|runtime should support starting container with volume|runtime should support exec with tty=true and stdin=true|runtime should support set hostname|runtime should support removing stopped container|runtime should support removing created container|runtime should support running PodSandbox|runtime should support port mapping with host port and container port|runtime should support exec with tty=false and stdin=false|runtime should support DNS config|runtime should support attach|runtime should support listing container stats|runtime should support reopening container log|runtime should support stopping container|runtime should support starting container with volume when host path is a symlink|runtime should support removing PodSandbox|runtime should support stopping PodSandbox|runtime should support starting container"
 
           # Start dockershim first
-          /usr/local/bin/cri-dockerd --v=10 --network-plugin="" --logtostderr &> "${REPORT_DIR}/dockerd-cri.log" &
+          ep=npipe:////./pipe/dockershim
+          /usr/local/bin/cri-dockerd --v=10 --network-plugin="" --container-runtime-endpoint=${ep} --logtostderr &> "${REPORT_DIR}/dockerd-cri.log" &
           pid=$!
 
           # Wait a while for dockershim starting.
@@ -115,6 +116,7 @@ jobs:
 
           # Run cri test cases
           /usr/local/bin/critest --ginkgo.focus="${FOCUS}" --ginkgo.skip="${SKIP}" --report-dir="${REPORT_DIR}" --report-prefix="windows"
+
           ls ${REPORT_DIR}
           TEST_RC1=$?
           test $TEST_RC1 -ne 0 && cat ${REPORT_DIR}/dockerd-cri.log
diff --git a/hack/install-cri-dockerd.sh b/hack/install-cri-dockerd.sh
index 47b136751f..c24a6fc77a 100755
--- a/hack/install-cri-dockerd.sh
+++ b/hack/install-cri-dockerd.sh
@@ -21,7 +21,7 @@ set -o pipefail
 # Build cri-dockerd
 
 git clone https://github.com/Mirantis/cri-dockerd $GOPATH/src/github.com/Mirantis/cri-dockerd
-cd $GOPATH/src/github.com/Mirantis/cri-dockerd
+cd $GOPATH/src/github.com/Mirantis/cri-dockerd/src
 
 go install .
 sudo mv $GOPATH/bin/cri-dockerd /usr/local/bin
diff --git a/hack/run-dockershim-critest.sh b/hack/run-dockershim-critest.sh
index 61e5d4536a..67eefc85d6 100755
--- a/hack/run-dockershim-critest.sh
+++ b/hack/run-dockershim-critest.sh
@@ -38,7 +38,8 @@ fi
 # Start dockershim first
 logs_dir="$GOPATH/logs"
 mkdir -p $logs_dir
-sudo /usr/local/bin/cri-dockerd --v=10 --network-plugin="" --logtostderr >$logs_dir/cri-dockerd.log 2>&1 &
+ep="unix:///var/run/dockershim.sock"
+sudo /usr/local/bin/cri-dockerd --v=10 --network-plugin="" --container-runtime-endpoint=${ep} --logtostderr >$logs_dir/cri-dockerd.log 2>&1 &
 
 # Wait a while for dockershim starting.
 sleep 10
@@ -48,8 +49,7 @@ sleep 10
 # Skip runtime should support execSync with timeout because docker doesn't
 # support it.
 # Skip apparmor test as we don't enable apparmor yet in this CI job.
-sudo critest -ginkgo.skip=${SKIP} -parallel 1
-
+sudo critest -ginkgo.skip=${SKIP} -parallel 1 
 
 # Run benchmark test cases
 sudo critest -benchmark