[Tarantool-patches] [PATCH v1] travis-ci/gitlab-ci: add 2.4 to testing

Alexander V. Tikhonov avtikhon at tarantool.org
Mon Apr 20 16:13:16 MSK 2020


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



More information about the Tarantool-patches mailing list