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@xxxxxxxxxx>
---
ci/Makefile | 4 ++--
ci/build.sh | 4 ++--
ci/helper | 4 ++--
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/ci/Makefile b/ci/Makefile
index 81f08d4f88..8f1be4318d 100644
--- 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 f6db4d2a7f..9489c4ab2f 100644
--- 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 8b8d0f68cb..fb562d55e1 100755
--- 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:
--
2.39.1
