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>

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) \

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

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: