From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <sergeyb@tarantool.org>
Received: from smtp58.i.mail.ru (smtp58.i.mail.ru [217.69.128.38])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by dev.tarantool.org (Postfix) with ESMTPS id 390144696C3
 for <tarantool-patches@dev.tarantool.org>;
 Mon, 20 Apr 2020 16:23:21 +0300 (MSK)
Date: Mon, 20 Apr 2020 16:23:22 +0300
From: Sergey Bronnikov <sergeyb@tarantool.org>
Message-ID: <20200420132322.GA56040@pony.bronevichok.ru>
References: <0db7afd82e2731f7ed43a274d0f8cf70ef23a92a.1587388307.git.avtikhon@tarantool.org>
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Disposition: inline
In-Reply-To: <0db7afd82e2731f7ed43a274d0f8cf70ef23a92a.1587388307.git.avtikhon@tarantool.org>
Subject: Re: [Tarantool-patches] [PATCH v1] travis-ci/gitlab-ci: add 2.4 to
	testing
List-Id: Tarantool development patches <tarantool-patches.dev.tarantool.org>
List-Unsubscribe: <https://lists.tarantool.org/mailman/options/tarantool-patches>, 
 <mailto:tarantool-patches-request@dev.tarantool.org?subject=unsubscribe>
List-Archive: <https://lists.tarantool.org/pipermail/tarantool-patches/>
List-Post: <mailto:tarantool-patches@dev.tarantool.org>
List-Help: <mailto:tarantool-patches-request@dev.tarantool.org?subject=help>
List-Subscribe: <https://lists.tarantool.org/mailman/listinfo/tarantool-patches>, 
 <mailto:tarantool-patches-request@dev.tarantool.org?subject=subscribe>
To: "Alexander V. Tikhonov" <avtikhon@tarantool.org>
Cc: Oleg Piskunov <o.piskunov@tarantool.org>, tarantool-patches@dev.tarantool.org

LGTM

On 16:13 Mon 20 Apr , Alexander V. Tikhonov wrote:
> Added 2.4 branch to travis-ci and gitlab-ci YML
> scenario scripts to add it to its jobs.
> ---
> 
> Github: https://github.com/tarantool/tarantool/tree/avtikhon/gitlab-ci-2.4-full-ci
> 
>  .gitlab-ci.yml |  6 +++---
>  .travis.yml    | 30 +++++++++++++++---------------
>  2 files changed, 18 insertions(+), 18 deletions(-)
> 
> diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
> index fd265aa60..4718ba867 100644
> --- a/.gitlab-ci.yml
> +++ b/.gitlab-ci.yml
> @@ -10,12 +10,12 @@ variables:
>  
>  .release_only_template: &release_only_definition
>    only:
> -    - master
> +    - "2.4"
>      - /^.*-full-ci$/
>  
>  .deploy_only_template: &deploy_only_definition
>    only:
> -    - master
> +    - "2.4"
>    except:
>      - schedules
>      - external_pull_requests
> @@ -30,7 +30,7 @@ variables:
>  
>  .perf_only_template: &perf_only_definition
>    only:
> -    - master
> +    - "2.4"
>      - /^.*-perf$/
>    variables: &perf_vars_definition
>      IMAGE_PERF: "${CI_REGISTRY}/${CI_PROJECT_PATH}/perf/ubuntu-bionic:perf_master"
> diff --git a/.travis.yml b/.travis.yml
> index 3b9415def..66964297a 100644
> --- a/.travis.yml
> +++ b/.travis.yml
> @@ -36,46 +36,46 @@ jobs:
>        # Deploy targets (they also catch distro-specific problems).
>        - name: "CentOS 6 build + deploy RPM"
>          env: OS=el DIST=6
> -        if: branch = "master"
> +        if: branch = "2.4"
>        - name: "CentOS 7 build + test + deploy RPM"
>          env: OS=el DIST=7
> -        if: branch = "master"
> +        if: branch = "2.4"
>        - name: "CentOS 8 build + test + deploy RPM"
>          env: OS=el DIST=8
> -        if: branch = "master"
> +        if: branch = "2.4"
>        - name: "Fedora 28 build + test + deploy RPM"
>          env: OS=fedora DIST=28
> -        if: branch = "master"
> +        if: branch = "2.4"
>        - name: "Fedora 29 build + test + deploy RPM"
>          env: OS=fedora DIST=29
> -        if: branch = "master"
> +        if: branch = "2.4"
>        - name: "Fedora 30 build + test + deploy RPM"
>          env: OS=fedora DIST=30
> -        if: branch = "master"
> +        if: branch = "2.4"
>        - name: "Fedora 31 build + test + deploy RPM"
>          env: OS=fedora DIST=31
> -        if: branch = "master"
> +        if: branch = "2.4"
>        - name: "Ubuntu Trusty (14.04) build + deploy DEB"
>          env: OS=ubuntu DIST=trusty
> -        if: branch = "master"
> +        if: branch = "2.4"
>        - name: "Ubuntu Xenial (16.04) build + deploy DEB"
>          env: OS=ubuntu DIST=xenial
> -        if: branch = "master"
> +        if: branch = "2.4"
>        - name: "Ubuntu Bionic (18.04) build + deploy DEB"
>          env: OS=ubuntu DIST=bionic
> -        if: branch = "master"
> +        if: branch = "2.4"
>        - name: "Ubuntu Eoan (19.10) build + deploy DEB"
>          env: OS=ubuntu DIST=eoan
> -        if: branch = "master"
> +        if: branch = "2.4"
>        - name: "Debian Jessie (8) build + deploy DEB"
>          env: OS=debian DIST=jessie
> -        if: branch = "master"
> +        if: branch = "2.4"
>        - name: "Debian Stretch (9) build + deploy DEB"
>          env: OS=debian DIST=stretch
> -        if: branch = "master"
> +        if: branch = "2.4"
>        - name: "Debian Buster (10) build + deploy DEB"
>          env: OS=debian DIST=buster
> -        if: branch = "master"
> +        if: branch = "2.4"
>  
>  script:
>    - make -f .travis.mk ${TARGET}
> @@ -94,7 +94,7 @@ deploy:
>      skip_cleanup: true
>      on:
>        repo: tarantool/tarantool
> -      branch: "master"
> +      branch: "2.4"
>        condition: -n "${OS}" && -n "${DIST}" && -n "${PACKAGECLOUD_TOKEN}"
>    # Deploy packages to PackageCloud from tagged revisions
>    # https://github.com/travis-ci/travis-ci/issues/7780#issuecomment-302389370
> -- 
> 2.17.1
> 

-- 
sergeyb@