Skip to content
Snippets Groups Projects
Commit c08d1e9f authored by Niklas Baumgarten's avatar Niklas Baumgarten
Browse files

Merge branch 'fixPipeline' into 'feature'

ci: replace only with rules

See merge request !275
parents 893fb242 9a83a43a
No related branches found
No related tags found
1 merge request!275ci: replace only with rules
Pipeline #423279 passed
...@@ -25,8 +25,8 @@ build-cardmech: ...@@ -25,8 +25,8 @@ build-cardmech:
ctest-cardmech: ctest-cardmech:
extends: .test_template extends: .test_template
only: rules:
variables: [ $TRIGGER_ORIGIN == 'mpp_pipeline' ] - if: $TRIGGER_ORIGIN == 'mpp_pipeline'
dependencies: dependencies:
- build-cardmech - build-cardmech
script: script:
...@@ -37,8 +37,8 @@ ctest-only-cardmech: ...@@ -37,8 +37,8 @@ ctest-only-cardmech:
extends: .test_template extends: .test_template
variables: variables:
JOB_PRIORITY: 'frequently' JOB_PRIORITY: 'frequently'
only: rules:
variables: [ $TRIGGER_ORIGIN != 'mpp_pipeline' && ($BENCHMARK == 'none') && ($RUN_PROJECTS == 'all') && ($JOB_PRIORITY == $PRIORITY || $JOB_PRIORITY == 'frequently') ] - if: $TRIGGER_ORIGIN != 'mpp_pipeline' && ($BENCHMARK == 'none') && ($RUN_PROJECTS == 'all') && ($JOB_PRIORITY == $PRIORITY || $JOB_PRIORITY == 'frequently')
dependencies: dependencies:
- build-cardmech - build-cardmech
script: script:
......
...@@ -29,9 +29,11 @@ ellipsoid-test: ...@@ -29,9 +29,11 @@ ellipsoid-test:
.land-benchmark_on_horeka: .land-benchmark_on_horeka:
extends: .benchmark_on_horeka extends: .benchmark_on_horeka
only: rules:
variables: - if: $BENCHMARK == $CI_JOB_NAME
- $BENCHMARK == $CI_JOB_NAME || $BENCHMARK == 'all' || $BENCHMARK == 'on-horeka' || $BENCHMARK == 'land-on-horeka' - if: $BENCHMARK == 'all'
- if: $BENCHMARK == 'on-horeka'
- if: $BENCHMARK == 'land-on-horeka'
variables: variables:
CMAKE_ARGS: '-DMPP_BUILD_TYPE=MppRelease' CMAKE_ARGS: '-DMPP_BUILD_TYPE=MppRelease'
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment