From 3c39ab88369b877db03290d8b58e753817bb0ed1 Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Fri, 11 Dec 2020 16:08:07 +0100 Subject: [PATCH] tests: skip "check-local-gitlab-ci" test on gitlab-ci --- .gitlab-ci/build.sh | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.gitlab-ci/build.sh b/.gitlab-ci/build.sh index b3f6863582..84beab73ea 100755 --- a/.gitlab-ci/build.sh +++ b/.gitlab-ci/build.sh @@ -25,6 +25,12 @@ meson --version # `make check`. export NMTST_SKIP_PYTHON_BLACK=1 +# We have a unit test that check that `ci-fairy generate-template` +# is equal to our .gitlab-ci.yml file. However, on gitlab-ci we +# also have a dedicate test for the same thing. We don't need +# to run that test as part of the build. Disable it. +export NMTST_SKIP_CHECK_GITLAB_CI=1 + do_clean; BUILD_TYPE=autotools CC=gcc WITH_DOCS=1 WITH_VALGRIND=1 contrib/scripts/nm-ci-run.sh rm -rf /tmp/nm-docs-html; mv build/INST/share/gtk-doc/html /tmp/nm-docs-html