[Tarantool-patches] [PATCH v1] Correct cleanup gitlab-ci for perf jobs

[Tarantool-patches] [PATCH v1] Correct cleanup gitlab-ci for perf jobs

[Alexander V. Tikhonov]

Found that some perf jobs were forgot to be updated with local cleanup
routine as was done for the other jobs at commit:

  892a188bc56dc7052bcbe082607a83aa73f28c5b "Correct cleanup gitlab-ci"

Follows up #5036
---

Github: https://github.com/tarantool/tarantool/tree/avtikhon/gitlab-ci-perf-cleanup
Issue: https://github.com/tarantool/tarantool/issues/5036

 .gitlab-ci.yml | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 65b2fb126..6cf1aab3d 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -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
 
@@ -204,6 +205,7 @@ perf_bootstrap:
   stage: test
   tags:
     - deploy
+  <<: *shell_cleanup_script
   script:
     - ${GITLAB_MAKE} perf_prepare
   after_script:
-- 
2.17.1

Re: [Tarantool-patches] [PATCH v1] Correct cleanup gitlab-ci for perf jobs

[Alexander Turenko]

(I would add 'gitlab-ci:' prefix for such commits.)

It seems, we should clean the workspace before any job, because some
other job may leave a workspace dirty? Are all jobs have this action
after the commit?

Anyway, I don't mind. Feel free to ask Kirill to push it.

WBR, Alexander Turenko.

On Sat, Jun 27, 2020 at 01:16:04PM +0300, Alexander V. Tikhonov wrote:
> Found that some perf jobs were forgot to be updated with local cleanup
> routine as was done for the other jobs at commit:
> 
>   892a188bc56dc7052bcbe082607a83aa73f28c5b "Correct cleanup gitlab-ci"
> 
> Follows up #5036
> ---
> 
> Github: https://github.com/tarantool/tarantool/tree/avtikhon/gitlab-ci-perf-cleanup
> Issue: https://github.com/tarantool/tarantool/issues/5036

Re: [Tarantool-patches] [PATCH v1] Correct cleanup gitlab-ci for perf jobs

[Kirill Yukhin]

Hello,

On 27 июн 13:16, Alexander V. Tikhonov wrote:
> Found that some perf jobs were forgot to be updated with local cleanup
> routine as was done for the other jobs at commit:
> 
>   892a188bc56dc7052bcbe082607a83aa73f28c5b "Correct cleanup gitlab-ci"
> 
> Follows up #5036
> ---
> 
> Github: https://github.com/tarantool/tarantool/tree/avtikhon/gitlab-ci-perf-cleanup
> Issue: https://github.com/tarantool/tarantool/issues/5036

I've checked your patch into 1.10, 2.3, 2.4 and master.

--
Regards, Kirill Yukhin