From 0502fffc8c03e011995064001ec0229589ba81e1 Mon Sep 17 00:00:00 2001
From: "Alexander V. Tikhonov" <avtikhon@tarantool.org>
Date: Thu, 22 Oct 2020 22:32:54 +0300
Subject: [PATCH] gitlab-ci: update tags/branches and bump versions

Set to manual build of the old tagged images.

Added new tags with manual builds:
1.10.8: 1.10.8-0-g2f18757b7
2.4.3: 2.4.3-0-g5180d98f1
2.5.2: 2.5.2-1-gf63c43b9a
2.6.1: 2.6.1-0-gcfe0d1a55
2.7.0: 2.7.0-1-g1ad696c09

Bumped branches:
2.3: 2.3.3-2-g7eea3a6cb
2.4: 2.4.3-1-g986fab717
2.5: 2.5.2-1-gf63c43b9a
2.6: 2.6.1-0-gcfe0d1a55

Updated stable images:
*1.x: 1.10.8-1-ge69e13015
*2.x: 2.5.2-0-g05730d326
---
 .gitlab-ci.yml             | 89 +++++++++++++++++++++++++++++++++++++-
 versions/alpine_3.9_1.10.8 |  1 +
 versions/alpine_3.9_1.x    |  2 +-
 versions/alpine_3.9_2.3    |  2 +-
 versions/alpine_3.9_2.4    |  2 +-
 versions/alpine_3.9_2.4.3  |  1 +
 versions/alpine_3.9_2.5    |  2 +-
 versions/alpine_3.9_2.5.2  |  1 +
 versions/alpine_3.9_2.6    |  1 +
 versions/alpine_3.9_2.6.1  |  1 +
 versions/alpine_3.9_2.7.0  |  1 +
 versions/alpine_3.9_2.x    |  2 +-
 versions/centos_7_1.x      |  2 +-
 versions/centos_7_2.x      |  2 +-
 14 files changed, 101 insertions(+), 8 deletions(-)
 create mode 100644 versions/alpine_3.9_1.10.8
 create mode 100644 versions/alpine_3.9_2.4.3
 create mode 100644 versions/alpine_3.9_2.5.2
 create mode 100644 versions/alpine_3.9_2.6
 create mode 100644 versions/alpine_3.9_2.6.1
 create mode 100644 versions/alpine_3.9_2.7.0

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b3d7c64..3ac5e30 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -35,6 +35,7 @@ before_script:
 
 'alpine 3.5 1.10.0':
   <<: *build_definition
+  when: manual
   variables:
     OS: 'alpine'
     DIST: '3.5'
@@ -45,6 +46,7 @@ before_script:
 
 'alpine 3.5 1.10.1':
   <<: *build_definition
+  when: manual
   variables:
     OS: 'alpine'
     DIST: '3.5'
@@ -55,6 +57,7 @@ before_script:
 
 'alpine 3.5 1.10.2':
   <<: *build_definition
+  when: manual
   variables:
     OS: 'alpine'
     DIST: '3.5'
@@ -65,6 +68,7 @@ before_script:
 
 'alpine 3.5 1.10.3':
   <<: *build_definition
+  when: manual
   variables:
     OS: 'alpine'
     DIST: '3.5'
@@ -75,6 +79,7 @@ before_script:
 
 'alpine 3.9 1.10.4':
   <<: *build_definition
+  when: manual
   variables:
     OS: 'alpine'
     DIST: '3.9'
@@ -86,6 +91,7 @@ before_script:
 
 'alpine 3.9 1.10.5':
   <<: *build_definition
+  when: manual
   variables:
     OS: 'alpine'
     DIST: '3.9'
@@ -97,6 +103,7 @@ before_script:
 
 'alpine 3.9 1.10.6':
   <<: *build_definition
+  when: manual
   variables:
     OS: 'alpine'
     DIST: '3.9'
@@ -108,6 +115,7 @@ before_script:
 
 'alpine 3.9 1.10.7':
   <<: *build_definition
+  when: manual
   variables:
     OS: 'alpine'
     DIST: '3.9'
@@ -116,6 +124,17 @@ before_script:
     PORT: 5107
     ROCKS_INSTALLER: 'luarocks'
 
+'alpine 3.9 1.10.8':
+  <<: *build_definition
+  when: manual
+  variables:
+    OS: 'alpine'
+    DIST: '3.9'
+    TAG: '1.10.8'
+    VER: '1.10.8'
+    PORT: 5108
+    ROCKS_INSTALLER: 'luarocks'
+
 'alpine 3.9 1.x':
   <<: *build_definition
   variables:
@@ -130,6 +149,7 @@ before_script:
 
 'alpine 3.5 2.1.0':
   <<: *build_definition
+  when: manual
   variables:
     OS: 'alpine'
     DIST: '3.5'
