Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion core/scripts/cre/environment/docs/mixed-env.md
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ For one scenario inside a bucket suite, put it inside that scenario's `t.Run(...

## When it runs

- **CI:** automatically on CRE-affecting PRs, in its **own** workflow `.github/workflows/cre-mixed-env-tests.yaml` (kept separate from `cre-system-tests.yaml` so that file stays simple). It runs the OCR3/DON2DON-heavy tests — `Test_CRE_V2_Suite_Bucket_A`, `Test_CRE_V2_Suite_Bucket_B`, and the `Test_CRE_V2_EVM_Read_*` suite — under mixed-env. The PR image and the develop image are both already built (per-PR and nightly), so no extra image builds are added. A dedicated **Check for non-determinism** step scans the live node containers after the suite and fails the job on any marker — kept separate from the auto-quarantined test step so the failure can't be swallowed.
- **CI:** automatically on CRE-affecting PRs, in its **own** workflow `.github/workflows/cre-mixed-env-tests.yaml` (kept separate from `cre-system-tests.yaml` so that file stays simple). It runs the OCR3/DON2DON-heavy tests — `Test_CRE_V2_Suite_Bucket_A`, `Test_CRE_V2_Suite_Bucket_B`, and the `Test_CRE_V2_EVM_Read_*` suite — under mixed-env, plus `Test_CRE_V2_ConfidentialWorkflows_Relay` against the confidential-workflows mixed-env topology (`configs/mixed-env-confidential-workflows.toml`), which gates the confidential relay's DON2DON `GetSecrets` path. The PR image and the develop image are both already built (per-PR and nightly), so no extra image builds are added. A dedicated **Check for non-determinism** step scans the live node containers after the suite and fails the job on any marker — kept separate from the auto-quarantined test step so the failure can't be swallowed.

## Required check & emergency bypass

Expand Down
5 changes: 4 additions & 1 deletion tools/ci/cmd/matrix_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -221,7 +221,7 @@ func TestMatrixMixedEnv_CLI(t *testing.T) {
var res []matrix.CREMixedEnvEntry
err = json.Unmarshal(out.Bytes(), &res)
require.NoError(t, err)
require.Len(t, res, 7)
require.Len(t, res, 8)
assert.Equal(t, "Test_CRE_V2_Suite_Bucket_A", res[0].TestName)
assert.Equal(t, 0, res[0].TestID)
assert.Equal(t, "configs/mixed-env-don.toml", res[0].Configs)
Expand All @@ -238,4 +238,7 @@ func TestMatrixMixedEnv_CLI(t *testing.T) {
assert.Equal(t, 6, res[6].TestID)
assert.Equal(t, "configs/mixed-env-don.toml", res[6].Configs)
assert.Equal(t, "runs-on=321-6-1/cpu=16/ram=64/family=m7i+m8i/spot=pco/image=ubuntu24-full-x64/extras=s3-cache+tmpfs", res[6].RunsOn)
assert.Equal(t, "Test_CRE_V2_ConfidentialWorkflows_Relay", res[7].TestName)
assert.Equal(t, 7, res[7].TestID)
assert.Equal(t, "configs/mixed-env-confidential-workflows.toml", res[7].Configs)
}
1 change: 1 addition & 0 deletions tools/ci/internal/matrix/mixedenv.go
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ var defaultCREMixedEnvTests = []string{
"Test_CRE_V2_EVM_Read_TxArtifacts",
"Test_CRE_V2_Suite_VaultDirectRead",
"Test_CRE_V2_Suite_VaultDirectReadErrors",
"Test_CRE_V2_ConfidentialWorkflows_Relay",
}

var defaultCREMixedEnvConfigs = map[string]string{
Expand Down
8 changes: 7 additions & 1 deletion tools/ci/internal/matrix/mixedenv_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ func TestBuildCREMixedEnvMatrix(t *testing.T) {
SpotFlag: "spot=pco",
})
require.NoError(t, err)
require.Len(t, res, 7)
require.Len(t, res, 8)

// Bucket A with default configs
assert.Equal(t, "Test_CRE_V2_Suite_Bucket_A", res[0].TestName)
Expand All @@ -44,6 +44,12 @@ func TestBuildCREMixedEnvMatrix(t *testing.T) {
assert.Equal(t, 6, res[6].TestID)
assert.Equal(t, "configs/mixed-env-don.toml", res[6].Configs)
assert.Equal(t, "runs-on=445566-6-1/cpu=16/ram=64/family=m7i+m8i/spot=pco/image=ubuntu24-full-x64/extras=s3-cache+tmpfs", res[6].RunsOn)

// Confidential workflows relay uses its own mixed-env topology
assert.Equal(t, "Test_CRE_V2_ConfidentialWorkflows_Relay", res[7].TestName)
assert.Equal(t, 7, res[7].TestID)
assert.Equal(t, "configs/mixed-env-confidential-workflows.toml", res[7].Configs)
assert.Equal(t, "runs-on=445566-7-1/cpu=16/ram=64/family=m7i+m8i/spot=pco/image=ubuntu24-full-x64/extras=s3-cache+tmpfs", res[7].RunsOn)
}

func TestBuildCREMixedEnvMatrix_MissingRunID(t *testing.T) {
Expand Down
Loading