feat(redis): fix redis bats tests

Signed-off-by: Alexei Dodon <[email protected]>
adodon2go · Jul 8, 2024 · f0a86d9 · f0a86d9
1 parent 038f95e
commit f0a86d9
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 8 deletions.
diff --git a/.github/workflows/ecosystem-tools.yaml b/.github/workflows/ecosystem-tools.yaml
@@ -14,7 +14,7 @@ permissions: read-all
 jobs:
   client-tools:
     name: Check client tools
-    runs-on: ubuntu-latest-16-cores
+    runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
       - uses: actions/setup-go@v5

diff --git a/Makefile b/Makefile
@@ -510,6 +510,7 @@ run-blackbox-cloud-ci: check-blackbox-prerequisites check-awslocal binary $(BATS
 	echo running cloud CI bats tests; \
 	$(BATS) $(BATS_FLAGS) test/blackbox/cloud_only.bats
 	$(BATS) $(BATS_FLAGS) test/blackbox/sync_cloud.bats
+	$(BATS) $(BATS_FLAGS) test/blackbox/redis_s3.bats
 
 .PHONY: run-blackbox-dedupe-nightly
 run-blackbox-dedupe-nightly: check-blackbox-prerequisites check-awslocal binary binary-minimal

diff --git a/test/blackbox/ci.sh b/test/blackbox/ci.sh
@@ -9,7 +9,7 @@ PATH=$PATH:${SCRIPTPATH}/../../hack/tools/bin
 
 tests=("pushpull" "pushpull_authn" "delete_images" "referrers" "metadata" "anonymous_policy"
       "annotations" "detect_manifest_collision" "cve" "sync" "sync_docker" "sync_replica_cluster"
-      "scrub" "garbage_collect" "metrics" "metrics_minimal" "multiarch_index" "redis_local" "redis_s3")
+      "scrub" "garbage_collect" "metrics" "metrics_minimal" "multiarch_index" "redis_local")
 
 for test in ${tests[*]}; do
     ${BATS} ${BATS_FLAGS} ${SCRIPTPATH}/${test}.bats > ${test}.log & pids+=($!)

diff --git a/test/blackbox/helpers_redis.bash b/test/blackbox/helpers_redis.bash
@@ -1,9 +1,3 @@
-ROOT_DIR=$(git rev-parse --show-toplevel)
-OS=$(go env GOOS)
-ARCH=$(go env GOARCH)
-ZOT_MINIMAL_PATH=${ROOT_DIR}/bin/zot-${OS}-${ARCH}-minimal
-ZB_PATH=${ROOT_DIR}/bin/zb-${OS}-${ARCH}
-TEST_DATA_DIR=${BATS_FILE_TMPDIR}/test/data
 
 function redis_start() {
   local cname="$1"

diff --git a/test/blackbox/redis_local.bats b/test/blackbox/redis_local.bats
@@ -30,6 +30,9 @@ function setup_file() {
         exit 1
     fi
 
+    # Download test data to folder common for the entire suite, not just this file
+    skopeo --insecure-policy copy --format=oci docker://ghcr.io/project-zot/golang:1.20 oci:${TEST_DATA_DIR}/golang:1.20
+
     # Setup redis server
     redis_port=$(get_free_port)
     redis_start redis_server_local ${redis_port}
@@ -99,6 +102,8 @@ EOF
 @test "pull both images" {
     local oci_data_dir=${BATS_FILE_TMPDIR}/oci
     zot_port=`cat ${BATS_FILE_TMPDIR}/zot.port`
+
+    mkdir -p ${oci_data_dir}
     run skopeo --insecure-policy copy --src-tls-verify=false \
         docker://127.0.0.1:${zot_port}/golang:1.20 \
         oci:${oci_data_dir}/golang:1.20