@@ -140,6 +160,7 @@ before_script:
 
 'alpine 3.5 2.1.1':
   <<: *build_definition
+  when: manual
   variables:
     OS: 'alpine'
     DIST: '3.5'
@@ -150,6 +171,7 @@ before_script:
 
 'alpine 3.5 2.1.2':
   <<: *build_definition
+  when: manual
   variables:
     OS: 'alpine'
     DIST: '3.5'
@@ -160,6 +182,7 @@ before_script:
 
 'alpine 3.9 2.1.3':
   <<: *build_definition
+  when: manual
   variables:
     OS: 'alpine'
     DIST: '3.9'
@@ -184,6 +207,7 @@ before_script:
 
 'alpine 3.5 2.2.0':
   <<: *build_definition
+  when: manual
   variables:
     OS: 'alpine'
     DIST: '3.5'
@@ -194,6 +218,7 @@ before_script:
 
 'alpine 3.5 2.2.1':
   <<: *build_definition
+  when: manual
   variables:
     OS: 'alpine'
     DIST: '3.5'
@@ -203,6 +228,7 @@ before_script:
 
 'alpine 3.9 2.2.2':
   <<: *build_definition
+  when: manual
   variables:
     OS: 'alpine'
     DIST: '3.9'
@@ -212,6 +238,7 @@ before_script:
 
 'alpine 3.9 2.2.3':
   <<: *build_definition
+  when: manual
   variables:
     OS: 'alpine'
     DIST: '3.9'
@@ -232,6 +259,7 @@ before_script:
 
 'alpine 3.5 2.3.0':
   <<: *build_definition
+  when: manual
   variables:
     OS: 'alpine'
     DIST: '3.5'
@@ -241,6 +269,7 @@ before_script:
 
 'alpine 3.9 2.3.1':
   <<: *build_definition
+  when: manual
   variables:
     OS: 'alpine'
     DIST: '3.9'
@@ -250,6 +279,7 @@ before_script:
 
 'alpine 3.9 2.3.2':
   <<: *build_definition
+  when: manual
   variables:
     OS: 'alpine'
     DIST: '3.9'
@@ -259,6 +289,7 @@ before_script:
 
 'alpine 3.9 2.3.3':
   <<: *build_definition
+  when: manual
   variables:
     OS: 'alpine'
     DIST: '3.9'
@@ -279,6 +310,7 @@ before_script:
 
 'alpine 3.9 2.4.0':
   <<: *build_definition
+  when: manual
   variables:
     OS: 'alpine'
     DIST: '3.9'
@@ -288,6 +320,7 @@ before_script:
 
 'alpine 3.9 2.4.1':
   <<: *build_definition
+  when: manual
   variables:
     OS: 'alpine'
     DIST: '3.9'
@@ -297,6 +330,7 @@ before_script:
 
 'alpine 3.9 2.4.2':
   <<: *build_definition
+  when: manual
   variables:
     OS: 'alpine'
     DIST: '3.9'
@@ -304,6 +338,16 @@ before_script:
     VER: '2.4.2'
     PORT: 5242
 
+'alpine 3.9 2.4.3':
+  <<: *build_definition
+  when: manual
+  variables:
+    OS: 'alpine'
+    DIST: '3.9'
+    TAG: '2.4.3'
+    VER: '2.4.3'
+    PORT: 5243
+
 'alpine 3.9 2.4':
   <<: *build_definition
   variables:
@@ -317,6 +361,7 @@ before_script:
 
 'alpine 3.9 2.5.0':
   <<: *build_definition
+  when: manual
   variables:
     OS: 'alpine'
     DIST: '3.9'
@@ -326,6 +371,7 @@ before_script:
 
 'alpine 3.9 2.5.1':
   <<: *build_definition
+  when: manual
   variables:
     OS: 'alpine'
     DIST: '3.9'
@@ -333,6 +379,16 @@ before_script:
     VER: '2.5.1'
     PORT: 5252
 
+'alpine 3.9 2.5.2':
+  <<: *build_definition
+  when: manual
+  variables:
+    OS: 'alpine'
+    DIST: '3.9'
+    TAG: '2.5.2'
+    VER: '2.5.2'
+    PORT: 5253
+
 'alpine 3.9 2.5':
   <<: *build_definition
   variables:
@@ -342,10 +398,11 @@ before_script:
     VER: '2.5'
     PORT: 5250
 
-# Tarantool branch master
+# Tarantool branch 2.6
 
 'alpine 3.9 2.6.0':
   <<: *build_definition
+  when: manual
   variables:
     OS: 'alpine'
     DIST: '3.9'
@@ -353,6 +410,36 @@ before_script:
     VER: '2.6.0'
     PORT: 5260
 
