Skip to content

Commit d0c9d50

Browse files
bolekkbolekk
committed
[Local CRE] Remove OCR boostrap job specs
1 parent 0ae2c19 commit d0c9d50

File tree

3 files changed

+70
-69
lines changed

3 files changed

+70
-69
lines changed

‎system-tests/lib/cre/features/consensus/v2/consensus.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -189,11 +189,11 @@ func createJobs(
189189
specs := make(map[string][]string)
190190

191191
// Create bootstrap job
192-
if bootSpecs, err := proposeBootstrapJob(creEnv, bootstrap, don); err != nil {
192+
/*if bootSpecs, err := proposeBootstrapJob(creEnv, bootstrap, don); err != nil {
193193
return err
194194
} else if err := mergo.Merge(&specs, bootSpecs, mergo.WithAppendSlice); err != nil {
195195
return fmt.Errorf("failed to merge bootstrap job specs: %w", err)
196-
}
196+
}*/
197197

198198
// Create node job
199199
if nodeSpecs, err := proposeNodeJob(creEnv, don, command, []string{formatBootstrapPeer(bootstrap)}, configStr); err != nil {

‎system-tests/lib/cre/features/evm/v2/evm.go‎

Lines changed: 34 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -309,42 +309,43 @@ func createJobs(
309309
return errors.Wrapf(err, "failed to get contract address for key %s and chainID %d", ocr3Key, chainID)
310310
}
311311

312-
bootInput := cre_jobs.ProposeJobSpecInput{
313-
Domain: offchain.ProductLabel,
314-
Environment: cre.EnvironmentName,
315-
DONName: bootstrap.DON.Name,
316-
JobName: fmt.Sprintf("evm-v2-bootstrap-%d-%s", chainID, don.Name),
317-
ExtraLabels: map[string]string{cre.CapabilityLabelKey: flag},
318-
DONFilters: []offchain.TargetDONFilter{
319-
{Key: offchain.FilterKeyDONName, Value: bootstrap.DON.Name},
320-
},
321-
Template: job_types.BootstrapOCR3,
322-
Inputs: job_types.JobSpecInput{
323-
"chainSelector": chainSelector,
324-
"contractQualifier": qualifier,
325-
},
326-
}
327-
328-
bootVerErr := cre_jobs.ProposeJobSpec{}.VerifyPreconditions(*creEnv.CldfEnvironment, bootInput)
329-
if bootVerErr != nil {
330-
return fmt.Errorf("precondition verification failed for EVM v2 bootstrap job for chainID %d: %w", chainID, bootVerErr)
331-
}
332-
333-
bootReport, bootErr := cre_jobs.ProposeJobSpec{}.Apply(*creEnv.CldfEnvironment, bootInput)
334-
if bootErr != nil {
335-
return fmt.Errorf("failed to propose EVM v2 bootstrap job spec for chainID %d: %w", chainID, bootErr)
336-
}
312+
/*
313+
bootInput := cre_jobs.ProposeJobSpecInput{
314+
Domain: offchain.ProductLabel,
315+
Environment: cre.EnvironmentName,
316+
DONName: bootstrap.DON.Name,
317+
JobName: fmt.Sprintf("evm-v2-bootstrap-%d-%s", chainID, don.Name),
318+
ExtraLabels: map[string]string{cre.CapabilityLabelKey: flag},
319+
DONFilters: []offchain.TargetDONFilter{
320+
{Key: offchain.FilterKeyDONName, Value: bootstrap.DON.Name},
321+
},
322+
Template: job_types.BootstrapOCR3,
323+
Inputs: job_types.JobSpecInput{
324+
"chainSelector": chainSelector,
325+
"contractQualifier": qualifier,
326+
},
327+
}
337328
338-
for _, r := range bootReport.Reports {
339-
out, ok := r.Output.(cre_jobs_ops.ProposeOCR3BootstrapJobOutput)
340-
if !ok {
341-
return fmt.Errorf("unable to cast to ProposeOCR3BootstrapJobOutput, actual type: %T", r.Output)
329+
bootVerErr := cre_jobs.ProposeJobSpec{}.VerifyPreconditions(*creEnv.CldfEnvironment, bootInput)
330+
if bootVerErr != nil {
331+
return fmt.Errorf("precondition verification failed for EVM v2 bootstrap job for chainID %d: %w", chainID, bootVerErr)
342332
}
343-
mErr := mergo.Merge(&specs, out.Specs, mergo.WithAppendSlice)
344-
if mErr != nil {
345-
return fmt.Errorf("failed to merge bootstrap job specs: %w", mErr)
333+
334+
bootReport, bootErr := cre_jobs.ProposeJobSpec{}.Apply(*creEnv.CldfEnvironment, bootInput)
335+
if bootErr != nil {
336+
return fmt.Errorf("failed to propose EVM v2 bootstrap job spec for chainID %d: %w", chainID, bootErr)
346337
}
347-
}
338+
339+
for _, r := range bootReport.Reports {
340+
out, ok := r.Output.(cre_jobs_ops.ProposeOCR3BootstrapJobOutput)
341+
if !ok {
342+
return fmt.Errorf("unable to cast to ProposeOCR3BootstrapJobOutput, actual type: %T", r.Output)
343+
}
344+
mErr := mergo.Merge(&specs, out.Specs, mergo.WithAppendSlice)
345+
if mErr != nil {
346+
return fmt.Errorf("failed to merge bootstrap job specs: %w", mErr)
347+
}
348+
}*/
348349

349350
capabilityConfig, resolveErr := cre.ResolveCapabilityConfig(nodeSet, flag, cre.ChainCapabilityScope(chainID))
350351
if resolveErr != nil {

‎system-tests/lib/cre/features/vault/vault.go‎

Lines changed: 34 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@ import (
3333
cre_jobs "github.com/smartcontractkit/chainlink/deployment/cre/jobs"
3434
cre_jobs_ops "github.com/smartcontractkit/chainlink/deployment/cre/jobs/operations"
3535
"github.com/smartcontractkit/chainlink/deployment/cre/jobs/pkg"
36-
cre_jobs_seq "github.com/smartcontractkit/chainlink/deployment/cre/jobs/sequences"
3736
job_types "github.com/smartcontractkit/chainlink/deployment/cre/jobs/types"
3837
creseq "github.com/smartcontractkit/chainlink/deployment/cre/ocr3/v2/changeset/sequences"
3938
"github.com/smartcontractkit/chainlink/deployment/cre/pkg/offchain"
@@ -278,43 +277,44 @@ func createJobs(
278277
return errors.New("could not find bootstrap node in topology, exactly one bootstrap node is required")
279278
}
280279

281-
bootInput := cre_jobs.ProposeJobSpecInput{
282-
Domain: offchain.ProductLabel,
283-
Environment: cre.EnvironmentName,
284-
DONName: bootstrap.DON.Name,
285-
JobName: "vault-bootstrap-" + don.Name,
286-
ExtraLabels: map[string]string{cre.CapabilityLabelKey: flag},
287-
DONFilters: []offchain.TargetDONFilter{
288-
{Key: offchain.FilterKeyDONName, Value: bootstrap.DON.Name},
289-
},
290-
Template: job_types.BootstrapVault,
291-
Inputs: job_types.JobSpecInput{
292-
"chainSelector": creEnv.RegistryChainSelector,
293-
"contractQualifierPrefix": ContractQualifier,
294-
},
295-
}
280+
/*
281+
bootInput := cre_jobs.ProposeJobSpecInput{
282+
Domain: offchain.ProductLabel,
283+
Environment: cre.EnvironmentName,
284+
DONName: bootstrap.DON.Name,
285+
JobName: "vault-bootstrap-" + don.Name,
286+
ExtraLabels: map[string]string{cre.CapabilityLabelKey: flag},
287+
DONFilters: []offchain.TargetDONFilter{
288+
{Key: offchain.FilterKeyDONName, Value: bootstrap.DON.Name},
289+
},
290+
Template: job_types.BootstrapVault,
291+
Inputs: job_types.JobSpecInput{
292+
"chainSelector": creEnv.RegistryChainSelector,
293+
"contractQualifierPrefix": ContractQualifier,
294+
},
295+
}
296296
297-
bootVerErr := cre_jobs.ProposeJobSpec{}.VerifyPreconditions(*creEnv.CldfEnvironment, bootInput)
298-
if bootVerErr != nil {
299-
return fmt.Errorf("precondition verification failed for Vault bootstrap job: %w", bootVerErr)
300-
}
297+
bootVerErr := cre_jobs.ProposeJobSpec{}.VerifyPreconditions(*creEnv.CldfEnvironment, bootInput)
298+
if bootVerErr != nil {
299+
return fmt.Errorf("precondition verification failed for Vault bootstrap job: %w", bootVerErr)
300+
}
301301
302-
bootReport, bootErr := cre_jobs.ProposeJobSpec{}.Apply(*creEnv.CldfEnvironment, bootInput)
303-
if bootErr != nil {
304-
return fmt.Errorf("failed to propose Vault bootstrap job spec: %w", bootErr)
305-
}
302+
bootReport, bootErr := cre_jobs.ProposeJobSpec{}.Apply(*creEnv.CldfEnvironment, bootInput)
303+
if bootErr != nil {
304+
return fmt.Errorf("failed to propose Vault bootstrap job spec: %w", bootErr)
305+
}*/
306306

307307
specs := make(map[string][]string)
308-
for _, r := range bootReport.Reports {
309-
out, ok := r.Output.(cre_jobs_seq.ProposeVaultBootstrapJobsOutput)
310-
if !ok {
311-
return fmt.Errorf("unable to cast to ProposeVaultBootstrapJobsOutput, actual type: %T", r.Output)
312-
}
313-
mErr := mergo.Merge(&specs, out.Specs, mergo.WithAppendSlice)
314-
if mErr != nil {
315-
return fmt.Errorf("failed to merge bootstrap job specs: %w", mErr)
316-
}
317-
}
308+
/*for _, r := range bootReport.Reports {
309+
out, ok := r.Output.(cre_jobs_seq.ProposeVaultBootstrapJobsOutput)
310+
if !ok {
311+
return fmt.Errorf("unable to cast to ProposeVaultBootstrapJobsOutput, actual type: %T", r.Output)
312+
}
313+
mErr := mergo.Merge(&specs, out.Specs, mergo.WithAppendSlice)
314+
if mErr != nil {
315+
return fmt.Errorf("failed to merge bootstrap job specs: %w", mErr)
316+
}
317+
}*/
318318

319319
_, ocrPeeringCfg, err := cre.PeeringCfgs(bootstrap)
320320
if err != nil {

0 commit comments

Comments
 (0)