From 1e883ab6e6a95068bc2483274a00b3ddff955863 Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Thu, 19 Jan 2023 13:59:12 +0100 Subject: gitlab-ci: avoid clean step in "run-test.sh" for manual invocation When we run `NM_TEST_SELECT_RUN=x ./.gitlab-ci/run-test.sh` to run one step only, we should not do the final clean, so that the build artifacts are preserved. --- .gitlab-ci/run-test.sh | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) (limited to '.gitlab-ci') diff --git a/.gitlab-ci/run-test.sh b/.gitlab-ci/run-test.sh index 1feb27f0be..853e5132c9 100755 --- a/.gitlab-ci/run-test.sh +++ b/.gitlab-ci/run-test.sh @@ -116,17 +116,18 @@ fi ############################################################################### -do_clean - -if [ "$NM_BUILD_TARBALL" = 1 ]; then - if check_run 1 ; then - mv "$ARTIFACT_DIR/docs-html/" ./ - fi - if check_run 8 ; then - mv \ - "$ARTIFACT_DIR"/NetworkManager-1*.tar.xz \ - "$ARTIFACT_DIR"/NetworkManager-1*.src.rpm \ - ./ +if [ -z "$NM_TEST_SELECT_RUN" ] ; then + do_clean + if [ "$NM_BUILD_TARBALL" = 1 ]; then + if check_run 1 ; then + mv "$ARTIFACT_DIR/docs-html/" ./ + fi + if check_run 8 ; then + mv \ + "$ARTIFACT_DIR"/NetworkManager-1*.tar.xz \ + "$ARTIFACT_DIR"/NetworkManager-1*.src.rpm \ + ./ + fi fi fi -- cgit v1.2.1