Merge 1192c69 into 9c22e67

.github/workflows/integrate-cluster-cmd.yaml

@@ -61,6 +61,9 @@ jobs:
           export PATH=$PATH:$GOPATH/bin
           make build_integration_test
 
+      - uses: KengoTODA/actions-setup-docker-compose@v1
+        with:
+          version: '2.14.2'
       - name: Build the docker-compose stack
         working-directory: ${{ env.working-directory }}
         # with --dev the first run will fail for unknow reason, just retry it and will success now..

.github/workflows/integrate-cluster-scale.yaml

@@ -61,6 +61,9 @@ jobs:
           export PATH=$PATH:$GOPATH/bin
           make build_integration_test
 
+      - uses: KengoTODA/actions-setup-docker-compose@v1
+        with:
+          version: '2.14.2'
       - name: Build the docker-compose stack
         working-directory: ${{ env.working-directory }}
         # with --dev the first run will fail for unknow reason, just retry it and will success now..

.github/workflows/integrate-dm.yaml

@@ -62,6 +62,9 @@ jobs:
           make build_integration_test
           make tiup
 
+      - uses: KengoTODA/actions-setup-docker-compose@v1
+        with:
+          version: '2.14.2'
       - name: Build the docker-compose stack
         working-directory: ${{ env.working-directory }}
         # with --dev the first run will fail for unknow reason, just retry it and will success now..

pkg/cluster/spec/parse_topology_test.go

@@ -540,6 +540,37 @@ tiflash_servers:
 	})
 }
 
+func (s *topoSuite) TestMergeComponentVersions(c *check.C) {
+	// test component version overwrite
+	with2TempFile(`
+component_versions:
+  tidb: v8.0.0
+  tikv: v8.0.0
+tidb_servers:
+  - host: 172.16.5.139
+`, `
+component_versions:
+  tikv: v8.1.0
+  pd: v8.0.0
+tidb_servers:
+  - host: 172.16.5.134
+`, func(base, scale string) {
+		baseTopo := Specification{}
+		c.Assert(ParseTopologyYaml(base, &baseTopo), check.IsNil)
+
+		scaleTopo := baseTopo.NewPart()
+		c.Assert(ParseTopologyYaml(scale, scaleTopo), check.IsNil)
+
+		mergedTopo := baseTopo.MergeTopo(scaleTopo)
+		c.Assert(mergedTopo.Validate(), check.IsNil)
+
+		c.Assert(scaleTopo.(*Specification).ComponentVersions, check.Equals, mergedTopo.(*Specification).ComponentVersions)
+		c.Assert(scaleTopo.(*Specification).ComponentVersions.TiDB, check.Equals, "v8.0.0")
+		c.Assert(scaleTopo.(*Specification).ComponentVersions.TiKV, check.Equals, "v8.1.0")
+		c.Assert(scaleTopo.(*Specification).ComponentVersions.PD, check.Equals, "v8.0.0")
+	})
+}
+
 func (s *topoSuite) TestFixRelativePath(c *check.C) {
 	// base test
 	topo := Specification{

pkg/cluster/spec/spec.go

@@ -270,9 +270,10 @@ type UpgradableMetadata interface {
 // NewPart implements ScaleOutTopology interface.
 func (s *Specification) NewPart() Topology {
 	return &Specification{
-		GlobalOptions:    s.GlobalOptions,
-		MonitoredOptions: s.MonitoredOptions,
-		ServerConfigs:    s.ServerConfigs,
+		GlobalOptions:     s.GlobalOptions,
+		MonitoredOptions:  s.MonitoredOptions,
+		ServerConfigs:     s.ServerConfigs,
+		ComponentVersions: s.ComponentVersions,
 	}
 }