test: Allow use of FsHelper without a config

This class is used by the build-efi/qemu scripts, so allow it to work
outside the context of a test.

Signed-off-by: Simon Glass <sjg@chromium.org>

.gitlab-ci.yml

@@ -6,6 +6,10 @@ include:
 variables:
   DEFAULT_TAG: ""
   MIRROR_DOCKER: docker.io
+  TEST_SUITES: "1"
+  TEST_PY: "1"
+  TEST_SPEC: ""
+  WORLD_BUILD: "1"
   LAB_ONLY: ""
   SJG_LAB: ""
   PLATFORM: linux/amd64,linux/arm64
@@ -23,10 +27,10 @@ default:
 
 # We run some tests in different order, to catch some failures quicker.
 stages:
-  - testsuites
+  - test_suites
   - test.py
   - sjg-lab
-  - world build
+  - world_build
   - version_bump
   - release
 
@@ -34,10 +38,15 @@ stages:
   stage: test.py
   retry: 2 # QEMU may be too slow, etc.
   rules:
-    - if: $LAB_ONLY != "1"
-      when: always
     - if: $LAB_ONLY == "1"
       when: never
+    - if: $TEST_PY == "1"
+      when: always
+    - if: $TEST_PY == $CI_JOB_NAME
+      when: always
+    - if: $TEST_PY == $TEST_PY_BD
+      when: always
+    - when: never
   before_script:
     - git config --global --add safe.directory "${CI_PROJECT_DIR}"
     # qemu_arm64_lwip_defconfig is the same as qemu_arm64 but with NET_LWIP enabled.
@@ -106,11 +115,17 @@ stages:
         export bl1=/tmp/bl1.bin;
         export PATH=/opt/Base_RevC_AEMvA_pkg/models/Linux64_GCC-9.3:${PATH};
       fi
+    - if [[ -n "${TEST_SPEC}" ]]; then
+        SPEC="${TEST_SPEC}";
+        echo 'Using provided test spec ${TEST_SPEC}"';
+      else
+        SPEC="${TEST_PY_TEST_SPEC}";
+      fi
     # "${var:+"-k $var"}" expands to "" if $var is empty, "-k $var" if not
     - export PATH=/opt/qemu/bin:test/hooks/bin:${PATH};
       export PYTHONPATH=test/hooks/py/travis-ci;
       ./test/py/test.py -ra --bd ${TEST_PY_BD} ${TEST_PY_ID} ${TEST_PY_EXTRA}
-        ${TEST_PY_TEST_SPEC:+"-k ${TEST_PY_TEST_SPEC}"}
+        ${SPEC:+"-k ${SPEC}"}
         --build-dir "$UBOOT_TRAVIS_BUILD_DIR"
         --junitxml=/tmp/${TEST_PY_BD}/results.xml
   artifacts:
@@ -124,12 +139,13 @@ stages:
     expire_in: 1 week
 
 .world_build:
-  stage: world build
+  stage: world_build
   rules:
-    - if: $LAB_ONLY != "1"
-      when: always
     - if: $LAB_ONLY == "1"
       when: never
+    - if: $WORLD_BUILD == "1"
+      when: always
+    - when: never
 
 build all 32bit ARM platforms:
   extends: .world_build
@@ -206,16 +222,17 @@ build all other platforms:
         exit $ret;
       fi;
 
-.testsuites:
+.test_suites:
-  stage: testsuites
+  stage: test_suites
   rules:
-    - if: $LAB_ONLY != "1"
-      when: always
     - if: $LAB_ONLY == "1"
       when: never
+    - if: $TEST_SUITES == "1"
+      when: always
+    - when: never
 
 check for new CONFIG symbols outside Kconfig:
-  extends: .testsuites
+  extends: .test_suites
   script:
     - git config --global --add safe.directory "${CI_PROJECT_DIR}"
     # If grep succeeds and finds a match the test fails as we should
@@ -228,7 +245,7 @@ check for new CONFIG symbols outside Kconfig:
 
 # build documentation
 docs:
-  extends: .testsuites
+  extends: .test_suites
   script:
     - python3 -m venv /tmp/venvhtml
     - . /tmp/venvhtml/bin/activate
@@ -238,13 +255,13 @@ docs:
 
 # ensure all configs have MAINTAINERS entries
 Check for configs without MAINTAINERS entry:
-  extends: .testsuites
+  extends: .test_suites
   script:
     - ./tools/buildman/buildman --maintainer-check
 
 # Ensure host tools build
 Build tools-only and envtools:
