Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe
Commits:
-
c81c4a29
by Tony CHEMIT at 2017-04-14T09:57:53+02:00
1 changed file:
Changes:
| ... | ... | @@ -18,10 +18,8 @@ stages: |
| 18 | 18 |
- ssh-add <(echo "$SSH_PRIVATE_KEY")
|
| 19 | 19 |
- mkdir -p ~/.ssh
|
| 20 | 20 |
- '[[ -f /.dockerenv ]] && echo -e "Host *\n\tStrictHostKeyChecking no\n\n" > ~/.ssh/config'
|
| 21 |
- - git config --global user.name $GITLAB_USER_ID
|
|
| 22 |
- - git config --global user.email $GITLAB_USER_EMAIL
|
|
| 23 | 21 |
- (cd ~ ; git clone ssh://git@gitlab.com/ultreiaio/env.git)
|
| 24 |
- - . ~/env/bin/prepare-env.sh
|
|
| 22 |
+ - . ~/env/bin/prepare-env.sh "$GITLAB_USER_ID" "$GITLAB_USER_EMAIL"
|
|
| 25 | 23 |
|
| 26 | 24 |
.before_script_clone: &before_script_clone
|
| 27 | 25 |
before_script:
|
| ... | ... | @@ -30,10 +28,8 @@ stages: |
| 30 | 28 |
- ssh-add <(echo "$SSH_PRIVATE_KEY")
|
| 31 | 29 |
- mkdir -p ~/.ssh
|
| 32 | 30 |
- '[[ -f /.dockerenv ]] && echo -e "Host *\n\tStrictHostKeyChecking no\n\n" > ~/.ssh/config'
|
| 33 |
- - git config --global user.name $GITLAB_USER_ID
|
|
| 34 |
- - git config --global user.email $GITLAB_USER_EMAIL
|
|
| 35 | 31 |
- (cd ~ ; git clone ssh://git@gitlab.com/ultreiaio/env.git)
|
| 36 |
- - . ~/env/bin/prepare-env-with-clone.sh "$CI_PROJECT_PATH" "$CI_PROJECT_NAME"
|
|
| 32 |
+ - . ~/env/bin/prepare-env-with-clone.sh "$CI_PROJECT_PATH" "$CI_PROJECT_NAME" "$GITLAB_USER_ID" "$GITLAB_USER_EMAIL"
|
|
| 37 | 33 |
|
| 38 | 34 |
.env_test: &env_test
|
| 39 | 35 |
environment:
|