Skip to content

Commit

Permalink
Correct cleanup gitlab-ci for perf jobs
Browse files Browse the repository at this point in the history
Found that some perf jobs were forgot to be updated with local cleanup
routine as was done for the other jobs at commit:

  892a188 "Correct cleanup gitlab-ci"

Follows up #5036

(cherry picked from commit 27ee938)
  • Loading branch information
avtikhon authored and kyukhin committed Jul 3, 2020
1 parent ae9ad0c commit 8a6404a
Showing 1 changed file with 7 additions and 5 deletions.
12 changes: 7 additions & 5 deletions .gitlab-ci.yml
Expand Up @@ -5,7 +5,7 @@ stages:

variables:
GITLAB_MAKE: "make -f .gitlab.mk"
GIT_CLEAN_COMMAND: "git clean -ffdx -e packpack && git submodule foreach git clean -ffdx && git submodule foreach git status"
GIT_CLEAN_COMMAND: "git clean -ffdx && git submodule foreach git clean -ffdx && git submodule foreach git status"
GIT_CLEAN_FLAGS: none

.shell_before_script_template: &shell_cleanup_script
Expand Down Expand Up @@ -118,10 +118,11 @@ variables:
- ${GITLAB_MAKE} perf_run

.perf_cleanup_definition: &perf_cleanup_definition
<<: *perf_only_definition
stage: cleanup
script:
- ${GITLAB_MAKE} perf_cleanup
<<: *perf_only_definition
stage: cleanup
<<: *shell_cleanup_script
script:
- ${GITLAB_MAKE} perf_cleanup

# Tests

Expand Down Expand Up @@ -204,6 +205,7 @@ perf_bootstrap:
stage: test
tags:
- deploy
<<: *shell_cleanup_script
script:
- ${GITLAB_MAKE} perf_prepare
after_script:
Expand Down

0 comments on commit 8a6404a

Please sign in to comment.