-  extends: .testsuites
+  extends: .test_suites
   tags:
     - single
   script:
@@ -253,7 +270,7 @@ Build tools-only and envtools:
       make tools-only_config envtools -j$(nproc)
 
 Run binman, buildman, dtoc, Kconfig and patman test suites:
-  extends: .testsuites
+  extends: .test_suites
   script:
     - git config --global user.name "GitLab CI Runner";
       git config --global user.email trini@konsulko.com;
@@ -282,7 +299,7 @@ Run binman, buildman, dtoc, Kconfig and patman testsuites:
 
 # Check for any pylint regressions
 Run pylint:
-  extends: .testsuites
+  extends: .test_suites
   tags:
     - single
   script:
@@ -306,7 +323,7 @@ Run pylint:
 
 # Check for pre-schema driver model tags
 Check for pre-schema tags:
-  extends: .testsuites
+  extends: .test_suites
   script:
     - git config --global --add safe.directory "${CI_PROJECT_DIR}";
     # If grep succeeds and finds a match the test fails as we should
@@ -315,7 +332,7 @@ Check for pre-schema tags:
 
 # Check we can package the Python tools
 Check packing of Python tools:
-  extends: .testsuites
+  extends: .test_suites
   script:
     - make pip
 
@@ -632,11 +649,6 @@ coreboot test.py:
     # Environment:
     #   SRC  - source tree
     #   OUT  - output directory for builds
-    - if [[ -n ${SJG_LAB} ]]; then
-        if [[ "${SJG_LAB}" != "${ROLE}" && "${SJG_LAB}" != "1" ]]; then
-          exit 0;
-        fi;
-      fi
     - export SRC="$(pwd)"
     - export OUT="${SRC}/build/${ROLE}"
     - export OUT_EXTRA="${SRC}/build/${ROLE}_extra"

doc/develop/ci_testing.rst

@@ -95,6 +95,34 @@ testing cycle to edit these pipelines in separate local commits to pair them
 down to just the jobs you're interested in.  These changes must be removed
 prior to submission.
 
+Available variables are:
+
+TEST_SUITES
+    Set to 0 to disable the test_suites stage::
+
+        git push ci -o ci.variable=TEST_SUITES=0
+
+TEST_PY
+    Set to 0 to disable the test.py stage, or set to the job name to run just
+    that job, or set to the board name to run all tests for that board:
+
+    For example::
+
+        git push ci -o ci.variable=TEST_PY=0
+        git push ci -o ci.variable=TEST_PY=sandbox
+        git push ci -o ci.variable=TEST_PY='sandbox with clang test.py'
+
+WORLD_BUILD
+    Set to 0 to disable the world_build stage::
+
+        git push ci -o ci.variable=WORLD_BUILD=0
+
+TEST_SPEC
+    Set to the test spec to use when running a test.py tests. This overrides
+    the spec provided by the job. For example::
+
+        git push ci -o ci.variable=TEST_SPEC=bootstd
+
 Using the lab
 -------------
 
@@ -113,7 +141,9 @@ To request that the lab runs::
 
     git push ci -o ci.variable=SJG_LAB=1 <branch>
 
-To request that *only* the lab runs::
+To request that *only* the lab runs, you can set TEST_PY=0 and TEST_SUITES=0
+and WORD_BUILD=0 as above. But as a shortcut you can use the LAB_ONLY
+variables::
 
     git push ci -o ci.variable=SJG_LAB=1 ci.variable=LAB_ONLY=1 <branch>
 

test/py/tests/fs_helper.py

@@ -63,7 +63,8 @@ class FsHelper:
 
         # Use a default filename; the caller can adjust it
         leaf = f'{prefix}.{fs_type}.img'
-        self.fs_img = os.path.join(config.persistent_data_dir, leaf)
+        self.fs_img = os.path.join(
+            config.persistent_data_dir if config else '', leaf)
 
         # Some distributions do not add /sbin to the default PATH, where mkfs
         # lives

tools/fit_image.c

@@ -381,7 +381,6 @@ static void fit_write_configs(struct imgtool *itl, char *fdt)
 		typename = genimg_get_type_short_name(itl->fit_image_type);
 		snprintf(str, sizeof(str), "%s-1", typename);
 		fdt_property_string(fdt, typename, str);
-		fdt_property_string(fdt, FIT_LOADABLE_PROP, str);
 
 		if (itl->fit_ramdisk)
 			fdt_property_string(fdt, FIT_RAMDISK_PROP,