Set BACKEND=osbuild-composer if running that test scenario

- this will execute cli sanity tests in parallel with the other
- make sure to pass BACKED to vm.install too
- more checks in lib.sh

Makefile

@@ -154,7 +154,7 @@ $(VM_IMAGE): srpm bots
 		--upload $(CURDIR)/test/vm.install:/var/tmp/vm.install \
 		--upload $(realpath tests):/ \
 		--run-command "chmod +x /var/tmp/vm.install" \
-		--run-command "cd /var/tmp; /var/tmp/vm.install $$srpm" \
+		--run-command "cd /var/tmp; BACKEND=$(BACKEND) /var/tmp/vm.install $$srpm" \
 		$(TEST_OS)
 	[ -f ~/.config/lorax-test-env ] && bots/image-customize \
 		--upload ~/.config/lorax-test-env:/var/tmp/lorax-test-env \

test/run

@@ -4,12 +4,16 @@
 
 export BACKEND="${BACKEND:-lorax-composer}"
 
+if [ "$BACKEND" == "osbuild-composer" ] || [ "$TEST_SCENARIO" == "osbuild-composer" ]; then
+    rm -rf ./test/images/*
+    export BACKEND="osbuild-composer"
+    make BACKEND=osbuild-composer vm
+else
     make vm
+fi
 
-if [ -n "$TEST_SCENARIO" ]; then
 if [ "$TEST_SCENARIO" == "lorax" ]; then
     test/check-lorax TestLorax
-  fi
 else
     test/check-cli TestImages
 fi

tests/cli/lib/lib.sh

@@ -93,9 +93,9 @@ composer_start() {
     local rc
     local params="$@"
 
-    if [[ -z "$CLI" || "$CLI" == "./src/bin/composer-cli" ]]; then
+    if [ "$BACKEND" == "lorax-composer" ] && [[ -z "$CLI" || "$CLI" == "./src/bin/composer-cli" ]]; then
         ./src/sbin/lorax-composer $params --sharedir $SHARE_DIR $BLUEPRINTS_DIR &
-    elif [ -n "$params" ]; then
+    elif [ "$BACKEND" == "lorax-composer" ] && [ -n "$params" ]; then
         /usr/sbin/lorax-composer $params /var/lib/lorax/composer/blueprints &
     else
         # socket stop/start seems to be necessary for a proper service restart