Install cri-tools from master

Signed-off-by: Sascha Grunert <sgrunert@redhat.com>

dependencies.yaml

@@ -46,8 +46,6 @@ dependencies:
   - name: cri-tools
     version: v1.30.0
     refPaths:
-    - path: scripts/versions
-      match: cri-tools
     - path: contrib/test/ci/vars.yml
       match: cri_tools_git_version
 
@@ -57,12 +55,6 @@ dependencies:
     - path: scripts/versions
       match: buildah
 
-  - name: runc
-    version: main
-    refPaths:
-    - path: scripts/versions
-      match: runc
-
   - name: bats
     version: v1.11.0
     refPaths:

scripts/github-actions-setup

@@ -58,15 +58,29 @@ prepare_system() {
     sudo systemctl restart systemd-journald
 }
 
-install_bats() {
-    git clone https://github.com/bats-core/bats-core
-    pushd bats-core
-    git checkout "${VERSIONS["bats"]}"
-    sudo ./install.sh /usr/local
+install_from_github_org_repo() {
+    URL=https://github.com/$1/$2
+    DIR=$(mktemp -ud)
+
+    git clone "$URL" "$DIR"
+    pushd "$DIR"
+    git checkout "$3"
+    "${@:4}"
     popd
-    rm -rf bats-core
+    sudo rm -rf "$DIR"
+}
+
+install_bats() {
+    install_from_github_org_repo \
+        bats-core \
+        bats-core \
+        "${VERSIONS["bats"]}" \
+        sudo ./install.sh /usr/local
+
     mkdir -p ~/.parallel
     touch ~/.parallel/will-cite
+
+    bats --version
 }
 
 install_conmon() {
@@ -82,14 +96,12 @@ install_conmonrs() {
 }
 
 install_critools() {
-    URL=https://github.com/kubernetes-sigs/cri-tools
+    install_from_github_org_repo \
+        kubernetes-sigs \
+        cri-tools \
+        master \
+        sudo -E PATH="$PATH" make BINDIR=/usr/bin install
 
-    git clone $URL
-    pushd cri-tools
-    git checkout "${VERSIONS["cri-tools"]}"
-    sudo -E PATH="$PATH" make BINDIR=/usr/bin install
-    popd
-    sudo rm -rf cri-tools
     sudo critest --version
     sudo crictl --version
 }
@@ -118,7 +130,6 @@ install_runc() {
     git clone https://github.com/opencontainers/runc.git "$RUNC_DIR"
 
     pushd "$RUNC_DIR"
-    git checkout "${VERSIONS["runc"]}"
     GOROOT="$GO_INSTALLATION_DIR/go"
     make GO="$GOROOT/bin/go"
     sudo install -D -m0755 runc /usr/sbin/runc

scripts/versions

@@ -2,8 +2,6 @@
 declare -A VERSIONS=(
     ["cni-plugins"]=v1.4.1
     ["conmon"]=v2.1.10
-    ["cri-tools"]=v1.30.0
-    ["runc"]=main
     ["bats"]=v1.11.0
     ["buildah"]=v1.34.0
 )