Test helpers working using changesets

deployment/ccip/changeset/cs_ccip_home.go

@@ -283,7 +283,7 @@ func (a AddDonAndSetCandidateChangesetConfig) Validate(e deployment.Environment,
 			return fmt.Errorf("fetch don id for chain: %w", err)
 		}
 		if donID != 0 {
-			return fmt.Errorf("don already exists in CR for chain %d, it has id %d", a.DONChainSelector, donID)
+			return fmt.Errorf("don already exists in CR for chain %d, it has id %d", chainSelector, donID)
 		}
 	}
 

deployment/ccip/changeset/test_environment.go

@@ -451,6 +451,18 @@ func NewEnvironmentWithJobsAndContracts(t *testing.T, tc *TestConfigs, tEnv Test
 				},
 			},
 		},
+		{
+			// Add the commit/exec OCR instances for the new chains.
+			Changeset: commonchangeset.WrapChangeSet(SetCandidateChangeset),
+			Config: SetCandidateChangesetConfig{
+				SetCandidateConfigBase{
+					HomeChainSelector: e.HomeChainSel,
+					FeedChainSelector: e.FeedChainSel,
+					DONChainSelector:  ocrConfigs,
+					PluginType:        types.PluginTypeCCIPExec,
+				},
+			},
+		},
 		{
 			// Promote everything
 			Changeset: commonchangeset.WrapChangeSet(PromoteAllCandidatesChangeset),