Skip to content
Snippets Groups Projects
Commit f2a05998 authored by Jö Fahlke's avatar Jö Fahlke
Browse files

[!73] [CI] Explicitly include the variables: in the yaml anchor merge.

Merge branch 'yaml-achors-explicit-recursive-merge' into 'master'

Merging in a yaml anchor into a substructure is not recursive, later
definitions in that substrucure will override instead of add to the
definitions from the anchor. So do include the base definitions explicitly.
This is mainly a problem with the variables: section in job definitions.

Closes: [#33]

See merge request [joe/pacxx-docker!73]

  [#33]: gitlab.dune-project.org/joe/pacxx-docker/issues/33
  [joe/pacxx-docker!73]: gitlab.dune-project.org/joe/pacxx-docker/merge_requests/73


Closes #33
parents d293ff51 731ed60f
No related branches found
No related tags found
1 merge request!73[CI] Explicitly include the variables: in the yaml anchor merge.
Pipeline #12867 passed
......@@ -319,7 +319,7 @@ samples-build-cuda-make-release:
.test: &test
stage: test
variables:
variables: &test-variables
GIT_STRATEGY: none
PACXX_FORCE_DEFAULT_RT: 1
before_script:
......@@ -336,6 +336,7 @@ test-native-norv-debug:
tags:
- hpc2seci
variables:
<<: *test-variables
PACXX_DEFAULT_RT: 1 # native
PACXX_DISABLE_RV: 1 # disable region vectorizer
script:
......@@ -353,6 +354,7 @@ test-native-norv-release:
tags:
- hpc2seci
variables:
<<: *test-variables
PACXX_DEFAULT_RT: 1 # native
PACXX_DISABLE_RV: 1 # disable region vectorizer
script:
......@@ -368,6 +370,7 @@ test-native-rv-debug:
tags:
- hpc2seci
variables:
<<: *test-variables
PACXX_DEFAULT_RT: 1 # native
script:
- ctest -j$(nproc) -LE '^rv-debug-(known-failure|slow)$' --output-on-failure
......@@ -384,6 +387,7 @@ test-native-rv-release:
tags:
- hpc2seci
variables:
<<: *test-variables
PACXX_DEFAULT_RT: 1 # native
script:
- ctest -j$(nproc) -LE '^rv-release-known-failure$' --output-on-failure
......@@ -398,6 +402,7 @@ test-cuda-debug:
tags:
- hpc2seci-nvidia
variables:
<<: *test-variables
PACXX_DEFAULT_RT: 0 # Cuda
script:
- ctest -j$(nproc) -LE '^cuda-debug-(known-failure|slow)$' --output-on-failure
......@@ -414,6 +419,7 @@ test-cuda-release:
tags:
- hpc2seci-nvidia
variables:
<<: *test-variables
PACXX_DEFAULT_RT: 0 # Cuda
script:
- ctest -j$(nproc) -LE '^cuda-release-known-failure$' --output-on-failure
......
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