From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <tarantool-patches-bounce@freelists.org>
Received: from localhost (localhost [127.0.0.1])
	by turing.freelists.org (Avenir Technologies Mail Multiplex) with ESMTP id 56BA523EF4
	for <tarantool-patches@freelists.org>; Sat,  6 Jul 2019 07:59:24 -0400 (EDT)
Received: from turing.freelists.org ([127.0.0.1])
	by localhost (turing.freelists.org [127.0.0.1]) (amavisd-new, port 10024)
	with ESMTP id XG5ePAAqLhbP for <tarantool-patches@freelists.org>;
	Sat,  6 Jul 2019 07:59:24 -0400 (EDT)
Received: from smtpng1.m.smailru.net (smtpng1.m.smailru.net [94.100.181.251])
	(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
	(No client certificate requested)
	by turing.freelists.org (Avenir Technologies Mail Multiplex) with ESMTPS id A003223E10
	for <tarantool-patches@freelists.org>; Sat,  6 Jul 2019 07:59:23 -0400 (EDT)
Date: Sat, 6 Jul 2019 14:59:00 +0300
From: Alexander Turenko <alexander.turenko@tarantool.org>
Subject: [tarantool-patches] Re: [PATCH v1] gitlab-ci: merge test and deploy stages
Message-ID: <20190706115900.ek5nfsy4m7amfjxj@tkn_work_nb>
References: <63679f3053e9a776f15ff64bad19ddba2d91b5e1.1562328624.git.avtikhon@tarantool.org>
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Disposition: inline
In-Reply-To: <63679f3053e9a776f15ff64bad19ddba2d91b5e1.1562328624.git.avtikhon@tarantool.org>
Sender: tarantool-patches-bounce@freelists.org
Errors-to: tarantool-patches-bounce@freelists.org
Reply-To: tarantool-patches@freelists.org
List-Help: <mailto:ecartis@freelists.org?Subject=help>
List-Unsubscribe: <mailto:tarantool-patches-request@freelists.org?Subject=unsubscribe>
List-software: Ecartis version 1.0.0
List-Id: tarantool-patches <tarantool-patches.freelists.org>
List-Subscribe: <mailto:tarantool-patches-request@freelists.org?Subject=subscribe>
List-Owner: <mailto:>
List-post: <mailto:tarantool-patches@freelists.org>
List-Archive: <http://www.freelists.org/archives/tarantool-patches>
To: "Alexander V. Tikhonov" <avtikhon@tarantool.org>
Cc: tarantool-patches@freelists.org

Pushed to master, 2.1 and 1.10.

WBR, Alexander Turenko.

On Fri, Jul 05, 2019 at 03:12:25PM +0300, Alexander V. Tikhonov wrote:
> Current results have some tests with flaky results, which
> blocks the deploy stage - decided to merge deploy stage into
> test stage temporary to fix it.
> 
> Part of #4156
> 
> ---
> 
> Github: https://github.com/tarantool/tarantool/tree/avtikhon/gh-4156-gitlab-ci-testing
> Issue: https://github.com/tarantool/tarantool/issues/4156
> 
>  .gitlab-ci.yml | 27 +++++++++++++--------------
>  1 file changed, 13 insertions(+), 14 deletions(-)
> 
> diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
> index 9d374cd61..818a84fe0 100644
> --- a/.gitlab-ci.yml
> +++ b/.gitlab-ci.yml
> @@ -1,6 +1,5 @@
>  stages:
>    - test
> -  - deploy
>  
>  variables:
>    IMAGE_TEST: "${CI_REGISTRY}/${CI_PROJECT_PATH}/testing/debian-stretch:latest"
> @@ -143,7 +142,7 @@ centos_6:
>      refs:
>        - master
>        - /^.*-full-ci$/
> -  stage: deploy
> +  stage: test
>    tags:
>      - deploy
>    variables:
> @@ -157,7 +156,7 @@ centos_7:
>      refs:
>        - master
>        - /^.*-full-ci$/
> -  stage: deploy
> +  stage: test
>    tags:
>      - deploy_test
>    variables:
> @@ -171,7 +170,7 @@ fedora_28:
>      refs:
>        - master
>        - /^.*-full-ci$/
> -  stage: deploy
> +  stage: test
>    tags:
>      - deploy_test
>    variables:
> @@ -185,7 +184,7 @@ fedora_29:
>      refs:
>        - master
>        - /^.*-full-ci$/
> -  stage: deploy
> +  stage: test
>    tags:
>      - deploy_test
>    variables:
> @@ -199,7 +198,7 @@ fedora_30:
>      refs:
>        - master
>        - /^.*-full-ci$/
> -  stage: deploy
> +  stage: test
>    tags:
>      - deploy_test
>    variables:
> @@ -213,7 +212,7 @@ ubuntu_14_04:
>      refs:
>        - master
>        - /^.*-full-ci$/
> -  stage: deploy
> +  stage: test
>    tags:
>      - deploy
>    variables:
> @@ -227,7 +226,7 @@ ubuntu_16_04:
>      refs:
>        - master
>        - /^.*-full-ci$/
> -  stage: deploy
> +  stage: test
>    tags:
>      - deploy
>    variables:
> @@ -241,7 +240,7 @@ ubuntu_18_04:
>      refs:
>        - master
>        - /^.*-full-ci$/
> -  stage: deploy
> +  stage: test
>    tags:
>      - deploy
>    variables:
> @@ -255,7 +254,7 @@ ubuntu_18_10:
>      refs:
>        - master
>        - /^.*-full-ci$/
> -  stage: deploy
> +  stage: test
>    tags:
>      - deploy
>    variables:
> @@ -269,7 +268,7 @@ ubuntu_19_04:
>      refs:
>        - master
>        - /^.*-full-ci$/
> -  stage: deploy
> +  stage: test
>    tags:
>      - deploy
>    variables:
> @@ -283,7 +282,7 @@ debian_8:
>      refs:
>        - master
>        - /^.*-full-ci$/
> -  stage: deploy
> +  stage: test
>    tags:
>      - deploy
>    variables:
> @@ -297,7 +296,7 @@ debian_9:
>      refs:
>        - master
>        - /^.*-full-ci$/
> -  stage: deploy
> +  stage: test
>    tags:
>      - deploy
>    variables:
> @@ -311,7 +310,7 @@ debian_10:
>      refs:
>        - master
>        - /^.*-full-ci$/
> -  stage: deploy
> +  stage: test
>    tags:
>      - deploy
>    variables:
> -- 
> 2.17.1
>