Skip to content

Commit 5e9ab6a

Browse files
prashanttekriwalprashanttekriwal
committed
ET#81519 - Set weekly innovation version to 9.1.0 and remove any unused code
Change-Id: I8d4853dbed2bd8857c041bf66e5748ebd0be4243
1 parent 6434232 commit 5e9ab6a

File tree

4 files changed

+71
-14
lines changed

4 files changed

+71
-14
lines changed

‎mysql-cluster/VERSION

Lines changed: 21 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,23 @@
11
IMAGE_VERSION=1.2.16-cluster
2-
LATEST="8.4"
2+
3+
# LATEST is always set to the
4+
# current highest release, which is,
5+
# either 'innovation' or an LTS series
6+
# i.e. 9.7, or 10.7
7+
8+
LATEST="innovation"
9+
10+
11+
12+
# LATEST_LTS is set to the highest
13+
# LTS series currently being released
14+
# i.e. when 9.7 release will come it
15+
# will be set to 9.7 up till 10.7 and
16+
# then 10.7 and so on
17+
318
LATEST_LTS="8.4"
4-
LATEST_INNOVATION="9.0"
19+
20+
521

622
# The value of key should be series
723
# i.e. 8.0, 8.4, innovation, 9.7, etc.
@@ -11,11 +27,14 @@ LATEST_INNOVATION="9.0"
1127
declare -A MYSQL_CLUSTER_VERSIONS
1228
MYSQL_CLUSTER_VERSIONS["8.0"]=8.0.37
1329
MYSQL_CLUSTER_VERSIONS["8.4"]=8.4.0
30+
MYSQL_CLUSTER_VERSIONS["innovation"]=9.0.0
1431

1532
declare -A MYSQL_SHELL_VERSIONS
1633
MYSQL_SHELL_VERSIONS["8.0"]=8.0.37
1734
MYSQL_SHELL_VERSIONS["8.4"]=8.4.0
35+
MYSQL_SHELL_VERSIONS["innovation"]=9.0.0
1836

1937
declare -A FULL_SERVER_VERSIONS
2038
FULL_SERVER_VERSIONS["8.0"]="${MYSQL_CLUSTER_VERSIONS["8.0"]}-${IMAGE_VERSION}"
2139
FULL_SERVER_VERSIONS["8.4"]="${MYSQL_CLUSTER_VERSIONS["8.4"]}-${IMAGE_VERSION}"
40+
FULL_SERVER_VERSIONS["innovation"]="${MYSQL_CLUSTER_VERSIONS["innovation"]}-${IMAGE_VERSION}"

‎mysql-router/VERSION

Lines changed: 27 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,43 @@
11
IMAGE_VERSION=1.0.16-router
2-
LATEST="8.4"
2+
3+
# LATEST is always set to the
4+
# current highest release, which is,
5+
# either 'innovation' or an LTS series
6+
# i.e. 9.7, or 10.7
7+
8+
LATEST="innovation"
9+
10+
11+
12+
# LATEST_LTS is set to the highest
13+
# LTS series currently being released
14+
# i.e. when 9.7 release will come it
15+
# will be set to 9.7 up till 10.7 and
16+
# then 10.7 and so on
17+
318
LATEST_LTS="8.4"
4-
LATEST_INNOVATION="9.0"
19+
20+
21+
22+
# The value of key should be series
23+
# i.e. 8.0, 8.4, innovation, 9.7, etc.
24+
# do not use any other value for key
25+
# like 'latest-8.4' or 'lts-84', etch
526

627
declare -A MYSQL_ROUTER_VERSIONS WEEKLY_ROUTER_VERSIONS
728
MYSQL_ROUTER_VERSIONS["8.0"]=8.0.37
829
MYSQL_ROUTER_VERSIONS["8.4"]=8.4.0
30+
MYSQL_ROUTER_VERSIONS["innovation"]=9.0.0
931

