TESTth/tmp4

3 files changed, 49 insertions, 10 deletions

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a15de0a0fc..325ee84d54 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -63,11 +63,20 @@ variables:
   variables:
     NM_BUILD_TARBALL: 1
   artifacts:
-    expire_in: 2 days
+    expire_in: 5 days
+    when: always
     paths:
       - docs-html
       - NetworkManager-1*.tar.xz
       - NetworkManager-1*.src.rpm
+      - nm-test.log
+
+.nm_artifacts_debug:
+  artifacts:
+    expire_in: 5 days
+    when: always
+    paths:
+      - nm-test.log
 
 #################################################################
 #                                                               #
@@ -621,10 +630,6 @@ alpine:latest@container-clean:
   after_script:
     - mv /tmp/nm-test.log .
   dependencies: []
-  artifacts:
-    expire_in: 5 days
-    paths:
-      - nm-test.log
 
 
 #################################################################
@@ -638,6 +643,7 @@ t_fedora:30:
   extends:
     - .build@template
     - .fdo.distribution-image@fedora
+    - .nm_artifacts_debug
   variables:
     FDO_DISTRIBUTION_VERSION: '30'
     FDO_DISTRIBUTION_TAG: $FEDORA_TAG
@@ -649,6 +655,7 @@ t_fedora:31:
   extends:
     - .build@template
     - .fdo.distribution-image@fedora
+    - .nm_artifacts_debug
   variables:
     FDO_DISTRIBUTION_VERSION: '31'
     FDO_DISTRIBUTION_TAG: $FEDORA_TAG
@@ -660,6 +667,7 @@ t_fedora:32:
   extends:
     - .build@template
     - .fdo.distribution-image@fedora
+    - .nm_artifacts_debug
   variables:
     FDO_DISTRIBUTION_VERSION: '32'
     FDO_DISTRIBUTION_TAG: $FEDORA_TAG
@@ -671,6 +679,7 @@ t_fedora:33:
   extends:
     - .build@template
     - .fdo.distribution-image@fedora
+    - .nm_artifacts_debug
   variables:
     FDO_DISTRIBUTION_VERSION: '33'
     FDO_DISTRIBUTION_TAG: $FEDORA_TAG
@@ -682,6 +691,7 @@ t_fedora:34:
   extends:
     - .build@template
     - .fdo.distribution-image@fedora
+    - .nm_artifacts_debug
   variables:
     FDO_DISTRIBUTION_VERSION: '34'
     FDO_DISTRIBUTION_TAG: $FEDORA_TAG
@@ -704,6 +714,7 @@ t_fedora:36:
   extends:
     - .build@template
     - .fdo.distribution-image@fedora
+    - .nm_artifacts_debug
   variables:
     FDO_DISTRIBUTION_VERSION: '36'
     FDO_DISTRIBUTION_TAG: $FEDORA_TAG
@@ -715,6 +726,7 @@ t_ubuntu:16.04:
   extends:
     - .build@template
     - .fdo.distribution-image@ubuntu
+    - .nm_artifacts_debug
   variables:
     FDO_DISTRIBUTION_VERSION: '16.04'
     FDO_DISTRIBUTION_TAG: $UBUNTU_TAG
@@ -726,6 +738,7 @@ t_ubuntu:18.04:
   extends:
     - .build@template
     - .fdo.distribution-image@ubuntu
+    - .nm_artifacts_debug
   variables:
     FDO_DISTRIBUTION_VERSION: '18.04'
     FDO_DISTRIBUTION_TAG: $UBUNTU_TAG
@@ -737,6 +750,7 @@ t_ubuntu:20.04:
   extends:
     - .build@template
     - .fdo.distribution-image@ubuntu
+    - .nm_artifacts_debug
   variables:
     FDO_DISTRIBUTION_VERSION: '20.04'
     FDO_DISTRIBUTION_TAG: $UBUNTU_TAG
@@ -748,6 +762,7 @@ t_ubuntu:devel:
   extends:
     - .build@template
     - .fdo.distribution-image@ubuntu
+    - .nm_artifacts_debug
   variables:
     FDO_DISTRIBUTION_VERSION: 'devel'
     FDO_DISTRIBUTION_TAG: $UBUNTU_TAG
@@ -759,6 +774,7 @@ t_ubuntu:rolling:
   extends:
     - .build@template
     - .fdo.distribution-image@ubuntu
+    - .nm_artifacts_debug
   variables:
     FDO_DISTRIBUTION_VERSION: 'rolling'
     FDO_DISTRIBUTION_TAG: $UBUNTU_TAG
@@ -770,6 +786,7 @@ t_debian:9:
   extends:
     - .build@template
     - .fdo.distribution-image@debian
+    - .nm_artifacts_debug
   variables:
     FDO_DISTRIBUTION_VERSION: '9'
     FDO_DISTRIBUTION_TAG: $DEBIAN_TAG
@@ -781,6 +798,7 @@ t_debian:10:
   extends:
     - .build@template
     - .fdo.distribution-image@debian
+    - .nm_artifacts_debug
   variables:
     FDO_DISTRIBUTION_VERSION: '10'
     FDO_DISTRIBUTION_TAG: $DEBIAN_TAG
@@ -792,6 +810,7 @@ t_debian:11:
   extends:
     - .build@template
     - .fdo.distribution-image@debian
+    - .nm_artifacts_debug
   variables:
     FDO_DISTRIBUTION_VERSION: '11'
     FDO_DISTRIBUTION_TAG: $DEBIAN_TAG
