diff --git a/utils/tests/gitlab-ci-alpine.yml b/utils/tests/gitlab-ci-alpine.yml index 6d77b42ac..7fb14aa77 100644 --- a/utils/tests/gitlab-ci-alpine.yml +++ b/utils/tests/gitlab-ci-alpine.yml @@ -11,6 +11,7 @@ - if: $RELEASE == "weekly" - if: $ALPINE == "True" - if: $CI_PIPELINE_SOURCE == 'merge_request_event' + allow_failure: true before_script: - apk update - apk upgrade @@ -28,6 +29,7 @@ weekly-alpine: - if: $ALPINE == "True" - if: $CI_PIPELINE_SOURCE == 'merge_request_event' when: manual + allow_failure: true stage: pre-build script: - echo "Starting Alpine jobs" @@ -51,4 +53,3 @@ weekly-alpine-latest-default-test: - $CCACHE_BASEDIR_VALUE/ variables: MODE: default - diff --git a/utils/tests/gitlab-ci-clang.yml b/utils/tests/gitlab-ci-clang.yml index ddb29fb6b..686f58f06 100644 --- a/utils/tests/gitlab-ci-clang.yml +++ b/utils/tests/gitlab-ci-clang.yml @@ -15,6 +15,7 @@ - if: $RELEASE == "weekly" - if: $CLANG_BUILD_ENABLE == "True" - if: $CI_PIPELINE_SOURCE == 'merge_request_event' + allow_failure: true before_script: - apt update - apt upgrade -y @@ -38,6 +39,7 @@ - if: $RELEASE == "weekly" - if: $CLANG_BUILD_ENABLE == "True" - if: $CI_PIPELINE_SOURCE == 'merge_request_event' + allow_failure: true before_script: - apt update - apt upgrade -y @@ -60,6 +62,7 @@ weekly-clang: - if: $CLANG_BUILD_ENABLE == "True" - if: $CI_PIPELINE_SOURCE == 'merge_request_event' when: manual + allow_failure: true stage: pre-build script: - echo "Starting clang jobs" diff --git a/utils/tests/gitlab-ci-daily.yml b/utils/tests/gitlab-ci-daily.yml index cdb1c4db6..56eed0f24 100644 --- a/utils/tests/gitlab-ci-daily.yml +++ b/utils/tests/gitlab-ci-daily.yml @@ -43,6 +43,7 @@ daily-jobs: - if: $RELEASE == "daily" - if: $CI_PIPELINE_SOURCE == 'merge_request_event' when: manual + allow_failure: true stage: pre-build script: - echo "Starting daily jobs" @@ -52,6 +53,7 @@ weekly-slow-jobs: - if: $RELEASE == "weekly" - if: $CI_PIPELINE_SOURCE == 'merge_request_event' when: manual + allow_failure: true stage: pre-build script: - echo "Starting weekly jobs" @@ -62,6 +64,7 @@ daily-build-test-debug: rules: - if: $RELEASE == "daily" - if: $CI_PIPELINE_SOURCE == 'merge_request_event' + allow_failure: true needs: ["daily-jobs"] stage: build variables: @@ -76,6 +79,7 @@ daily-build-default: rules: - if: $RELEASE == "daily" - if: $CI_PIPELINE_SOURCE == 'merge_request_event' + allow_failure: true needs: ["daily-jobs"] stage: build variables: @@ -86,6 +90,7 @@ daily-test-default: rules: - if: $RELEASE == "daily" - if: $CI_PIPELINE_SOURCE == 'merge_request_event' + allow_failure: true needs: ["daily-build-default"] stage: test cache: @@ -101,6 +106,7 @@ daily-build-optimized: rules: - if: $RELEASE == "daily" - if: $CI_PIPELINE_SOURCE == 'merge_request_event' + allow_failure: true needs: ["daily-jobs"] stage: build variables: @@ -111,6 +117,7 @@ daily-test-optimized: rules: - if: $RELEASE == "daily" - if: $CI_PIPELINE_SOURCE == 'merge_request_event' + allow_failure: true needs: ["daily-build-optimized"] stage: test cache: @@ -127,6 +134,7 @@ daily-build-test-optimized-valgrind: rules: - if: $RELEASE == "daily" - if: $CI_PIPELINE_SOURCE == 'merge_request_event' + allow_failure: true needs: ["daily-jobs"] stage: build variables: @@ -142,6 +150,7 @@ weekly-build-test-debug-valgrind: rules: - if: $RELEASE == "weekly" - if: $CI_PIPELINE_SOURCE == 'merge_request_event' + allow_failure: true needs: ["weekly-slow-jobs"] stage: build variables: @@ -157,6 +166,7 @@ weekly-build-test-default-valgrind: rules: - if: $RELEASE == "weekly" - if: $CI_PIPELINE_SOURCE == 'merge_request_event' + allow_failure: true needs: ["weekly-slow-jobs"] stage: build variables: @@ -172,6 +182,7 @@ weekly-build-test-optimized-valgrind: rules: - if: $RELEASE == "weekly" - if: $CI_PIPELINE_SOURCE == 'merge_request_event' + allow_failure: true needs: ["weekly-slow-jobs"] stage: build variables: @@ -187,6 +198,7 @@ weekly-build-test-takes-forever-optimized: rules: - if: $RELEASE == "weekly" - if: $CI_PIPELINE_SOURCE == 'merge_request_event' + allow_failure: true needs: ["weekly-slow-jobs"] stage: build variables: diff --git a/utils/tests/gitlab-ci-fedora.yml b/utils/tests/gitlab-ci-fedora.yml index 631399ab8..8f202fd0b 100644 --- a/utils/tests/gitlab-ci-fedora.yml +++ b/utils/tests/gitlab-ci-fedora.yml @@ -13,6 +13,7 @@ - if: $RELEASE == "weekly" - if: $FEDORA == "True" - if: $CI_PIPELINE_SOURCE == 'merge_request_event' + allow_failure: true before_script: - dnf update --assumeyes - dnf install --assumeyes @@ -39,11 +40,11 @@ weekly-fedora: - if: $FEDORA == "True" - if: $CI_PIPELINE_SOURCE == 'merge_request_event' when: manual + allow_failure: true stage: pre-build script: - echo "Starting Fedora jobs" - # Fedora 36 weekly-build-fedora-36-debug: extends: .weekly-build-fedora @@ -94,7 +95,6 @@ weekly-test-fedora-36-optimized: variables: MODE: optimized - # Fedora 37 weekly-build-fedora-37-debug: extends: .weekly-build-fedora diff --git a/utils/tests/gitlab-ci-gcc.yml b/utils/tests/gitlab-ci-gcc.yml index 9114dcf30..e441e2ce7 100644 --- a/utils/tests/gitlab-ci-gcc.yml +++ b/utils/tests/gitlab-ci-gcc.yml @@ -13,6 +13,7 @@ - if: $RELEASE == "weekly" - if: $UBUNTU == "True" - if: $CI_PIPELINE_SOURCE == 'merge_request_event' + allow_failure: true before_script: - apt update - apt upgrade -y @@ -38,6 +39,7 @@ weekly-gcc: - if: $UBUNTU == "True" - if: $CI_PIPELINE_SOURCE == 'merge_request_event' when: manual + allow_failure: true stage: pre-build script: - echo "Starting GCC jobs" diff --git a/utils/tests/gitlab-ci-ubuntu.yml b/utils/tests/gitlab-ci-ubuntu.yml index 6bbe6ba89..5fbba3a19 100644 --- a/utils/tests/gitlab-ci-ubuntu.yml +++ b/utils/tests/gitlab-ci-ubuntu.yml @@ -13,6 +13,7 @@ - if: $RELEASE == "weekly" - if: $UBUNTU == "True" - if: $CI_PIPELINE_SOURCE == 'merge_request_event' + allow_failure: true before_script: # The following ppa is needed only for Ubuntu 18.04 to install g++9 - apt update @@ -40,6 +41,7 @@ weekly-ubuntu: - if: $UBUNTU == "True" - if: $CI_PIPELINE_SOURCE == 'merge_request_event' when: manual + allow_failure: true stage: pre-build script: - echo "Starting Ubuntu jobs" diff --git a/utils/tests/gitlab-ci.yml b/utils/tests/gitlab-ci.yml index 4575a927c..14ce632aa 100644 --- a/utils/tests/gitlab-ci.yml +++ b/utils/tests/gitlab-ci.yml @@ -24,6 +24,13 @@ stages: - code-linting - documentation +workflow: + rules: + - if: $CI_PIPELINE_SOURCE == "merge_request_event" + - if: $CI_COMMIT_BRANCH && $CI_OPEN_MERGE_REQUESTS + when: never + - if: $CI_COMMIT_BRANCH + ###################### BUILD STAGE ############################################# # Defines the steps to run the tests @@ -66,7 +73,6 @@ stages: variables: CCACHE_BASEDIR_VALUE: ns-3-ccache-storage - # Weekly jobs for other distribution and compilers include: - "utils/tests/gitlab-ci-per-commit.yml"