Fix for git lfs failure in multi-arch build

Author: rafie

.circleci/config.yml

@@ -79,6 +79,11 @@ jobs:
       image: ubuntu-1604:201903-01
     steps:
       - checkout
+      - run:
+          name: Checkout LFS
+          commnad: |
+            git lfs install
+            git lfs pull
       - run:
           name: Setup Docker client experimental features
           command: |

Dockerfile

@@ -34,7 +34,7 @@ ARG PACK=0
 ARG TEST=0
 
 RUN if [ "$PACK" = "1" ]; then make -C opt pack; fi
-RUN if [ "$TEST" = "1" ]; then make -C opt test $BUILD_ARGS; fi
+RUN if [ "$TEST" = "1" ]; then make -C opt test $BUILD_ARGS NO_LFS=1; fi
 
 #----------------------------------------------------------------------------------------------
 # FROM redis:latest

Dockerfile.arm

@@ -34,7 +34,7 @@ ARG PACK=0
 ARG TEST=0
 
 RUN if [ "$PACK" = "1" ]; then make -C opt pack; fi
-RUN if [ "$TEST" = "1" ]; then make -C opt test $BUILD_ARGS; fi
+RUN if [ "$TEST" = "1" ]; then make -C opt test $BUILD_ARGS NO_LFS=1; fi
 
 RUN [ "cross-build-end" ]
 

opt/Makefile

@@ -124,8 +124,10 @@ endif
 TEST_REPORT_DIR ?= $(PWD)
 
 test:
+ifneq ($(NO_LFS),1)
 	$(SHOW)if [ "$(git lfs env > /dev/null 2>&1 ; echo $?)" != "0" ]; then cd $(ROOT); git lfs install; fi
 	$(SHOW)cd $(ROOT); git lfs pull
+endif
 	$(SHOW)set -e ;\
 	cd $(ROOT)/test ;\
 	python3 -m RLTest $(TEST_ARGS) --test basic_tests.py --module $(INSTALL_DIR)/redisai.so ;\