diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 3854385c99b7dd7f027c0f921c1e46bb2a4aea60..f7a221c868f955a3ff7738683799966fc8253aa2 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -25,8 +25,8 @@ build-cardmech: ctest-cardmech: extends: .test_template - only: - variables: [ $TRIGGER_ORIGIN == 'mpp_pipeline' ] + rules: + - if: $TRIGGER_ORIGIN == 'mpp_pipeline' dependencies: - build-cardmech script: @@ -37,8 +37,8 @@ ctest-only-cardmech: extends: .test_template variables: JOB_PRIORITY: 'frequently' - only: - variables: [ $TRIGGER_ORIGIN != 'mpp_pipeline' && ($BENCHMARK == 'none') && ($RUN_PROJECTS == 'all') && ($JOB_PRIORITY == $PRIORITY || $JOB_PRIORITY == 'frequently') ] + rules: + - if: $TRIGGER_ORIGIN != 'mpp_pipeline' && ($BENCHMARK == 'none') && ($RUN_PROJECTS == 'all') && ($JOB_PRIORITY == $PRIORITY || $JOB_PRIORITY == 'frequently') dependencies: - build-cardmech script: diff --git a/pipeline/.cardmech-benchmark-on-horeka.yml b/pipeline/.cardmech-benchmark-on-horeka.yml index 8182cb668a9f7aea0f450cb4d456896fc3c0b71f..f6e27ded8c1b24973ab24c7b852eb01e854f1725 100644 --- a/pipeline/.cardmech-benchmark-on-horeka.yml +++ b/pipeline/.cardmech-benchmark-on-horeka.yml @@ -29,9 +29,11 @@ ellipsoid-test: .land-benchmark_on_horeka: extends: .benchmark_on_horeka - only: - variables: - - $BENCHMARK == $CI_JOB_NAME || $BENCHMARK == 'all' || $BENCHMARK == 'on-horeka' || $BENCHMARK == 'land-on-horeka' + rules: + - if: $BENCHMARK == $CI_JOB_NAME + - if: $BENCHMARK == 'all' + - if: $BENCHMARK == 'on-horeka' + - if: $BENCHMARK == 'land-on-horeka' variables: CMAKE_ARGS: '-DMPP_BUILD_TYPE=MppRelease'