diff options
author | Thomas Haller <thaller@redhat.com> | 2022-03-17 13:48:15 +0100 |
---|---|---|
committer | Thomas Haller <thaller@redhat.com> | 2022-03-21 17:19:47 +0100 |
commit | 569b9d864ff160de7be5b14f5f45d50963270144 (patch) | |
tree | 70f63523f76b88f6a9900220d58bf8ce02f577e0 | |
parent | bbd053bf8362f96244b3db55f37209e527322353 (diff) | |
download | NetworkManager-569b9d864ff160de7be5b14f5f45d50963270144.tar.gz |
gitlab-ci: archive log of test
Our test is long and verbose. The output gets truncated after
a few megabytes, but sometimes it's interesting to see what
happens afterwards. Redirect also to a file and archive it.
-rw-r--r-- | .gitlab-ci.yml | 53 | ||||
-rw-r--r-- | .gitlab-ci/ci.template | 20 |
2 files changed, 64 insertions, 9 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 33333549b1..7896323f20 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -47,11 +47,11 @@ variables: # # This is done by running `ci-fairy generate-template` and possibly bump # ".default_tag". - FEDORA_TAG: '2022-03-15.0-fb4fc6b5dff6' - UBUNTU_TAG: '2022-03-15.0-6b7641ec0d2b' - DEBIAN_TAG: '2022-03-15.0-6b7641ec0d2b' - CENTOS_TAG: '2022-03-15.0-fb4fc6b5dff6' - ALPINE_TAG: '2022-03-15.0-f6b3036d4e95' + FEDORA_TAG: '2022-03-15.0-6be5ac812004' + UBUNTU_TAG: '2022-03-15.0-34b078846bf1' + DEBIAN_TAG: '2022-03-15.0-34b078846bf1' + CENTOS_TAG: '2022-03-15.0-6be5ac812004' + ALPINE_TAG: '2022-03-15.0-5dc0a455ed5c' FEDORA_EXEC: 'bash .gitlab-ci/fedora-install.sh' UBUNTU_EXEC: 'bash .gitlab-ci/debian-install.sh' @@ -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 .nm_artifacts_undo: variables: @@ -623,9 +632,12 @@ alpine:latest@container-clean: stage: test script: - env - - .gitlab-ci/run-test.sh + - .gitlab-ci/run-test.sh 2>&1 | tee /tmp/nm-test.log + after_script: + - mv /tmp/nm-test.log . dependencies: [] + ################################################################# # # # test stage # @@ -637,6 +649,7 @@ t_fedora:30: extends: - .build@template - .fdo.distribution-image@fedora + - .nm_artifacts_debug variables: FDO_DISTRIBUTION_VERSION: '30' FDO_DISTRIBUTION_TAG: $FEDORA_TAG @@ -648,6 +661,7 @@ t_fedora:31: extends: - .build@template - .fdo.distribution-image@fedora + - .nm_artifacts_debug variables: FDO_DISTRIBUTION_VERSION: '31' FDO_DISTRIBUTION_TAG: $FEDORA_TAG @@ -659,6 +673,7 @@ t_fedora:32: extends: - .build@template - .fdo.distribution-image@fedora + - .nm_artifacts_debug variables: FDO_DISTRIBUTION_VERSION: '32' FDO_DISTRIBUTION_TAG: $FEDORA_TAG @@ -670,6 +685,7 @@ t_fedora:33: extends: - .build@template - .fdo.distribution-image@fedora + - .nm_artifacts_debug variables: FDO_DISTRIBUTION_VERSION: '33' FDO_DISTRIBUTION_TAG: $FEDORA_TAG @@ -681,6 +697,7 @@ t_fedora:34: extends: - .build@template - .fdo.distribution-image@fedora + - .nm_artifacts_debug variables: FDO_DISTRIBUTION_VERSION: '34' FDO_DISTRIBUTION_TAG: $FEDORA_TAG @@ -703,6 +720,7 @@ t_fedora:36: extends: - .build@template - .fdo.distribution-image@fedora + - .nm_artifacts_debug variables: FDO_DISTRIBUTION_VERSION: '36' FDO_DISTRIBUTION_TAG: $FEDORA_TAG @@ -714,6 +732,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 @@ -725,6 +744,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 @@ -736,6 +756,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 @@ -747,6 +768,7 @@ t_ubuntu:devel: extends: - .build@template - .fdo.distribution-image@ubuntu + - .nm_artifacts_debug variables: FDO_DISTRIBUTION_VERSION: 'devel' FDO_DISTRIBUTION_TAG: $UBUNTU_TAG @@ -758,6 +780,7 @@ t_ubuntu:rolling: extends: - .build@template - .fdo.distribution-image@ubuntu + - .nm_artifacts_debug variables: FDO_DISTRIBUTION_VERSION: 'rolling' FDO_DISTRIBUTION_TAG: $UBUNTU_TAG @@ -769,6 +792,7 @@ t_debian:9: extends: - .build@template - .fdo.distribution-image@debian + - .nm_artifacts_debug variables: FDO_DISTRIBUTION_VERSION: '9' FDO_DISTRIBUTION_TAG: $DEBIAN_TAG @@ -780,6 +804,7 @@ t_debian:10: extends: - .build@template - .fdo.distribution-image@debian + - .nm_artifacts_debug variables: FDO_DISTRIBUTION_VERSION: '10' FDO_DISTRIBUTION_TAG: $DEBIAN_TAG @@ -791,6 +816,7 @@ t_debian:11: extends: - .build@template - .fdo.distribution-image@debian + - .nm_artifacts_debug variables: FDO_DISTRIBUTION_VERSION: '11' FDO_DISTRIBUTION_TAG: $DEBIAN_TAG @@ -802,6 +828,7 @@ t_debian:testing: extends: - .build@template - .fdo.distribution-image@debian + - .nm_artifacts_debug variables: FDO_DISTRIBUTION_VERSION: 'testing' FDO_DISTRIBUTION_TAG: $DEBIAN_TAG @@ -813,6 +840,7 @@ t_debian:sid: extends: - .build@template - .fdo.distribution-image@debian + - .nm_artifacts_debug variables: FDO_DISTRIBUTION_VERSION: 'sid' FDO_DISTRIBUTION_TAG: $DEBIAN_TAG @@ -824,6 +852,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 @@ -835,6 +864,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 @@ -846,6 +876,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 @@ -857,6 +888,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 @@ -868,6 +900,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 @@ -879,6 +912,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 @@ -890,6 +924,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 @@ -901,6 +936,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 @@ -912,6 +948,7 @@ t_alpine:latest: extends: - .build@template - .fdo.distribution-image@alpine + - .nm_artifacts_debug variables: FDO_DISTRIBUTION_VERSION: 'latest' FDO_DISTRIBUTION_TAG: $ALPINE_TAG @@ -932,6 +969,7 @@ check-patch: stage: test script: - date '+%Y%m%d-%H%M%S'; NM_CHECKPATCH_FETCH_UPSTREAM=1 contrib/scripts/checkpatch-feature-branch.sh + after_script: allow_failure: true check-tree: @@ -944,6 +982,7 @@ check-tree: - date '+%Y%m%d-%H%M%S'; git ls-files -z -- 'po/*.po' | xargs -0 -n1 msgfmt -vc - date '+%Y%m%d-%H%M%S'; contrib/scripts/nm-code-format.sh -n - date '+%Y%m%d-%H%M%S'; ci-fairy generate-template && git diff --exit-code + after_script: pages: stage: deploy diff --git a/.gitlab-ci/ci.template b/.gitlab-ci/ci.template index 4629c7effe..d42d2d186f 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 .nm_artifacts_undo: variables: @@ -145,9 +154,12 @@ variables: stage: test script: - env - - .gitlab-ci/run-test.sh + - .gitlab-ci/run-test.sh 2>&1 | tee /tmp/nm-test.log + after_script: + - mv /tmp/nm-test.log . dependencies: [] + ################################################################# # # # test stage # @@ -164,6 +176,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}}' @@ -195,6 +209,7 @@ check-patch: stage: test script: - date '+%Y%m%d-%H%M%S'; NM_CHECKPATCH_FETCH_UPSTREAM=1 contrib/scripts/checkpatch-feature-branch.sh + after_script: allow_failure: true check-tree: @@ -207,6 +222,7 @@ check-tree: - date '+%Y%m%d-%H%M%S'; git ls-files -z -- 'po/*.po' | xargs -0 -n1 msgfmt -vc - date '+%Y%m%d-%H%M%S'; contrib/scripts/nm-code-format.sh -n - date '+%Y%m%d-%H%M%S'; ci-fairy generate-template && git diff --exit-code + after_script: pages: stage: deploy |