.gitlab-ci.yml: Convert the native build job to the build.sh usage

Individual shell command executions are replaced by respective
functions in the ci/build.sh base script. This will make sure we use
the same recipes in GitLab jobs as well as in local executions.

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

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 1c6af8f8b377d216f41ab27312e3f073e21bb6b3..c837812091dc0877e286b5114b8c309d96924734 100644 (file)
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -25,15 +25,13 @@ include:
       - ccache/
     key: "$CI_JOB_NAME"
   script:
-    - *script_variables
-    - meson setup build --werror $MESON_ARGS || (cat build/meson-logs/meson-log.txt && exit 1)
-    - meson dist -C build --no-tests
+    - source ci/jobs.sh
     - if test -x /usr/bin/rpmbuild && test "$RPM" != "skip";
       then
-        rpmbuild --clean --nodeps --define "_without_mingw 1" -ta build/meson-dist/libvirt-*.tar.xz;
+        run_rpmbuild;
       else
-        meson compile -C build;
-        meson test -C build --no-suite syntax-check --print-errorlogs;
+        run_build;
+        run_test;
       fi
   after_script:
     - test "$CI_JOB_STATUS" != "success" && exit 1;