Adding git=2.35.2 and git-lfs to the ci dependencies to fix an issue …

…with the build

ci/scripts/jenkins/test.sh

@@ -19,21 +19,32 @@ set -e
 source ${WORKSPACE}/ci/scripts/jenkins/common.sh
 /usr/bin/nvidia-smi
 
+# Restore the environment and then ensure we have the CI dependencies
 restore_conda_env
+
+gpuci_logger "Installing CI dependencies"
+mamba env update -q -n morpheus -f ${MORPHEUS_ROOT}/docker/conda/environments/cuda${CUDA_VER}_ci.yml
+
+# Install the built Morpheus python package
 pip install ${MORPHEUS_ROOT}/build/wheel
 
 CPP_TESTS=($(find ${MORPHEUS_ROOT}/build/wheel -name "*.x"))
 
 gpuci_logger "Installing test dependencies"
 npm install --silent -g camouflage-server
-mamba install -q -y -c conda-forge "git-lfs=3.1.4"
+
+# Before running any .git commands, set this as a safe directory
+git config --global --add safe.directory ${MORPHEUS_ROOT}
 
 gpuci_logger "Pulling LFS assets"
 cd ${MORPHEUS_ROOT}
 
 git lfs install
 ${MORPHEUS_ROOT}/scripts/fetch_data.py fetch tests validation
 
+# List missing files
+${MORPHEUS_ROOT}/scripts/fetch_data.py check
+
 REPORTS_DIR="${WORKSPACE_TMP}/reports"
 mkdir -p ${WORKSPACE_TMP}/reports
 

docker/conda/environments/cuda11.5_ci.yml

@@ -20,5 +20,7 @@ channels:
 dependencies:
     - bash=5.1.16 # bash >=4.4 is necessary for morpheus cli auto-complete tests to pass.
     - conda-pack=0.7
+    - git-lfs=3.2
+    - git>=2.35.3 # Needed for wildcards on safe.directory
     - pkg-config=0.29
     - sccache=0.3