From edbd66842daef457bd37d493899026761de9af53 Mon Sep 17 00:00:00 2001
From: Ramkumar Chinchani <rchincha@cisco.com>
Date: Wed, 10 Jan 2024 19:26:08 +0000
Subject: [PATCH] ci: update bats and zot versions

Update Makefile to bump up zot version
Update Makefile to include a recipe to install latest bats

Signed-off-by: Ramkumar Chinchani <rchincha@cisco.com>
---
 Makefile              | 11 ++++++++++-
 install-build-deps.sh |  2 --
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index feb6596f..295ba678 100644
--- a/Makefile
+++ b/Makefile
@@ -41,9 +41,12 @@ REGCLIENT := $(TOOLS_D)/bin/regctl
 REGCLIENT_VERSION := v0.5.1
 export SKOPEO = $(TOOLS_D)/bin/skopeo
 export SKOPEO_VERSION = 1.9.3
+export BATS = $(TOOLS_D)/bin/bats
+BATS_VERSION := v1.10.0
 # OCI registry
 ZOT := $(TOOLS_D)/bin/zot
-ZOT_VERSION := v2.0.0-rc6
+ZOT_VERSION := v2.0.0
+export PATH := $(TOOLS_D)/bin:$(PATH)
 
 GOLANGCI_LINT_VERSION = v1.54.2
 GOLANGCI_LINT = $(TOOLS_D)/golangci-lint/$(GOLANGCI_LINT_VERSION)/golangci-lint
@@ -138,6 +141,12 @@ $(SKOPEO):
 	cd $(TOP_LEVEL); \
 	rm -rf $$tmpdir;
 
+$(BATS):
+	rm -rf bats-core; \
+	git clone -b $(BATS_VERSION) https://github.com/bats-core/bats-core.git; \
+	cd bats-core; ./install.sh $(TOOLS_D); cd ..; \
+	rm -rf bats-core
+
 TEST?=$(patsubst test/%.bats,%,$(wildcard test/*.bats))
 PRIVILEGE_LEVEL?=
 
diff --git a/install-build-deps.sh b/install-build-deps.sh
index 0922f829..89137bcb 100755
--- a/install-build-deps.sh
+++ b/install-build-deps.sh
@@ -4,7 +4,6 @@ set -o errexit
 
 installdeps_fedora() {
   sudo dnf install \
-    bats \
     jq \
     lxc-devel \
     libcap-devel \
@@ -24,7 +23,6 @@ installdeps_fedora() {
 installdeps_ubuntu() {
     sudo add-apt-repository -y ppa:project-machine/squashfuse
     sudo apt -yy install \
-            bats \
             build-essential \
             cryptsetup-bin \
             jq \