@@ -803,6 +822,7 @@ t_debian:testing:
   extends:
     - .build@template
     - .fdo.distribution-image@debian
+    - .nm_artifacts_debug
   variables:
     FDO_DISTRIBUTION_VERSION: 'testing'
     FDO_DISTRIBUTION_TAG: $DEBIAN_TAG
@@ -814,6 +834,7 @@ t_debian:sid:
   extends:
     - .build@template
     - .fdo.distribution-image@debian
+    - .nm_artifacts_debug
   variables:
     FDO_DISTRIBUTION_VERSION: 'sid'
     FDO_DISTRIBUTION_TAG: $DEBIAN_TAG
@@ -825,6 +846,7 @@ t_centos:7.5.1804:
   extends:
     - .build@template
     - .fdo.distribution-image@centos
+    - .nm_artifacts_debug
   variables:
     FDO_DISTRIBUTION_VERSION: '7.5.1804'
     FDO_DISTRIBUTION_TAG: $CENTOS_TAG
@@ -836,6 +858,7 @@ t_centos:7.6.1810:
   extends:
     - .build@template
     - .fdo.distribution-image@centos
+    - .nm_artifacts_debug
   variables:
     FDO_DISTRIBUTION_VERSION: '7.6.1810'
     FDO_DISTRIBUTION_TAG: $CENTOS_TAG
@@ -847,6 +870,7 @@ t_centos:7.7.1908:
   extends:
     - .build@template
     - .fdo.distribution-image@centos
+    - .nm_artifacts_debug
   variables:
     FDO_DISTRIBUTION_VERSION: '7.7.1908'
     FDO_DISTRIBUTION_TAG: $CENTOS_TAG
@@ -858,6 +882,7 @@ t_centos:7.8.2003:
   extends:
     - .build@template
     - .fdo.distribution-image@centos
+    - .nm_artifacts_debug
   variables:
     FDO_DISTRIBUTION_VERSION: '7.8.2003'
     FDO_DISTRIBUTION_TAG: $CENTOS_TAG
@@ -869,6 +894,7 @@ t_centos:7.9.2009:
   extends:
     - .build@template
     - .fdo.distribution-image@centos
+    - .nm_artifacts_debug
   variables:
     FDO_DISTRIBUTION_VERSION: '7.9.2009'
     FDO_DISTRIBUTION_TAG: $CENTOS_TAG
@@ -880,6 +906,7 @@ t_centos:8.1.1911:
   extends:
     - .build@template
     - .fdo.distribution-image@centos
+    - .nm_artifacts_debug
   variables:
     FDO_DISTRIBUTION_VERSION: '8.1.1911'
     FDO_DISTRIBUTION_TAG: $CENTOS_TAG
@@ -891,6 +918,7 @@ t_centos:8.2.2004:
   extends:
     - .build@template
     - .fdo.distribution-image@centos
+    - .nm_artifacts_debug
   variables:
     FDO_DISTRIBUTION_VERSION: '8.2.2004'
     FDO_DISTRIBUTION_TAG: $CENTOS_TAG
@@ -902,6 +930,7 @@ t_centos:8.3.2011:
   extends:
     - .build@template
     - .fdo.distribution-image@centos
+    - .nm_artifacts_debug
   variables:
     FDO_DISTRIBUTION_VERSION: '8.3.2011'
     FDO_DISTRIBUTION_TAG: $CENTOS_TAG
@@ -913,6 +942,7 @@ t_alpine:latest:
   extends:
     - .build@template
     - .fdo.distribution-image@alpine
+    - .nm_artifacts_debug
   variables:
     FDO_DISTRIBUTION_VERSION: 'latest'
     FDO_DISTRIBUTION_TAG: $ALPINE_TAG
diff --git a/.gitlab-ci/ci.template b/.gitlab-ci/ci.template
index 94b72b216d..092fffcdaa 100644
--- a/.gitlab-ci/ci.template
+++ b/.gitlab-ci/ci.template
@@ -52,11 +52,20 @@ variables:
   variables:
     NM_BUILD_TARBALL: 1
   artifacts:
-    expire_in: 2 days
+    expire_in: 5 days
+    when: always
     paths:
       - docs-html
       - NetworkManager-1*.tar.xz
       - NetworkManager-1*.src.rpm
+      - nm-test.log
+
+.nm_artifacts_debug:
+  artifacts:
+    expire_in: 5 days
+    when: always
+    paths:
+      - nm-test.log
 
 #################################################################
 #                                                               #
@@ -143,10 +152,6 @@ variables:
   after_script:
     - mv /tmp/nm-test.log .
   dependencies: []
-  artifacts:
-    expire_in: 5 days
-    paths:
-      - nm-test.log
 
 
 #################################################################
@@ -165,6 +170,8 @@ t_{{distro.name}}:{{version}}:
 {% if distro.name == pages_build.name and
       version == pages_build.version %}
     - .nm_artifacts
+{% else %}
+    - .nm_artifacts_debug
 {% endif %}
   variables:
     FDO_DISTRIBUTION_VERSION: '{{version}}'
diff --git a/.gitlab-ci/run-test.sh b/.gitlab-ci/run-test.sh
index c826dd078b..e4e1181199 100755
--- a/.gitlab-ci/run-test.sh
+++ b/.gitlab-ci/run-test.sh
@@ -2,6 +2,8 @@
 
 set -ex
 
+exit $(($RANDOM % 2))
+
 IS_FEDORA=0
 IS_CENTOS=0
 IS_ALPINE=0