ci: build.sh: Drop the CI prefix from the CI_{MESON,NINJA}_ARGS vars

Although it is currently consistent with the other variables we define
when running ci in a local container environment, it isn't consistent
with the variable naming we use in GitLab recipes. Since the idea is
to unite the two, we're likely going to drop a few other variables from
the local env configuration anyway, hence this renaming.

Signed-off-by: Erik Skultety <eskultet@redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>

diff --git a/ci/Makefile b/ci/Makefile
index 81f08d4f883593c5932bc3488a9c42ef0e516fee..8f1be4318dfba06c2f022e19fee042b2424ca755 100644 (file)
--- a/ci/Makefile
+++ b/ci/Makefile
@@ -161,8 +161,8 @@ CI_ENGINE_ARGS = \
        --user "$(CI_UID)":"$(CI_GID)" \
        --workdir "$(CI_USER_HOME)" \
        --env CI_CONT_SRCDIR="$(CI_CONT_SRCDIR)" \
-       --env CI_MESON_ARGS="$(CI_MESON_ARGS)" \
-       --env CI_NINJA_ARGS="$(CI_NINJA_ARGS)" \
+       --env MESON_ARGS="$(MESON_ARGS)" \
+       --env NINJA_ARGS="$(NINJA_ARGS)" \
        $(CI_PODMAN_ARGS) \
        $(CI_PWDB_MOUNTS) \
        $(CI_HOME_MOUNTS) \

diff --git a/ci/build.sh b/ci/build.sh
index f6db4d2a7f1c8c989f988d3fa0465cadc5d64ce2..9489c4ab2fc788b4d45074bafbc3564f1709f0b8 100644 (file)
--- a/ci/build.sh
+++ b/ci/build.sh
@@ -8,7 +8,7 @@ export VIR_TEST_DEBUG=1
 # populated at build time from the Dockerfile. A typical use case would
 # be to pass options to trigger cross-compilation
 
-meson setup build --werror -Dsystem=true $MESON_OPTS $CI_MESON_ARGS || \
+meson setup build --werror -Dsystem=true $MESON_OPTS $MESON_ARGS || \
 (cat build/meson-logs/meson-log.txt && exit 1)
 
-ninja -C build $CI_NINJA_ARGS
+ninja -C build $NINJA_ARGS

diff --git a/ci/helper b/ci/helper
index 8b8d0f68cb3d8a3100794d704366d32dd9a08b33..fb562d55e16beb91e6444726d1045c1c685564dc 100755 (executable)
--- a/ci/helper
+++ b/ci/helper
@@ -152,8 +152,8 @@ class Application:
 
         if self._args.action in ["build", "test"]:
             args.extend([
-                f"CI_MESON_ARGS={self._args.meson_args}",
-                f"CI_NINJA_ARGS={self._args.ninja_args}",
+                f"MESON_ARGS={self._args.meson_args}",
+                f"NINJA_ARGS={self._args.ninja_args}",
             ])
 
         if pty.spawn(["make"] + args) != 0: