Commit b39e9997 authored by Emeric Verschuur's avatar Emeric Verschuur

[FIX] export variables to services

parent a39e458c
......@@ -35,7 +35,7 @@ job-advanced:
- tools/gitlab-ci/run.sh
job-with-volumes:
image: registry.gitlab.com/ercom/cijw4gitlab:2.0
image: registry.gitlab.com/ercom/cijw4gitlab:2.1
stage: build
only:
- /^$/
......@@ -62,7 +62,7 @@ job-test-services:
- "true"
job-test-services-ext:
image: registry.gitlab.com/ercom/cijw4gitlab:2.0
image: registry.gitlab.com/ercom/cijw4gitlab:2.1
stage: build
variables:
MYSQL_DATABASE: test
......
......@@ -271,13 +271,8 @@ gitlab_ci_variables() {
if [ "$(gitlab_ci_query -r "${node}.$k | type")" != "string" ]; then
print_critical "Invalid $node variable: $k"
fi
line="$k=$(gitlab_ci_query "${node}.$k")"
case "$k" in
GIT_SUBMODULE_STRATEGY)
eval "$line"
;;
esac
CITBX_YAML_VARIABLE_ELTS+=("$line")
eval "export $k=$(gitlab_ci_query "${node}.$k")"
CITBX_DOCKER_RUN_ARGS+=(-e "$k")
done
;;
*)
......@@ -523,11 +518,6 @@ print_cmd() {
__job_exit_code__=0
(
'
for line in "${CITBX_YAML_VARIABLE_ELTS[@]}"; do
CITBX_JOB_SCRIPT="$CITBX_JOB_SCRIPT
$line || exit \$?
"
done
gitlab_ci_script ".\"$CI_JOB_NAME\".\"before_script\"" \
|| gitlab_ci_script ".\"before_script\"" \
|| true
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment