[Tarantool-patches] [PATCH v1] bench-run: refactoring perf docker image

[Tarantool-patches] [PATCH v1] bench-run: refactoring perf docker image

[Олег Пискунов]

[-- Attachment #1: Type: text/plain, Size: 2251 bytes --]



Fix docker image for perf testing:
- Disable caching for second stage docker file creation
  for correct Tarantool and bench-run version checkout.
- bench-run repository creation moved from dockerfile
  of the first stage to the second.
 
Close #4870
---
 
Github: https://github.com/tarantool/bench-run/tree/opiskunov/gh-4870-refactor-docker-perf
Issue: https://github.com/tarantool/tarantool/issues/4870
 
 dockerfiles/ubuntu_benchs | 3 ---
 dockerfiles/ubuntu_tnt    | 3 +++
 targets.mk                | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)
 
diff --git a/dockerfiles/ubuntu_benchs b/dockerfiles/ubuntu_benchs
index fd9acb4..f5389f4 100644
--- a/dockerfiles/ubuntu_benchs
+++ b/dockerfiles/ubuntu_benchs
@@ -70,6 +70,3 @@ WORKDIR /opt/linkbench
 RUN luarocks install \
     https://raw.githubusercontent.com/tarantool/gperftools/master/rockspecs/gperftools-scm-1.rockspec \
     --local >build.log 2>&1 || ( cat build.log && false )
-
-# benchmarks runners
-RUN git clone https://github.com/tarantool/bench-run.git /opt/bench-run
diff --git a/dockerfiles/ubuntu_tnt b/dockerfiles/ubuntu_tnt
index 361e9d6..1704508 100644
--- a/dockerfiles/ubuntu_tnt
+++ b/dockerfiles/ubuntu_tnt
@@ -8,6 +8,9 @@ RUN ( cmake . -DENABLE_DIST=ON -DCMAKE_BUILD_TYPE=RelWithDebInfo >build.log 2>&1
     && make -j >>build.log 2>&1 && make install >>build.log 2>&1 ) || \
     ( cat build.log && false )
 
+# benchmarks runners
+RUN git clone https://github.com/tarantool/bench-run.git /opt/bench-run
+
 # cbench
 RUN git clone https://github.com/tarantool/cbench.git /opt/cbench
 WORKDIR /opt/cbench
diff --git a/targets.mk b/targets.mk
index 6cf36b6..581b722 100644
--- a/targets.mk
+++ b/targets.mk
@@ -21,7 +21,7 @@ prepare:
        docker push ${IMAGE_PERF}
        # build Tarantool and benchmarks with depends on Tarantool sources
        ${DOCKERFILE_BUILD} --build-arg image_from=${IMAGE_PERF} \
-               -t ${IMAGE_PERF_BUILT} -f bench-run/dockerfiles/ubuntu_tnt .
+               -t ${IMAGE_PERF_BUILT} --no-cache -f bench-run/dockerfiles/ubuntu_tnt .
        docker push ${IMAGE_PERF_BUILT}
 
 # #####################################################
--
1.8.3.1
 

[-- Attachment #2: Type: text/html, Size: 2923 bytes --]

Re: [Tarantool-patches] [PATCH v1] bench-run: refactoring perf docker image

[Alexander Tikhonov]

[-- Attachment #1: Type: text/plain, Size: 2501 bytes --]


Oleg, thanks for the patch, LGTM.

  
>Вторник, 21 апреля 2020, 15:39 +03:00 от Олег Пискунов <o.piskunov@corp.mail.ru>:
> 
>
>Fix docker image for perf testing:
>- Disable caching for second stage docker file creation
>  for correct Tarantool and bench-run version checkout.
>- bench-run repository creation moved from dockerfile
>  of the first stage to the second.
> 
>Close #4870
>---
> 
>Github:  https://github.com/tarantool/bench-run/tree/opiskunov/gh-4870-refactor-docker-perf
>Issue:  https://github.com/tarantool/tarantool/issues/4870
> 
> dockerfiles/ubuntu_benchs | 3 ---
> dockerfiles/ubuntu_tnt    | 3 +++
> targets.mk                | 2 +-
> 3 files changed, 4 insertions(+), 4 deletions(-)
> 
>diff --git a/dockerfiles/ubuntu_benchs b/dockerfiles/ubuntu_benchs
>index fd9acb4..f5389f4 100644
>--- a/dockerfiles/ubuntu_benchs
>+++ b/dockerfiles/ubuntu_benchs
>@@ -70,6 +70,3 @@ WORKDIR /opt/linkbench
> RUN luarocks install \
>      https://raw.githubusercontent.com/tarantool/gperftools/master/rockspecs/gperftools-scm-1.rockspec \
>     --local >build.log 2>&1 || ( cat build.log && false )
>-
>-# benchmarks runners
>-RUN git clone  https://github.com/tarantool/bench-run.git /opt/bench-run
>diff --git a/dockerfiles/ubuntu_tnt b/dockerfiles/ubuntu_tnt
>index 361e9d6..1704508 100644
>--- a/dockerfiles/ubuntu_tnt
>+++ b/dockerfiles/ubuntu_tnt
>@@ -8,6 +8,9 @@ RUN ( cmake . -DENABLE_DIST=ON -DCMAKE_BUILD_TYPE=RelWithDebInfo >build.log 2>&1
>     && make -j >>build.log 2>&1 && make install >>build.log 2>&1 ) || \
>     ( cat build.log && false )
> 
>+# benchmarks runners
>+RUN git clone  https://github.com/tarantool/bench-run.git /opt/bench-run
>+
> # cbench
> RUN git clone  https://github.com/tarantool/cbench.git /opt/cbench
> WORKDIR /opt/cbench
>diff --git a/targets.mk b/targets.mk
>index 6cf36b6..581b722 100644
>--- a/targets.mk
>+++ b/targets.mk
>@@ -21,7 +21,7 @@ prepare:
>        docker push ${IMAGE_PERF}
>        # build Tarantool and benchmarks with depends on Tarantool sources
>        ${DOCKERFILE_BUILD} --build-arg image_from=${IMAGE_PERF} \
>-               -t ${IMAGE_PERF_BUILT} -f bench-run/dockerfiles/ubuntu_tnt .
>+               -t ${IMAGE_PERF_BUILT} --no-cache -f bench-run/dockerfiles/ubuntu_tnt .
>        docker push ${IMAGE_PERF_BUILT}
> 
> # #####################################################
>--
>1.8.3.1
>  
 
 
--
Alexander Tikhonov
 

[-- Attachment #2: Type: text/html, Size: 4090 bytes --]

Re: [Tarantool-patches] [PATCH v1] bench-run: refactoring perf docker image

[Sergey Bronnikov]

Hi, Oleg

LGTM

On 15:39 Tue 21 Apr , Олег Пискунов wrote:
> 
> 
> Fix docker image for perf testing:
> - Disable caching for second stage docker file creation
>   for correct Tarantool and bench-run version checkout.
> - bench-run repository creation moved from dockerfile
>   of the first stage to the second.
>  
> Close #4870
> ---
>  
> Github: https://github.com/tarantool/bench-run/tree/opiskunov/gh-4870-refactor-docker-perf
> Issue: https://github.com/tarantool/tarantool/issues/4870
>  
>  dockerfiles/ubuntu_benchs | 3 ---
>  dockerfiles/ubuntu_tnt    | 3 +++
>  targets.mk                | 2 +-
>  3 files changed, 4 insertions(+), 4 deletions(-)
>  
> diff --git a/dockerfiles/ubuntu_benchs b/dockerfiles/ubuntu_benchs
> index fd9acb4..f5389f4 100644
> --- a/dockerfiles/ubuntu_benchs
> +++ b/dockerfiles/ubuntu_benchs
> @@ -70,6 +70,3 @@ WORKDIR /opt/linkbench
>  RUN luarocks install \
>      https://raw.githubusercontent.com/tarantool/gperftools/master/rockspecs/gperftools-scm-1.rockspec \
>      --local >build.log 2>&1 || ( cat build.log && false )
> -
> -# benchmarks runners
> -RUN git clone https://github.com/tarantool/bench-run.git /opt/bench-run
> diff --git a/dockerfiles/ubuntu_tnt b/dockerfiles/ubuntu_tnt
> index 361e9d6..1704508 100644
> --- a/dockerfiles/ubuntu_tnt
> +++ b/dockerfiles/ubuntu_tnt
> @@ -8,6 +8,9 @@ RUN ( cmake . -DENABLE_DIST=ON -DCMAKE_BUILD_TYPE=RelWithDebInfo >build.log 2>&1
>      && make -j >>build.log 2>&1 && make install >>build.log 2>&1 ) || \
>      ( cat build.log && false )
>  
> +# benchmarks runners
> +RUN git clone https://github.com/tarantool/bench-run.git /opt/bench-run
> +
>  # cbench
>  RUN git clone https://github.com/tarantool/cbench.git /opt/cbench
>  WORKDIR /opt/cbench
> diff --git a/targets.mk b/targets.mk
> index 6cf36b6..581b722 100644
> --- a/targets.mk
> +++ b/targets.mk
> @@ -21,7 +21,7 @@ prepare:
>         docker push ${IMAGE_PERF}
>         # build Tarantool and benchmarks with depends on Tarantool sources
>         ${DOCKERFILE_BUILD} --build-arg image_from=${IMAGE_PERF} \
> -               -t ${IMAGE_PERF_BUILT} -f bench-run/dockerfiles/ubuntu_tnt .
> +               -t ${IMAGE_PERF_BUILT} --no-cache -f bench-run/dockerfiles/ubuntu_tnt .
>         docker push ${IMAGE_PERF_BUILT}
>  
>  # #####################################################
> --
> 1.8.3.1
>  

-- 
sergeyb@