From 46fe95954ab219eb6e15f8933bfe56799d335e42 Mon Sep 17 00:00:00 2001 From: shonge Date: Wed, 28 Aug 2019 10:35:13 +0800 Subject: [PATCH 1/6] Upgrade default TiDB version to v3.0.2 --- charts/tidb-cluster/values.yaml | 14 +++++++------- charts/tidb-drainer/values.yaml | 4 ++-- charts/tidb-lightning/values.yaml | 2 +- deploy/aliyun/variables.tf | 2 +- deploy/aws/clusters.tf | 2 +- deploy/aws/variables.tf | 2 +- deploy/gcp/variables.tf | 2 +- deploy/modules/aws/tidb-cluster/variables.tf | 2 +- deploy/modules/gcp/tidb-cluster/variables.tf | 2 +- .../share/tidb-cluster-release/variables.tf | 2 +- images/tidb-operator-e2e/tidb-cluster-values.yaml | 12 ++++++------ tests/config.go | 2 +- tests/manifests/e2e/e2e.yaml | 2 +- 13 files changed, 25 insertions(+), 25 deletions(-) diff --git a/charts/tidb-cluster/values.yaml b/charts/tidb-cluster/values.yaml index 11ac0ae81f..fd16502f8a 100644 --- a/charts/tidb-cluster/values.yaml +++ b/charts/tidb-cluster/values.yaml @@ -61,7 +61,7 @@ pd: location-labels = ["region", "zone", "rack", "host"] replicas: 3 - image: pingcap/pd:v3.0.1 + image: pingcap/pd:v3.0.2 # storageClassName is a StorageClass provides a way for administrators to describe the "classes" of storage they offer. # different classes might map to quality-of-service levels, or to backup policies, # or to arbitrary policies determined by the cluster administrators. @@ -193,7 +193,7 @@ tikv: # capacity = "1GB" replicas: 3 - image: pingcap/tikv:v3.0.1 + image: pingcap/tikv:v3.0.2 # storageClassName is a StorageClass provides a way for administrators to describe the "classes" of storage they offer. # different classes might map to quality-of-service levels, or to backup policies, # or to arbitrary policies determined by the cluster administrators. @@ -258,7 +258,7 @@ tidb: # initSql is the SQL statements executed after the TiDB cluster is bootstrapped. # initSql: |- # create database app; - image: pingcap/tidb:v3.0.1 + image: pingcap/tidb:v3.0.2 # Image pull policy. imagePullPolicy: IfNotPresent @@ -335,7 +335,7 @@ monitor: storageClassName: local-storage storage: 10Gi initializer: - image: pingcap/tidb-monitor-initializer:v3.0.1 + image: pingcap/tidb-monitor-initializer:v3.0.2 imagePullPolicy: IfNotPresent reloader: create: true @@ -397,7 +397,7 @@ binlog: pump: create: false replicas: 1 - image: pingcap/tidb-binlog:v3.0.1 + image: pingcap/tidb-binlog:v3.0.2 imagePullPolicy: IfNotPresent logLevel: info # storageClassName is a StorageClass provides a way for administrators to describe the "classes" of storage they offer. @@ -432,7 +432,7 @@ binlog: drainer: create: false - image: pingcap/tidb-binlog:v3.0.1 + image: pingcap/tidb-binlog:v3.0.2 imagePullPolicy: IfNotPresent logLevel: info # storageClassName is a StorageClass provides a way for administrators to describe the "classes" of storage they offer. @@ -556,7 +556,7 @@ scheduledBackup: importer: create: false - image: pingcap/tidb-lightning:v3.0.1 + image: pingcap/tidb-lightning:v3.0.2 imagePullPolicy: IfNotPresent storageClassName: local-storage storage: 200Gi diff --git a/charts/tidb-drainer/values.yaml b/charts/tidb-drainer/values.yaml index 602e5f0b49..b65e8594f3 100644 --- a/charts/tidb-drainer/values.yaml +++ b/charts/tidb-drainer/values.yaml @@ -4,7 +4,7 @@ # clusterName is the TiDB cluster name that should backup from or restore to. clusterName: demo -clusterVersion: v3.0.1 +clusterVersion: v3.0.2 baseImage: pingcap/tidb-binlog imagePullPolicy: IfNotPresent @@ -49,4 +49,4 @@ nodeSelector: {} tolerations: [] -affinity: {} \ No newline at end of file +affinity: {} diff --git a/charts/tidb-lightning/values.yaml b/charts/tidb-lightning/values.yaml index ba9cb5ec2d..ca40249e7e 100644 --- a/charts/tidb-lightning/values.yaml +++ b/charts/tidb-lightning/values.yaml @@ -2,7 +2,7 @@ # This is a YAML-formatted file. # Declare variables to be passed into your templates. -image: pingcap/tidb-lightning:v3.0.1 +image: pingcap/tidb-lightning:v3.0.2 imagePullPolicy: IfNotPresent service: type: NodePort diff --git a/deploy/aliyun/variables.tf b/deploy/aliyun/variables.tf index e9c48b304c..c0b260691a 100644 --- a/deploy/aliyun/variables.tf +++ b/deploy/aliyun/variables.tf @@ -30,7 +30,7 @@ variable "cluster_name" { variable "tidb_version" { description = "TiDB cluster version" - default = "v3.0.1" + default = "v3.0.2" } variable "tidb_cluster_chart_version" { description = "tidb-cluster chart version" diff --git a/deploy/aws/clusters.tf b/deploy/aws/clusters.tf index 011279289d..e4418312f8 100644 --- a/deploy/aws/clusters.tf +++ b/deploy/aws/clusters.tf @@ -24,7 +24,7 @@ provider "helm" { # # # NOTE: cluster_name cannot be changed after creation # cluster_name = "demo-cluster" -# cluster_version = "v3.0.1" +# cluster_version = "v3.0.2" # ssh_key_name = module.key-pair.key_name # pd_count = 1 # pd_instance_type = "t2.xlarge" diff --git a/deploy/aws/variables.tf b/deploy/aws/variables.tf index 4f91a8bfe3..e7d3ddb647 100644 --- a/deploy/aws/variables.tf +++ b/deploy/aws/variables.tf @@ -80,7 +80,7 @@ variable "bastion_instance_type" { # For aws tutorials compatiablity variable "default_cluster_version" { - default = "v3.0.1" + default = "v3.0.2" } variable "default_cluster_pd_count" { diff --git a/deploy/gcp/variables.tf b/deploy/gcp/variables.tf index e0fb83a1d7..d9ee377227 100644 --- a/deploy/gcp/variables.tf +++ b/deploy/gcp/variables.tf @@ -24,7 +24,7 @@ variable "node_locations" { variable "tidb_version" { description = "TiDB version" - default = "v3.0.1" + default = "v3.0.2" } variable "tidb_operator_version" { diff --git a/deploy/modules/aws/tidb-cluster/variables.tf b/deploy/modules/aws/tidb-cluster/variables.tf index 1d5e5c937f..8f97a92212 100644 --- a/deploy/modules/aws/tidb-cluster/variables.tf +++ b/deploy/modules/aws/tidb-cluster/variables.tf @@ -15,7 +15,7 @@ variable "cluster_name" { variable "cluster_version" { type = string - default = "v3.0.1" + default = "v3.0.2" } variable "ssh_key_name" { diff --git a/deploy/modules/gcp/tidb-cluster/variables.tf b/deploy/modules/gcp/tidb-cluster/variables.tf index ac30cac957..af4450433e 100644 --- a/deploy/modules/gcp/tidb-cluster/variables.tf +++ b/deploy/modules/gcp/tidb-cluster/variables.tf @@ -1,7 +1,7 @@ variable "cluster_name" {} variable "cluster_version" { description = "The TiDB cluster version" - default = "v3.0.1" + default = "v3.0.2" } variable "tidb_cluster_chart_version" { description = "The TiDB cluster chart version" diff --git a/deploy/modules/share/tidb-cluster-release/variables.tf b/deploy/modules/share/tidb-cluster-release/variables.tf index f0f3046cd7..3beafaea07 100644 --- a/deploy/modules/share/tidb-cluster-release/variables.tf +++ b/deploy/modules/share/tidb-cluster-release/variables.tf @@ -15,7 +15,7 @@ variable "cluster_name" { variable "cluster_version" { type = string - default = "v3.0.1" + default = "v3.0.2" } variable "pd_count" { diff --git a/images/tidb-operator-e2e/tidb-cluster-values.yaml b/images/tidb-operator-e2e/tidb-cluster-values.yaml index 993afcd209..569ea80d39 100644 --- a/images/tidb-operator-e2e/tidb-cluster-values.yaml +++ b/images/tidb-operator-e2e/tidb-cluster-values.yaml @@ -36,7 +36,7 @@ discovery: pd: replicas: 3 - image: pingcap/pd:v3.0.1 + image: pingcap/pd:v3.0.2 imagePullPolicy: IfNotPresent logLevel: info # storageClassName is a StorageClass provides a way for administrators to describe the "classes" of storage they offer. @@ -81,7 +81,7 @@ pd: tikv: replicas: 3 - image: pingcap/tikv:v3.0.1 + image: pingcap/tikv:v3.0.2 imagePullPolicy: IfNotPresent logLevel: info # storageClassName is a StorageClass provides a way for administrators to describe the "classes" of storage they offer. @@ -133,7 +133,7 @@ tidb: # initSql is the SQL statements executed after the TiDB cluster is bootstrapped. # initSql: |- # create database app; - image: pingcap/tidb:v3.0.1 + image: pingcap/tidb:v3.0.2 imagePullPolicy: IfNotPresent logLevel: info resources: @@ -221,7 +221,7 @@ monitor: fullbackup: create: false - binlogImage: pingcap/tidb-binlog:v3.0.1 + binlogImage: pingcap/tidb-binlog:v3.0.2 binlogImagePullPolicy: IfNotPresent # https://github.com/tennix/tidb-cloud-backup mydumperImage: pingcap/tidb-cloud-backup:20190610 @@ -262,7 +262,7 @@ binlog: pump: create: false replicas: 1 - image: pingcap/tidb-binlog:v3.0.1 + image: pingcap/tidb-binlog:v3.0.2 imagePullPolicy: IfNotPresent logLevel: info # storageClassName is a StorageClass provides a way for administrators to describe the "classes" of storage they offer. @@ -279,7 +279,7 @@ binlog: drainer: create: false - image: pingcap/tidb-binlog:v3.0.1 + image: pingcap/tidb-binlog:v3.0.2 imagePullPolicy: IfNotPresent logLevel: info # storageClassName is a StorageClass provides a way for administrators to describe the "classes" of storage they offer. diff --git a/tests/config.go b/tests/config.go index 284834ef05..06204aec7a 100644 --- a/tests/config.go +++ b/tests/config.go @@ -78,7 +78,7 @@ func NewConfig() (*Config, error) { flag.StringVar(&cfg.configFile, "config", "", "Config file") flag.StringVar(&cfg.LogDir, "log-dir", "/logDir", "log directory") flag.IntVar(&cfg.FaultTriggerPort, "fault-trigger-port", 23332, "the http port of fault trigger service") - flag.StringVar(&cfg.TidbVersions, "tidb-versions", "v3.0.0-rc.1,v3.0.0-rc.2,v3.0.1", "tidb versions") + flag.StringVar(&cfg.TidbVersions, "tidb-versions", "v3.0.1,v3.0.2", "tidb versions") flag.StringVar(&cfg.OperatorTag, "operator-tag", "master", "operator tag used to choose charts") flag.StringVar(&cfg.OperatorImage, "operator-image", "pingcap/tidb-operator:latest", "operator image") flag.StringVar(&cfg.UpgradeOperatorTag, "upgrade-operator-tag", "", "upgrade operator tag used to choose charts") diff --git a/tests/manifests/e2e/e2e.yaml b/tests/manifests/e2e/e2e.yaml index 4b0de454a4..88c612f327 100644 --- a/tests/manifests/e2e/e2e.yaml +++ b/tests/manifests/e2e/e2e.yaml @@ -48,7 +48,7 @@ spec: - /usr/local/bin/e2e - --operator-tag=e2e - --operator-image=pingcap/tidb-operator:latest - - --tidb-versions=v3.0.0-beta.1,v3.0.1 + - --tidb-versions=v3.0.1,v3.0.2 - --chart-dir=/charts volumeMounts: - mountPath: /logDir From 8275ee44830d72e82dd6f1e90c0be9bb5cb999ab Mon Sep 17 00:00:00 2001 From: Song Date: Wed, 28 Aug 2019 10:55:47 +0800 Subject: [PATCH 2/6] Update tests/config.go add tidb-version v3.0.0 test support Co-Authored-By: weekface --- tests/config.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/config.go b/tests/config.go index 06204aec7a..7aac97eb07 100644 --- a/tests/config.go +++ b/tests/config.go @@ -78,7 +78,7 @@ func NewConfig() (*Config, error) { flag.StringVar(&cfg.configFile, "config", "", "Config file") flag.StringVar(&cfg.LogDir, "log-dir", "/logDir", "log directory") flag.IntVar(&cfg.FaultTriggerPort, "fault-trigger-port", 23332, "the http port of fault trigger service") - flag.StringVar(&cfg.TidbVersions, "tidb-versions", "v3.0.1,v3.0.2", "tidb versions") + flag.StringVar(&cfg.TidbVersions, "tidb-versions", "v3.0.0,v3.0.1,v3.0.2", "tidb versions") flag.StringVar(&cfg.OperatorTag, "operator-tag", "master", "operator tag used to choose charts") flag.StringVar(&cfg.OperatorImage, "operator-image", "pingcap/tidb-operator:latest", "operator image") flag.StringVar(&cfg.UpgradeOperatorTag, "upgrade-operator-tag", "", "upgrade operator tag used to choose charts") From 0b335488d1af5ae491139c703502feb04b49030c Mon Sep 17 00:00:00 2001 From: shonge Date: Tue, 8 Oct 2019 15:16:33 +0800 Subject: [PATCH 3/6] Upgrade default TiDB version to v3.0.4 --- charts/tidb-cluster/values.yaml | 14 +++++++------- charts/tidb-drainer/values.yaml | 2 +- charts/tidb-lightning/values.yaml | 2 +- deploy/aliyun/variables.tf | 2 +- deploy/aws/clusters.tf | 2 +- deploy/aws/variables.tf | 2 +- deploy/gcp/examples/tidb-customized.tfvars | 2 +- deploy/gcp/variables.tf | 2 +- deploy/modules/gcp/tidb-cluster/variables.tf | 2 +- 9 files changed, 15 insertions(+), 15 deletions(-) diff --git a/charts/tidb-cluster/values.yaml b/charts/tidb-cluster/values.yaml index fd16502f8a..ccc144353c 100644 --- a/charts/tidb-cluster/values.yaml +++ b/charts/tidb-cluster/values.yaml @@ -61,7 +61,7 @@ pd: location-labels = ["region", "zone", "rack", "host"] replicas: 3 - image: pingcap/pd:v3.0.2 + image: pingcap/pd:v3.0.4 # storageClassName is a StorageClass provides a way for administrators to describe the "classes" of storage they offer. # different classes might map to quality-of-service levels, or to backup policies, # or to arbitrary policies determined by the cluster administrators. @@ -193,7 +193,7 @@ tikv: # capacity = "1GB" replicas: 3 - image: pingcap/tikv:v3.0.2 + image: pingcap/tikv:v3.0.4 # storageClassName is a StorageClass provides a way for administrators to describe the "classes" of storage they offer. # different classes might map to quality-of-service levels, or to backup policies, # or to arbitrary policies determined by the cluster administrators. @@ -258,7 +258,7 @@ tidb: # initSql is the SQL statements executed after the TiDB cluster is bootstrapped. # initSql: |- # create database app; - image: pingcap/tidb:v3.0.2 + image: pingcap/tidb:v3.0.4 # Image pull policy. imagePullPolicy: IfNotPresent @@ -335,7 +335,7 @@ monitor: storageClassName: local-storage storage: 10Gi initializer: - image: pingcap/tidb-monitor-initializer:v3.0.2 + image: pingcap/tidb-monitor-initializer:v3.0.4 imagePullPolicy: IfNotPresent reloader: create: true @@ -397,7 +397,7 @@ binlog: pump: create: false replicas: 1 - image: pingcap/tidb-binlog:v3.0.2 + image: pingcap/tidb-binlog:v3.0.4 imagePullPolicy: IfNotPresent logLevel: info # storageClassName is a StorageClass provides a way for administrators to describe the "classes" of storage they offer. @@ -432,7 +432,7 @@ binlog: drainer: create: false - image: pingcap/tidb-binlog:v3.0.2 + image: pingcap/tidb-binlog:v3.0.4 imagePullPolicy: IfNotPresent logLevel: info # storageClassName is a StorageClass provides a way for administrators to describe the "classes" of storage they offer. @@ -556,7 +556,7 @@ scheduledBackup: importer: create: false - image: pingcap/tidb-lightning:v3.0.2 + image: pingcap/tidb-lightning:v3.0.4 imagePullPolicy: IfNotPresent storageClassName: local-storage storage: 200Gi diff --git a/charts/tidb-drainer/values.yaml b/charts/tidb-drainer/values.yaml index b65e8594f3..d2a3fe6293 100644 --- a/charts/tidb-drainer/values.yaml +++ b/charts/tidb-drainer/values.yaml @@ -4,7 +4,7 @@ # clusterName is the TiDB cluster name that should backup from or restore to. clusterName: demo -clusterVersion: v3.0.2 +clusterVersion: v3.0.4 baseImage: pingcap/tidb-binlog imagePullPolicy: IfNotPresent diff --git a/charts/tidb-lightning/values.yaml b/charts/tidb-lightning/values.yaml index ca40249e7e..3aa2b85524 100644 --- a/charts/tidb-lightning/values.yaml +++ b/charts/tidb-lightning/values.yaml @@ -2,7 +2,7 @@ # This is a YAML-formatted file. # Declare variables to be passed into your templates. -image: pingcap/tidb-lightning:v3.0.2 +image: pingcap/tidb-lightning:v3.0.4 imagePullPolicy: IfNotPresent service: type: NodePort diff --git a/deploy/aliyun/variables.tf b/deploy/aliyun/variables.tf index c0b260691a..394cca4a23 100644 --- a/deploy/aliyun/variables.tf +++ b/deploy/aliyun/variables.tf @@ -30,7 +30,7 @@ variable "cluster_name" { variable "tidb_version" { description = "TiDB cluster version" - default = "v3.0.2" + default = "v3.0.4" } variable "tidb_cluster_chart_version" { description = "tidb-cluster chart version" diff --git a/deploy/aws/clusters.tf b/deploy/aws/clusters.tf index e4418312f8..edfb768eff 100644 --- a/deploy/aws/clusters.tf +++ b/deploy/aws/clusters.tf @@ -24,7 +24,7 @@ provider "helm" { # # # NOTE: cluster_name cannot be changed after creation # cluster_name = "demo-cluster" -# cluster_version = "v3.0.2" +# cluster_version = "v3.0.4" # ssh_key_name = module.key-pair.key_name # pd_count = 1 # pd_instance_type = "t2.xlarge" diff --git a/deploy/aws/variables.tf b/deploy/aws/variables.tf index e7d3ddb647..67fe7a5919 100644 --- a/deploy/aws/variables.tf +++ b/deploy/aws/variables.tf @@ -80,7 +80,7 @@ variable "bastion_instance_type" { # For aws tutorials compatiablity variable "default_cluster_version" { - default = "v3.0.2" + default = "v3.0.4" } variable "default_cluster_pd_count" { diff --git a/deploy/gcp/examples/tidb-customized.tfvars b/deploy/gcp/examples/tidb-customized.tfvars index a1a525ba3e..25d3e89927 100644 --- a/deploy/gcp/examples/tidb-customized.tfvars +++ b/deploy/gcp/examples/tidb-customized.tfvars @@ -3,7 +3,7 @@ tikv_instance_type = "n1-highmem-4" tidb_instance_type = "n1-standard-8" # specify tidb version -tidb_version = "3.0.2" +tidb_version = "3.0.4" # override tidb cluster values override_values = < Date: Tue, 8 Oct 2019 15:25:43 +0800 Subject: [PATCH 4/6] Upgrade default TiDB version to v3.0.4 --- deploy/modules/aws/tidb-cluster/variables.tf | 2 +- .../modules/share/tidb-cluster-release/variables.tf | 2 +- images/tidb-operator-e2e/tidb-cluster-values.yaml | 12 ++++++------ tests/config.go | 2 +- tests/manifests/e2e/e2e.yaml | 2 +- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/deploy/modules/aws/tidb-cluster/variables.tf b/deploy/modules/aws/tidb-cluster/variables.tf index 8f97a92212..e7bcce1577 100644 --- a/deploy/modules/aws/tidb-cluster/variables.tf +++ b/deploy/modules/aws/tidb-cluster/variables.tf @@ -15,7 +15,7 @@ variable "cluster_name" { variable "cluster_version" { type = string - default = "v3.0.2" + default = "v3.0.4" } variable "ssh_key_name" { diff --git a/deploy/modules/share/tidb-cluster-release/variables.tf b/deploy/modules/share/tidb-cluster-release/variables.tf index 3beafaea07..061dc5bc40 100644 --- a/deploy/modules/share/tidb-cluster-release/variables.tf +++ b/deploy/modules/share/tidb-cluster-release/variables.tf @@ -15,7 +15,7 @@ variable "cluster_name" { variable "cluster_version" { type = string - default = "v3.0.2" + default = "v3.0.4" } variable "pd_count" { diff --git a/images/tidb-operator-e2e/tidb-cluster-values.yaml b/images/tidb-operator-e2e/tidb-cluster-values.yaml index 569ea80d39..4631b94367 100644 --- a/images/tidb-operator-e2e/tidb-cluster-values.yaml +++ b/images/tidb-operator-e2e/tidb-cluster-values.yaml @@ -36,7 +36,7 @@ discovery: pd: replicas: 3 - image: pingcap/pd:v3.0.2 + image: pingcap/pd:v3.0.4 imagePullPolicy: IfNotPresent logLevel: info # storageClassName is a StorageClass provides a way for administrators to describe the "classes" of storage they offer. @@ -81,7 +81,7 @@ pd: tikv: replicas: 3 - image: pingcap/tikv:v3.0.2 + image: pingcap/tikv:v3.0.4 imagePullPolicy: IfNotPresent logLevel: info # storageClassName is a StorageClass provides a way for administrators to describe the "classes" of storage they offer. @@ -133,7 +133,7 @@ tidb: # initSql is the SQL statements executed after the TiDB cluster is bootstrapped. # initSql: |- # create database app; - image: pingcap/tidb:v3.0.2 + image: pingcap/tidb:v3.0.4 imagePullPolicy: IfNotPresent logLevel: info resources: @@ -221,7 +221,7 @@ monitor: fullbackup: create: false - binlogImage: pingcap/tidb-binlog:v3.0.2 + binlogImage: pingcap/tidb-binlog:v3.0.4 binlogImagePullPolicy: IfNotPresent # https://github.com/tennix/tidb-cloud-backup mydumperImage: pingcap/tidb-cloud-backup:20190610 @@ -262,7 +262,7 @@ binlog: pump: create: false replicas: 1 - image: pingcap/tidb-binlog:v3.0.2 + image: pingcap/tidb-binlog:v3.0.4 imagePullPolicy: IfNotPresent logLevel: info # storageClassName is a StorageClass provides a way for administrators to describe the "classes" of storage they offer. @@ -279,7 +279,7 @@ binlog: drainer: create: false - image: pingcap/tidb-binlog:v3.0.2 + image: pingcap/tidb-binlog:v3.0.4 imagePullPolicy: IfNotPresent logLevel: info # storageClassName is a StorageClass provides a way for administrators to describe the "classes" of storage they offer. diff --git a/tests/config.go b/tests/config.go index 7aac97eb07..bd4f75484a 100644 --- a/tests/config.go +++ b/tests/config.go @@ -78,7 +78,7 @@ func NewConfig() (*Config, error) { flag.StringVar(&cfg.configFile, "config", "", "Config file") flag.StringVar(&cfg.LogDir, "log-dir", "/logDir", "log directory") flag.IntVar(&cfg.FaultTriggerPort, "fault-trigger-port", 23332, "the http port of fault trigger service") - flag.StringVar(&cfg.TidbVersions, "tidb-versions", "v3.0.0,v3.0.1,v3.0.2", "tidb versions") + flag.StringVar(&cfg.TidbVersions, "tidb-versions", "v3.0.0,v3.0.1,v3.0.2,v3.0.3,v3.0.4", "tidb versions") flag.StringVar(&cfg.OperatorTag, "operator-tag", "master", "operator tag used to choose charts") flag.StringVar(&cfg.OperatorImage, "operator-image", "pingcap/tidb-operator:latest", "operator image") flag.StringVar(&cfg.UpgradeOperatorTag, "upgrade-operator-tag", "", "upgrade operator tag used to choose charts") diff --git a/tests/manifests/e2e/e2e.yaml b/tests/manifests/e2e/e2e.yaml index 88c612f327..516b2ebd21 100644 --- a/tests/manifests/e2e/e2e.yaml +++ b/tests/manifests/e2e/e2e.yaml @@ -48,7 +48,7 @@ spec: - /usr/local/bin/e2e - --operator-tag=e2e - --operator-image=pingcap/tidb-operator:latest - - --tidb-versions=v3.0.1,v3.0.2 + - --tidb-versions=v3.0.1,v3.0.2,v3.0.3,v3.0.4 - --chart-dir=/charts volumeMounts: - mountPath: /logDir From 3dd24ab5d7f89289ca66b77961b3cdc68f6f74d3 Mon Sep 17 00:00:00 2001 From: Song Date: Wed, 9 Oct 2019 13:47:40 +0800 Subject: [PATCH 5/6] Update tests/config.go tests support v3.0.2-3.0.4 Co-Authored-By: weekface --- tests/config.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/config.go b/tests/config.go index b91cf2944c..c17d129af1 100644 --- a/tests/config.go +++ b/tests/config.go @@ -83,7 +83,7 @@ func NewConfig() (*Config, error) { flag.StringVar(&cfg.configFile, "config", "", "Config file") flag.StringVar(&cfg.LogDir, "log-dir", "/logDir", "log directory") flag.IntVar(&cfg.FaultTriggerPort, "fault-trigger-port", 23332, "the http port of fault trigger service") - flag.StringVar(&cfg.TidbVersions, "tidb-versions", "v3.0.0,v3.0.1,v3.0.2,v3.0.3,v3.0.4", "tidb versions") + flag.StringVar(&cfg.TidbVersions, "tidb-versions", "v3.0.2,v3.0.3,v3.0.4", "tidb versions") flag.StringVar(&cfg.OperatorTag, "operator-tag", "master", "operator tag used to choose charts") flag.StringVar(&cfg.OperatorImage, "operator-image", "pingcap/tidb-operator:latest", "operator image") flag.StringVar(&cfg.UpgradeOperatorTag, "upgrade-operator-tag", "", "upgrade operator tag used to choose charts") From 9e4902c45994fbdc136eeaeed5c27e9eb4c7111d Mon Sep 17 00:00:00 2001 From: Song Date: Wed, 9 Oct 2019 13:49:03 +0800 Subject: [PATCH 6/6] Update tests/manifests/e2e/e2e.yaml e2e test support v3.0.2-v3.0.4 Co-Authored-By: weekface --- tests/manifests/e2e/e2e.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/manifests/e2e/e2e.yaml b/tests/manifests/e2e/e2e.yaml index 39229c14e7..9079240e77 100644 --- a/tests/manifests/e2e/e2e.yaml +++ b/tests/manifests/e2e/e2e.yaml @@ -48,7 +48,7 @@ spec: - /usr/local/bin/e2e - --operator-tag=e2e - --operator-image=pingcap/tidb-operator:latest - - --tidb-versions=v3.0.1,v3.0.2,v3.0.3,v3.0.4 + - --tidb-versions=v3.0.2,v3.0.3,v3.0.4 - --chart-dir=/charts volumeMounts: - mountPath: /logDir