DF-21723 Make integration tests run again

.example.env

@@ -16,12 +16,13 @@ DEVNET_IMAGE=aptoslabs/tools:aptos-node-v1.18.0
 DEVNET_WS_PORT=8081
 DEVNET_HTTP_PORT=8080
 DEVNET_FAUCET_PORT=8081
-DEVNET_CHAIN_ID="localnet"
+DEVNET_CHAIN_ID=4
 
 # Core config
-CORE_NODE_COUNT=6
+CORE_NODE_COUNT=5
 CORE_IMAGE=chainlink-aptos
 CORE_VERSION=latest
+CORE_REPO="https://github.com/smartcontractkit/chainlink.git"
 CORE_HTTP_PORT=6688
 CORE_P2P_PORT=6690
 

.github/workflows/aptos-run-smoke-tests.yml

@@ -45,6 +45,7 @@ jobs:
     - name: Build chainlink image
       working-directory: temp/chainlink
       run: |
+        # TODO(gg): is this still needed?
         docker buildx build --build-arg COMMIT_SHA=$(git rev-parse HEAD) -t local_chainlink -f plugins/chainlink.Dockerfile .
 
     - name: Build chainlink-aptos image
@@ -111,9 +112,6 @@ jobs:
       run: |
         set -e
         cd integration-tests
-        # TODO: remove if scripts get fixed, see https://github.com/smartcontractkit/chainlink/commit/71f72665217bc17325c27109c107fb93b96e2607
-        echo "replace github.com/smartcontractkit/chainlink/core/scripts => ../temp/chainlink/core/scripts" >> go.mod
-        echo "replace github.com/smartcontractkit/chainlink/v2 => ../temp/chainlink" >> go.mod
         go mod tidy
         TEST_LOG_LEVEL=${{env.TEST_LOG_LEVEL}} go test -timeout 24h -count=1 -run TestOCR3Keystone ./smoke
 

integration-tests/deploy/deployer.go

@@ -102,6 +102,7 @@ func New(lggr *zerolog.Logger) *Deployer {
 	if err != nil {
 		panic("Could not create docker network")
 	}
+	lggr.Info().Msgf("Created docker network: %s", network)
 	return &Deployer{
 		lggr:          lggr,
 		Network:       network,
@@ -282,10 +283,12 @@ func (d *Deployer) DeployCore() error {
 		d.lggr.Info().Msg(buf.String())
 
 		dbUrl = fmt.Sprintf("postgresql://%s:%s@%s:%s/%s", d.Postgres.Config.Env["POSTGRES_USER"], d.Postgres.Config.Env["POSTGRES_PASSWORD"], d.Postgres.Config.Name, d.Postgres.Config.Ports[0], dbName)
+		d.lggr.Info().Msgf("Database URL: %s", dbUrl)
+		d.lggr.Info().Msgf("api_credentials: %s %s", coreConfig.Email, coreConfig.Password)
 		req := testcontainers.ContainerRequest{
 			Image:        coreConfig.Image,
 			ExposedPorts: coreConfig.Ports,
-			WaitingFor:   wait.ForLog("Listening and serving HTTP"),
+			WaitingFor:   wait.ForLog("Listening and serving HTTP").WithStartupTimeout(10 * time.Minute),
 			Networks:     []string{d.Network},
 			NetworkAliases: map[string][]string{
 				d.Network: {containerName},
@@ -296,6 +299,7 @@ func (d *Deployer) DeployCore() error {
 				"CL_CONFIG":            tomlString,
 				"CL_DATABASE_URL":      fmt.Sprintf("%s?sslmode=disable", dbUrl),
 				"CL_PASSWORD_KEYSTORE": "notastrongpassword",
+				"CL_EVM_CMD":           "", // Disable LOOPP mode for EVM to enable ReplayFromBlock
 			},
 			Entrypoint: []string{"bash", "-c", fmt.Sprintf("echo -e \"%s\\n%s\" > /tmp/api_credentials && chainlink node start --api /tmp/api_credentials", coreConfig.Email, coreConfig.Password)},
 		}

integration-tests/deploy/devnet.go

@@ -44,6 +44,8 @@ func (d *Deployer) DeployDevnet() error {
 			"run-local-testnet",
 			"--with-faucet",
 			"--force-restart",
+			"--test-dir",
+			"/testnet",
 			"--bind-to",
 			"0.0.0.0",
 		},

integration-tests/templates/ocr_config.json

@@ -1,9 +1,5 @@
 {
 	"OracleConfig": {
-		"MaxQueryLengthBytes": 1000000,
-		"MaxObservationLengthBytes": 1000000,
-		"MaxReportLengthBytes": 1000000,
-		"MaxRequestBatchSize": 1000,
 		"UniqueReports": true,
 		"DeltaProgressMillis": 5000,
 		"DeltaResendMillis": 5000,
@@ -13,14 +9,18 @@
 		"DeltaCertifiedCommitRequestMillis": 1000,
 		"DeltaStageMillis": 30000,
 		"MaxRoundsPerEpoch": 10,
-		"TransmissionSchedule": [
-			4
-		],
+		"TransmissionSchedule": [4],
 		"MaxDurationQueryMillis": 1000,
 		"MaxDurationObservationMillis": 1000,
-		"MaxDurationReportMillis": 1000,
-		"MaxDurationAcceptMillis": 1000,
-		"MaxDurationTransmitMillis": 1000,
-		"MaxFaultyOracles": 1
+		"MaxDurationShouldAcceptMillis": 1000,
+		"MaxDurationShouldTransmitMillis": 1000,
+		"MaxFaultyOracles": 1,
+		"ConsensusCapOffchainConfig": {
+			"MaxQueryLengthBytes": 1000000,
+			"MaxObservationLengthBytes": 1000000,
+			"MaxReportLengthBytes": 1000000,
+			"MaxBatchSize": 1000,
+			"RequestTimeout": "30s"
+		}
 	}
 }