diff --git a/client/services/serviceFetch.js b/client/services/serviceFetch.js index 2293b8875..db53b65cd 100644 --- a/client/services/serviceFetch.js +++ b/client/services/serviceFetch.js @@ -393,7 +393,21 @@ function fetchInstancesByCompose( var branchName = instance.getBranchName(); composeMasterConfig.children[branchName] = composeMasterConfig.children[branchName] || {}; var composeMasterConfigIsolationChild = composeMasterConfig.children[branchName]; - if (instance.attrs.isIsolationGroupMaster && !instance.attrs.inputClusterConfig.parentInputClusterConfigId) { + if (instance.attrs.isIsolationGroupMaster && + ( + !instance.attrs.inputClusterConfig.parentInputClusterConfigId || + instance.attrs.inputClusterConfig.parentInputClusterConfigId !== instance.attrs.inputClusterConfig._id + ) + ) { + if (composeMasterConfigIsolationChild.master) { + if (instance.attrs.isTesting) { + composeMasterConfigIsolationChild.testing = composeMasterConfigIsolationChild.testing || []; + composeMasterConfigIsolationChild.testing.push(instance); + return; + } + composeMasterConfigIsolationChild.testing = composeMasterConfigIsolationChild.testing || []; + composeMasterConfigIsolationChild.testing.push(composeMasterConfigIsolationChild.master); + } composeMasterConfigIsolationChild.master = instance; return; }