gitlab-ci: fix building artifacts (pages) during gitlab-ci test

.gitlab-ci.yml

@@ -52,6 +52,8 @@ variables:
   CENTOS_EXEC: 'bash .gitlab-ci/centos-install.sh'
 
 .nm_artifacts:
+  variables:
+    NM_BUILD_TARBALL: 1
   artifacts:
     expire_in: 2 days
     paths:
@@ -60,6 +62,8 @@ variables:
       - NetworkManager-1*.src.rpm
 
 .nm_artifacts_undo:
+  variables:
+    NM_BUILD_TARBALL: 0
   artifacts:
     paths: []
 

.gitlab-ci/build.sh

@@ -35,8 +35,8 @@ do_clean; BUILD_TYPE=meson     CC=clang WITH_DOCS=0                 contrib/scri
 do_clean; test $IS_FEDORA = 1 -o $IS_CENTOS = 1 && ./contrib/fedora/rpm/build_clean.sh -g -w crypto_gnutls -w debug -w iwd -w test -W meson
 do_clean; test $IS_FEDORA = 1                   && ./contrib/fedora/rpm/build_clean.sh -g -w crypto_gnutls -w debug -w iwd -w test -w meson
 
+do_clean
 if [ "$NM_BUILD_TARBALL" = 1 ]; then
-    do_clean
     SIGN_SOURCE=0 ./contrib/fedora/rpm/build_clean.sh -r
     mv ./NetworkManager-1*.tar.xz /tmp/
     mv ./contrib/fedora/rpm/latest/SRPMS/NetworkManager-1*.src.rpm /tmp/

.gitlab-ci/ci.template

@@ -42,6 +42,8 @@ variables:
 {% endfor %}
 
 .nm_artifacts:
+  variables:
+    NM_BUILD_TARBALL: 1
   artifacts:
     expire_in: 2 days
     paths:
@@ -50,6 +52,8 @@ variables:
       - NetworkManager-1*.src.rpm
 
 .nm_artifacts_undo:
+  variables:
+    NM_BUILD_TARBALL: 0
   artifacts:
     paths: []