separate config from consumer start

integration-tests/smoke/automation_test.go

@@ -140,8 +140,8 @@ func SetupAutomationBasic(t *testing.T, nodeUpgrade bool) {
 				isMercury,
 			)
 
-			for i := 0; i < len(upkeepIDs); i++ {
-				if isMercury {
+			if isMercury {
+				for i := 0; i < len(upkeepIDs); i++ {
 					// Set privilege config to enable mercury
 					privilegeConfigBytes, _ := json.Marshal(streams.UpkeepPrivilegeConfig{
 						MercuryEnabled: true,
@@ -152,8 +152,10 @@ func SetupAutomationBasic(t *testing.T, nodeUpgrade bool) {
 					}
 					l.Info().Int("Upkeep index", i).Msg("Upkeep privilege config set")
 				}
+			}
 
-				if isLogTrigger || isMercuryV02 {
+			if isLogTrigger || isMercuryV02 {
+				for i := 0; i < len(upkeepIDs); i++ {
 					if err := consumers[i].Start(); err != nil {
 						l.Error().Msg("Error when starting consumer")
 						return
@@ -1122,7 +1124,7 @@ func TestAutomationCheckPerformGasLimit(t *testing.T) {
 			}
 
 			// Upkeep should now start performing
-			l.Info().Msg("Waiting for 2m for all contracts to perform at least one upkeep after gas limit increase")
+			l.Info().Msg("Waiting for 4m for all contracts to perform at least one upkeep after gas limit increase")
 			gom.Eventually(func(g gomega.Gomega) {
 				for i := 0; i < len(upkeepIDs); i++ {
 					cnt, err := consumersPerformance[i].GetUpkeepCount(testcontext.Get(t))
@@ -1131,7 +1133,7 @@ func TestAutomationCheckPerformGasLimit(t *testing.T) {
 						"Expected consumer counter to be greater than 0, but got %d", cnt.Int64(),
 					)
 				}
-			}, "3m", "1s").Should(gomega.Succeed()) // ~1m to perform once, 1m buffer
+			}, "4m", "1s").Should(gomega.Succeed()) // ~1m to perform once, 1m buffer
 
 			// Now increase the checkGasBurn on consumer, upkeep should stop performing
 			l.Info().Msg("Increasing check gas limit for upkeeps")