From 73adb7e7d7eaa53148f2f6d7c4e42b5a2d7abfe7 Mon Sep 17 00:00:00 2001 From: Matthew Slipper Date: Wed, 13 Aug 2025 17:18:43 -0600 Subject: [PATCH 1/5] ci: Add fixes for develop jobs --- .circleci/config.yml | 30 ++++++++++++++++++++++++++++-- Makefile | 4 +++- 2 files changed, 31 insertions(+), 3 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index d2695bf8c94..e1239cedd9f 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -2087,6 +2087,7 @@ workflows: go-release-op-deployer: jobs: + - initialize - contracts-bedrock-build: name: build-contracts-go-release-op-deployer filters: @@ -2097,6 +2098,8 @@ workflows: build_args: --skip test context: - circleci-repo-readonly-authenticated-github-token + requires: + - initialize - go-release: filters: tags: @@ -2112,6 +2115,7 @@ workflows: go-release-op-up: jobs: + - initialize - contracts-bedrock-build: name: build-contracts-go-release-op-up filters: @@ -2122,6 +2126,8 @@ workflows: build_args: --skip test context: - circleci-repo-readonly-authenticated-github-token + requires: + - initialize - go-release: filters: tags: @@ -2148,6 +2154,9 @@ workflows: only: /^(da-server|cannon|ufm-[a-z0-9\-]*|op-[a-z0-9\-]*)\/v.*/ branches: ignore: /.*/ + - initialize: + requires: + - hold # Standard (medium) cross-platform docker images go here - docker-build: matrix: @@ -2181,7 +2190,7 @@ workflows: context: - oplabs-gcr-release requires: - - hold + - initialize # Checks for cross-platform images go here - check-cross-platform: matrix: @@ -2228,13 +2237,14 @@ workflows: ignore: /.*/ context: - circleci-repo-readonly-authenticated-github-token + requires: + - initialize - publish-cannon-prestates: context: - circleci-repo-readonly-authenticated-github-token - slack - oplabs-network-optimism-io-bucket requires: - - hold - cannon-prestate filters: tags: @@ -2276,9 +2286,12 @@ workflows: - equal: [true, <>] - equal: ["api",<< pipeline.trigger_source >>] jobs: + - initialize - cannon-prestate: context: - circleci-repo-readonly-authenticated-github-token + requires: + - initialize - cannon-stf-verify: context: - slack @@ -2288,6 +2301,8 @@ workflows: context: - slack - circleci-repo-readonly-authenticated-github-token + requires: + - initialize - go-tests-with-fault-proof-deps: name: op-e2e-cannon-tests notify: true @@ -2435,12 +2450,17 @@ workflows: - equal: [true, <>] - equal: ["api",<< pipeline.trigger_source >>] jobs: + - initialize - contracts-bedrock-build: # needed for sysgo tests context: - circleci-repo-readonly-authenticated-github-token + requires: + - initialize - cannon-prestate-quick: # needed for sysgo tests context: - circleci-repo-readonly-authenticated-github-token + requires: + - initialize # IN-PROCESS (base) - op-acceptance-tests: # Acceptance Testing params @@ -2465,6 +2485,8 @@ workflows: context: - circleci-repo-readonly-authenticated-github-token - discord + requires: + - initialize # KURTOSIS (Isthmus) - op-acceptance-tests: # Acceptance Testing params @@ -2476,6 +2498,8 @@ workflows: context: - circleci-repo-readonly-authenticated-github-token - discord + requires: + - initialize # KURTOSIS (Interop) - op-acceptance-tests: # Acceptance Testing params @@ -2487,6 +2511,8 @@ workflows: context: - circleci-repo-readonly-authenticated-github-token - discord + requires: + - initialize # Generate flaky test report - generate-flaky-report: name: generate-flaky-tests-report diff --git a/Makefile b/Makefile index 7148bbd1d9d..d228d9f92fe 100644 --- a/Makefile +++ b/Makefile @@ -244,7 +244,9 @@ endef define CI_ENV_VARS export OP_TESTLOG_FILE_LOGGER_OUTDIR=$$(realpath ./tmp/testlogs) && \ export SEPOLIA_RPC_URL="https://ci-sepolia-l1-archive.optimism.io" && \ -export MAINNET_RPC_URL="https://ci-mainnet-l1-archive.optimism.io" +export MAINNET_RPC_URL="https://ci-mainnet-l1-archive.optimism.io" && \ +export NAT_INTEROP_LOADTEST_TARGET=10 && \ +export NAT_INTEROP_LOADTEST_TIMEOUT=30s endef # Test timeout (can be overridden via environment) From fe80c37630e0d415b94a6c883a042419b64372e0 Mon Sep 17 00:00:00 2001 From: Matthew Slipper Date: Wed, 13 Aug 2025 17:21:56 -0600 Subject: [PATCH 2/5] filter --- .circleci/config.yml | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index e1239cedd9f..705aaa06982 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -2087,7 +2087,12 @@ workflows: go-release-op-deployer: jobs: - - initialize + - initialize: + filters: + tags: + only: /^op-deployer.*/ + branches: + ignore: /.*/ - contracts-bedrock-build: name: build-contracts-go-release-op-deployer filters: @@ -2115,7 +2120,12 @@ workflows: go-release-op-up: jobs: - - initialize + - initialize: + filters: + tags: + only: /^op-deployer.*/ + branches: + ignore: /.*/ - contracts-bedrock-build: name: build-contracts-go-release-op-up filters: From 0b201c394ed063b4a39d81f2cb17576cac5afdf6 Mon Sep 17 00:00:00 2001 From: Matthew Slipper Date: Wed, 13 Aug 2025 22:03:39 -0600 Subject: [PATCH 3/5] op-up name --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 705aaa06982..cb19dc1d678 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -2123,7 +2123,7 @@ workflows: - initialize: filters: tags: - only: /^op-deployer.*/ + only: /^op-up.*/ branches: ignore: /.*/ - contracts-bedrock-build: From dad2845b27382d47d6ff2a1c737282b4c86ce87f Mon Sep 17 00:00:00 2001 From: Matthew Slipper Date: Wed, 13 Aug 2025 22:45:21 -0600 Subject: [PATCH 4/5] scheduled workflows + context --- .circleci/config.yml | 26 +++++++++++++++++++++++--- 1 file changed, 23 insertions(+), 3 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index cb19dc1d678..c03f8d9afa4 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -2126,6 +2126,8 @@ workflows: only: /^op-up.*/ branches: ignore: /.*/ + context: + - circleci-repo-readonly-authenticated-github-token - contracts-bedrock-build: name: build-contracts-go-release-op-up filters: @@ -2167,6 +2169,8 @@ workflows: - initialize: requires: - hold + context: + - circleci-repo-readonly-authenticated-github-token # Standard (medium) cross-platform docker images go here - docker-build: matrix: @@ -2296,7 +2300,9 @@ workflows: - equal: [true, <>] - equal: ["api",<< pipeline.trigger_source >>] jobs: - - initialize + - initialize: + context: + - circleci-repo-readonly-authenticated-github-token - cannon-prestate: context: - circleci-repo-readonly-authenticated-github-token @@ -2357,10 +2363,15 @@ workflows: - equal: [build_four_hours, <>] - equal: [true, << pipeline.parameters.cannon_full_test_dispatch >>] jobs: + - initialize: + context: + - circleci-repo-readonly-authenticated-github-token - contracts-bedrock-build: build_args: --deny-warnings --skip test context: - circleci-repo-readonly-authenticated-github-token + requires: + - initialize - cannon-go-lint-and-test: requires: - contracts-bedrock-build @@ -2378,6 +2389,9 @@ workflows: # Trigger on manual triggers if explicitly requested - equal: [true, << pipeline.parameters.docker_publish_dispatch >>] jobs: + - initialize: + context: + - circleci-repo-readonly-authenticated-github-token - docker-build: matrix: parameters: @@ -2403,6 +2417,8 @@ workflows: - oplabs-gcr - slack - circleci-repo-readonly-authenticated-github-token + requires: + - initialize - check-cross-platform: matrix: parameters: @@ -2460,7 +2476,9 @@ workflows: - equal: [true, <>] - equal: ["api",<< pipeline.trigger_source >>] jobs: - - initialize + - initialize: + context: + - circleci-repo-readonly-authenticated-github-token - contracts-bedrock-build: # needed for sysgo tests context: - circleci-repo-readonly-authenticated-github-token @@ -2536,7 +2554,9 @@ workflows: not: equal: [<< pipeline.git.branch >>, "develop"] jobs: - - initialize + - initialize: + context: + - circleci-repo-readonly-authenticated-github-token - contracts-bedrock-build: # needed for sysgo tests context: - circleci-repo-readonly-authenticated-github-token From 46b09101b353fb641cd8be747725798d1f07f03c Mon Sep 17 00:00:00 2001 From: Matthew Slipper Date: Wed, 13 Aug 2025 23:03:32 -0600 Subject: [PATCH 5/5] forgot some contexts --- .circleci/config.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index c03f8d9afa4..8621ef668bf 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -1813,7 +1813,9 @@ workflows: - equal: ["api",<< pipeline.trigger_source >>] - equal: [<< pipeline.parameters.github-event-type >>, "__not_set__"] #this is to prevent triggering this workflow as the default value is always set for main_dispatch jobs: - - initialize + - initialize: + context: + - circleci-repo-readonly-authenticated-github-token - contracts-bedrock-build: name: contracts-bedrock-build # Build with just core + script contracts. @@ -2093,6 +2095,8 @@ workflows: only: /^op-deployer.*/ branches: ignore: /.*/ + context: + - circleci-repo-readonly-authenticated-github-token - contracts-bedrock-build: name: build-contracts-go-release-op-deployer filters: