Merge pull request #1254 from rhatdan/pull

Change default testing to use --pull=missing

Author: rhatdan

docs/ramalama.conf.5.md

@@ -35,7 +35,7 @@ options in previously read ramalama.conf files.
 Config files in the `.d` directories, are added in alpha numeric sorted order and must end in `.conf`.
 
 ## ENVIRONMENT VARIABLES
-If the `RAMALAMA_CONF` environment variable is set, all system and user
+If the `RAMALAMA_CONFIG` environment variable is set, all system and user
 config files are ignored and only the specified config file is loaded.
 
 # FORMAT

test/system/030-run.bats

@@ -9,7 +9,7 @@ MODEL=smollm:1.7b
     conf=$RAMALAMA_TMPDIR/ramalama.conf
     cat >$conf <<EOF
 [ramalama]
-pull="missing"
+pull="never"
 EOF
 
     if is_container; then
@@ -30,7 +30,7 @@ EOF
 	run_ramalama -q --dryrun run --oci-runtime foobar ${MODEL}
 	is "$output" ".*--runtime foobar" "dryrun correct with --oci-runtime"
 
-	run_ramalama -q --dryrun run --seed 9876 -c 4096 --net bridge --name foobar ${MODEL}
+	RAMALAMA_CONFIG=/dev/null run_ramalama -q --dryrun run --seed 9876 -c 4096 --net bridge --name foobar ${MODEL}
 	is "$output" ".*--network bridge.*" "dryrun correct with --name"
 	is "$output" ".*${MODEL}" "verify model name"
 	is "$output" ".*-c 4096" "verify ctx-size is set"
@@ -40,11 +40,14 @@ EOF
 	   is "$output" ".*--pull newer" "verify pull is newer"
 	fi
 
+	run_ramalama -q --dryrun run ${MODEL}
+	is "$output" ".*--pull missing" "verify test defaults"
+
 	run_ramalama -q --dryrun run --pull=never -c 4096 --name foobar ${MODEL}
 	is "$output" ".*--pull never" "verify pull is never"
 
 	RAMALAMA_CONFIG=${conf} run_ramalama -q --dryrun run ${MODEL}
-	is "$output" ".*--pull missing" "verify pull is missing"
+	is "$output" ".*--pull never" "verify pull is missing"
 
 	run_ramalama 2 -q --dryrun run --pull=bogus ${MODEL}
 	is "$output" ".*error: argument --pull: invalid choice: 'bogus'" "verify pull can not be bogus"

test/system/040-serve.bats

@@ -36,14 +36,17 @@ verify_begin=".*run --rm"
         run_ramalama -q --dryrun serve --temp 0.1 ${model}
         is "$output" ".*--temp 0.1" "verify temp is set"
 
-        run_ramalama -q --dryrun serve --seed 1234 ${model}
+        RAMALAMA_CONFIG=/dev/null run_ramalama -q --dryrun serve --seed 1234 ${model}
         is "$output" ".*--seed 1234" "verify seed is set"
         if not_docker; then
             is "$output" ".*--pull newer" "verify pull is newer"
         fi
         assert "$output" =~ ".*--cap-drop=all" "verify --cap-add is present"
         assert "$output" =~ ".*no-new-privileges" "verify --no-new-privs is not present"
 
+        run_ramalama -q --dryrun serve ${model}
+        is "$output" ".*--pull missing" "verify test default pull is missing"
+
         run_ramalama -q --dryrun serve --pull never ${model}
         is "$output" ".*--pull never" "verify pull is never"
 

test/system/070-rag.bats

@@ -16,6 +16,8 @@ load helpers
     run_ramalama --dryrun run --rag quay.io/ramalama/myrag:1.2 ollama://smollm:135m
     is "$output" ".*quay.io/ramalama/.*-rag.*" "Expected to use -rag image"
     if not_docker; then
+       is "$output" ".*--pull missing.*" "Expected to use --pull missing"
+       RAMALAMA_CONFIG=/dev/null run_ramalama --dryrun run --rag quay.io/ramalama/myrag:1.2 ollama://smollm:135m
        is "$output" ".*--pull newer.*" "Expected to use --pull newer"
     fi
 

test/system/helpers.bash

@@ -3,8 +3,7 @@
 # RamaLama command to run; 
 RAMALAMA=${RAMALAMA:-ramalama}
 
-# RamaLama testing helper used in 331-system-check tests
-RAMALAMA_TESTING=${RAMALAMA_TESTING:-$(dirname ${BASH_SOURCE})/../../bin/ramalama-testing}
+export RAMALAMA_CONFIG=${RAMALAMA_CONFIG:-./test/system/ramalama.conf}
 
 # llama.cpp or vllm, unlikely to change. Cache, because it's expensive to determine.
 RAMALAMA_RUNTIME=

test/system/ramalama.conf

@@ -0,0 +1,4 @@
+[ramalama]
+
+pull="missing"
+