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
Branches 238-implement-coupling-for-eg masterthesis_windmueller
No related tags found
1 merge request!275ci: replace only with rules
Pipeline #423279 passed
......@@ -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:
......
......@@ -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'
......
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