1032
WEEKLY_ROUTER_VERSIONS["8.0"]=8.0.38
1133
WEEKLY_ROUTER_VERSIONS["8.4"]=8.4.1
12-
WEEKLY_ROUTER_VERSIONS["innovation"]=9.0.0
34+
WEEKLY_ROUTER_VERSIONS["innovation"]=9.1.0
1335

1436
declare -A MYSQL_SERVER_VERSIONS WEEKLY_SERVER_VERSIONS
1537
MYSQL_SERVER_VERSIONS["8.0"]=8.0.37
1638
MYSQL_SERVER_VERSIONS["8.4"]=8.4.0
39+
MYSQL_SERVER_VERSIONS["innovation"]=9.0.0
1740

1841
WEEKLY_SERVER_VERSIONS["8.0"]=8.0.38
1942
WEEKLY_SERVER_VERSIONS["8.4"]=8.4.1
20-
WEEKLY_SERVER_VERSIONS["innovation"]=9.0.0
43+
WEEKLY_SERVER_VERSIONS["innovation"]=9.1.0

‎mysql-server/VERSION

Lines changed: 23 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,43 @@
11
IMAGE_VERSION=1.2.16-server
2-
LATEST="8.4"
2+
3+
# LATEST is always set to the
4+
# current highest release, which is,
5+
# either 'innovation' or an LTS series
6+
# i.e. 9.7, or 10.7
7+
8+
LATEST="innovation"
9+
10+
11+
12+
# LATEST_LTS is set to the highest
13+
# LTS series currently being released
14+
# i.e. when 9.7 release will come it
15+
# will be set to 9.7 up till 10.7 and
16+
# then 10.7 and so on
17+
318
LATEST_LTS="8.4"
4-
LATEST_INNOVATION="9.0"
19+
20+
521

622
# The value of key should be series
723
# i.e. 8.0, 8.4, innovation, 9.7, etc.
824
# do not use any other value for key
9-
# like 'latest-8.4' or 'lts-84', etch
25+
# like 'latest-8.4' or 'lts-84', etc.
1026

1127
declare -A MYSQL_SERVER_VERSIONS WEEKLY_SERVER_VERSIONS
1228
MYSQL_SERVER_VERSIONS["8.0"]=8.0.37
1329
MYSQL_SERVER_VERSIONS["8.4"]=8.4.0
30+
MYSQL_SERVER_VERSIONS["innovation"]=9.0.0
1431

1532
WEEKLY_SERVER_VERSIONS["8.0"]=8.0.38
1633
WEEKLY_SERVER_VERSIONS["8.4"]=8.4.1
17-
WEEKLY_SERVER_VERSIONS["innovation"]=9.0.0
34+
WEEKLY_SERVER_VERSIONS["innovation"]=9.1.0
1835

1936
declare -A MYSQL_SHELL_VERSIONS WEEKLY_SHELL_VERSIONS
2037
MYSQL_SHELL_VERSIONS["8.0"]=8.0.37
2138
MYSQL_SHELL_VERSIONS["8.4"]=8.4.0
39+
MYSQL_SHELL_VERSIONS["innovation"]=9.0.0
2240

2341
WEEKLY_SHELL_VERSIONS["8.0"]=8.0.38
2442
WEEKLY_SHELL_VERSIONS["8.4"]=8.4.1
25-
WEEKLY_SHELL_VERSIONS["innovation"]=9.0.0
43+
WEEKLY_SHELL_VERSIONS["innovation"]=9.1.0

‎mysql-server/gen_dockerfiles.sh

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,6 @@ MYSQL_CONFIG_PKG="mysql80-community-release"; [ -n "${11}" ] && MYSQL_CONFIG_PKG
3535

3636
# Get the Major Version
3737
MAJOR_VERSION=${MYSQL_VERSION%.*}
38-
if [ $MAJOR_VERSION == $LATEST_INNOVATION ]; then
39-
REPO_PATH="innovation"
40-
fi
4138

4239
if [[ ${MYSQL_CONFIG_PKG_MINIMAL} =~ (community) ]]; then
4340
CONT_NAME="mysql-server"

0 commit comments

Comments
 (0)