handle blank TTL (#234)

.gitignore

@@ -60,8 +60,7 @@ core/web/assets
 # Integration Tests
 integration-tests/**/logs/
 integration-tests/**/tmp_*
-integration-tests/**/testconfig/**/override.toml
-integration-tests/**/testconfig/**/**.env
+integration-tests/**/testconfig/override/**.env
 tests-*.xml
 *.test
 tmp-manifest-*.yaml

integration-tests/ccip-tests/Makefile

@@ -1,50 +1,53 @@
 ## To Override the default config,
-# example usage: make override_config overrideconfig="" override_toml=../config/config.toml env=../.env
+# example usage: make override_config overridestring="" override_toml=../config/config.toml env=../.env
 .PHONY: override_config
 override_config:
 	cd ./testconfig/override && \
-	go run . --overridewith=$(overrideconfig) --path=$(override_toml) --output=$(env) && \
+	go run . --overridewith=$(overridestring) --path=$(override_toml) --output=$(env) && \
 	cd ../..
 
+
 # example usage: make test_load_ccip_simulated_k8 image=chainlink-ccip tag=latest testimage=chainlink-ccip-tests:latest testname=TestLoadCCIPStableRequestTriggeringWithNetworkChaos
-.PHONY: test_load_ccip_simulated_k8
-test_load_ccip_simulated_k8:override_config
+.PHONY: test_load_ccip
+include test-config.env
+test_load_ccip:
 	source ./testconfig/override/$(env) && \
     CHAINLINK_IMAGE=$(image)  \
     CHAINLINK_VERSION=$(tag)  \
     ENV_JOB_IMAGE=$(testimage)  \
+    TEST_SUITE=load \
+    TEST_ARGS="-test.timeout 900h" \
+    DETACH_RUNNER=true \
 	go test -timeout 24h -count=1 -v -run ^$(testname)$$ ./load
 
 
-# example usage: make test_load_ccip_simulated_k8 image=chainlink-ccip tag=latest testimage=chainlink-ccip-tests:latest
-.PHONY: test_load_ccip_testnet_k8
+# example usage: make test_smoke_ccip image=chainlink-ccip tag=latest testimage=chainlink-ccip-tests:latest testname=TestSmokeCCIPForBidirectionalLane overridestring="" override_toml=../config/config.toml env=test-config.env
+.PHONY: test_smoke_ccip
 include test-config.env
-overrideconfig := "CCIP.Env.Networks = ['SEPOLIA', 'OPTIMISM_GOERLI', 'ARBITRUM_GOERLI', 'AVALANCHE_FUJI', 'BSC_TESTNET', 'MUMBAI', 'BASE_GOERLI]"
-override overrideconfig += "CCIP.Groups.load.NodeFunding = 10"
-test_load_ccip_testnet_k8: override_config
+test_smoke_ccip: override_config
 	source ./testconfig/override/$(env) && \
     CHAINLINK_IMAGE=$(image)  \
     CHAINLINK_VERSION=$(tag)  \
     ENV_JOB_IMAGE=$(testimage)  \
-	go test -timeout 24h -count=1 -v -run ^TestLoadCCIPStableRPS$$ ./load
-
-# example usage: make test_smoke_ccip_simulated_local image=chainlink-ccip tag=latest testname=TestSmokeCCIPForBidirectionalLane override_toml=../config/config.toml env=test-config.env
-.PHONY: test_smoke_ccip_simulated_local
-include test-config.env
-test_smoke_ccip_simulated_local: override_config
-	source ./testconfig/override/$(env) && \
-    CHAINLINK_IMAGE=$(image)  \
-    CHAINLINK_VERSION=$(tag)  \
-    ENV_JOB_IMAGE=""  \
+    TEST_SUITE=smoke \
+    TEST_ARGS="-test.timeout 900h" \
+    DETACH_RUNNER=true \
 	go test -timeout 24h -count=1 -v -run ^$(testname)$$ ./smoke
 
 # example usage: make test_smoke_ccip_simulated_local_besu image=chainlink-ccip tag=latest override_toml=../config/config.toml env=test-config.env
 .PHONY: test_smoke_ccip_simulated_local_besu
 include test-config.env
-overrideconfig := "CCIP.Env.Networks = ['SIMULATED_BESU_NONDEV_1', 'SIMULATED_BESU_NONDEV_2']"
+overridestring := "CCIP.Env.Networks = ['SIMULATED_BESU_NONDEV_1', 'SIMULATED_BESU_NONDEV_2']"
 test_smoke_ccip_simulated_local_besu: override_config
 	source ./testconfig/override/$(env) && \
   	CHAINLINK_IMAGE=$(image)  \
   	CHAINLINK_VERSION=$(tag)  \
     ENV_JOB_IMAGE=""  \
 	go test -timeout 24h -count=1 -v -run ^TestSmokeCCIPForBidirectionalLane$$ ./smoke
+
+# image: the name for the chainlink image being built, example: image=chainlink
+# tag: the tag for the chainlink image being built, example: tag=latest
+# example usage: make build_ccip_image image=chainlink-ccip tag=latest
+.PHONY: build_ccip_image
+build_ccip_image:
+	docker build -f ../../core/chainlink.Dockerfile --build-arg COMMIT_SHA=$(git rev-parse HEAD) --build-arg CHAINLINK_USER=chainlink -t $(image):$(tag) ../../