+'alpine 3.9 2.6.1':
+  <<: *build_definition
+  when: manual
+  variables:
+    OS: 'alpine'
+    DIST: '3.9'
+    TAG: '2.6.1'
+    VER: '2.6.1'
+    PORT: 5261
+
+'alpine 3.9 2.6':
+  <<: *build_definition
+  variables:
+    OS: 'alpine'
+    DIST: '3.9'
+    TAG: '2.6'
+    VER: '2.6'
+    PORT: 5269
+
+# Tarantool branch master
+
+'alpine 3.9 2.7':
+  <<: *build_definition
+  variables:
+    OS: 'alpine'
+    DIST: '3.9'
+    TAG: '2.7'
+    VER: '2.7'
+    PORT: 5279
+
 'alpine 3.9 2.x':
   <<: *build_definition
   variables:
diff --git a/versions/alpine_3.9_1.10.8 b/versions/alpine_3.9_1.10.8
new file mode 100644
index 0000000..ec84c5b
--- /dev/null
+++ b/versions/alpine_3.9_1.10.8
@@ -0,0 +1 @@
+1.10.8-0-g2f18757b7
diff --git a/versions/alpine_3.9_1.x b/versions/alpine_3.9_1.x
index 05ce5b6..1dd86be 100644
--- a/versions/alpine_3.9_1.x
+++ b/versions/alpine_3.9_1.x
@@ -1 +1 @@
-1.10.7-1-gb93a33ab2
+1.10.8-1-ge69e13015
diff --git a/versions/alpine_3.9_2.3 b/versions/alpine_3.9_2.3
index 99fbc53..1ca9a1f 100644
--- a/versions/alpine_3.9_2.3
+++ b/versions/alpine_3.9_2.3
@@ -1 +1 @@
-2.3.3-1-g43af95e77
+2.3.3-2-g7eea3a6cb
diff --git a/versions/alpine_3.9_2.4 b/versions/alpine_3.9_2.4
index ecb3f3d..b17eaf1 100644
--- a/versions/alpine_3.9_2.4
+++ b/versions/alpine_3.9_2.4
@@ -1 +1 @@
-2.4.2-1-g3f00d29f9
+2.4.3-1-g986fab717
diff --git a/versions/alpine_3.9_2.4.3 b/versions/alpine_3.9_2.4.3
new file mode 100644
index 0000000..c60bf40
--- /dev/null
+++ b/versions/alpine_3.9_2.4.3
@@ -0,0 +1 @@
+2.4.3-0-g5180d98f1
diff --git a/versions/alpine_3.9_2.5 b/versions/alpine_3.9_2.5
index 3b51d80..0f47b6e 100644
--- a/versions/alpine_3.9_2.5
+++ b/versions/alpine_3.9_2.5
@@ -1 +1 @@
-2.5.1-1-g635f6e507
+2.5.2-1-gf63c43b9a
diff --git a/versions/alpine_3.9_2.5.2 b/versions/alpine_3.9_2.5.2
new file mode 100644
index 0000000..c55bc39
--- /dev/null
+++ b/versions/alpine_3.9_2.5.2
@@ -0,0 +1 @@
+2.5.2-0-g05730d326
diff --git a/versions/alpine_3.9_2.6 b/versions/alpine_3.9_2.6
new file mode 100644
index 0000000..8f67fcd
--- /dev/null
+++ b/versions/alpine_3.9_2.6
@@ -0,0 +1 @@
+2.6.1-0-gcfe0d1a55
diff --git a/versions/alpine_3.9_2.6.1 b/versions/alpine_3.9_2.6.1
new file mode 100644
index 0000000..8f67fcd
--- /dev/null
+++ b/versions/alpine_3.9_2.6.1
@@ -0,0 +1 @@
+2.6.1-0-gcfe0d1a55
diff --git a/versions/alpine_3.9_2.7.0 b/versions/alpine_3.9_2.7.0
new file mode 100644
index 0000000..fe66789
--- /dev/null
+++ b/versions/alpine_3.9_2.7.0
@@ -0,0 +1 @@
+2.7.0-1-g1ad696c09
diff --git a/versions/alpine_3.9_2.x b/versions/alpine_3.9_2.x
index f0a6664..c55bc39 100644
--- a/versions/alpine_3.9_2.x
+++ b/versions/alpine_3.9_2.x
@@ -1 +1 @@
-2.4.2-0-gcccd89701
+2.5.2-0-g05730d326
diff --git a/versions/centos_7_1.x b/versions/centos_7_1.x
index 05ce5b6..1dd86be 100644
--- a/versions/centos_7_1.x
+++ b/versions/centos_7_1.x
@@ -1 +1 @@
-1.10.7-1-gb93a33ab2
+1.10.8-1-ge69e13015
diff --git a/versions/centos_7_2.x b/versions/centos_7_2.x
index f0a6664..c55bc39 100644
--- a/versions/centos_7_2.x
+++ b/versions/centos_7_2.x
@@ -1 +1 @@
-2.4.2-0-gcccd89701
+2.5.2-0-g05730d326