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
1 change: 1 addition & 0 deletions pipelines/testdata/config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ defaults:
availabilityZoneCount: {{ .ev2.availabilityZoneCount }}
enableOptionalStep: false
e2e:
enabled: true
prow:
globalKeyVaultTokenSecret: "prow-token"
regionTest:
Expand Down
18 changes: 15 additions & 3 deletions pipelines/testdata/pipeline.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -533,9 +533,21 @@ resourceGroups:
action: ProwJob
tokenKeyvault: "{{ .global.keyVault.name }}.vault.azure.net"
dryRun:
variables:
- name: DRY_RUN
value: "true"
configRef: e2e.enabled
tokenSecret: "{{ .e2e.prow.globalKeyVaultTokenSecret }}"
jobName: "{{ .e2e.regionTest.prowJobName }}"
gatePromotion: "{{ .e2e.regionTest.gatePromotion }}"
identityFrom:
resourceGroup: regional
step: deploy
name: whatever
validation:
- Internal
- name: e2e2
action: ProwJob
tokenKeyvault: "{{ .global.keyVault.name }}.vault.azure.net"
dryRun:
value: true
Comment thread
rachelvweber marked this conversation as resolved.
tokenSecret: "{{ .e2e.prow.globalKeyVaultTokenSecret }}"
jobName: "{{ .e2e.regionTest.prowJobName }}"
gatePromotion: "{{ .e2e.regionTest.gatePromotion }}"
Expand Down
9 changes: 3 additions & 6 deletions pipelines/types/common.go
Original file line number Diff line number Diff line change
Expand Up @@ -653,7 +653,7 @@ type ProwJobStep struct {
Commit string `json:"commit,omitempty"` // optional source commit SHA to pin the Prow job to
Repo string `json:"repo,omitempty"` // optional GitHub repo name override (default: ARO-HCP)
BaseRef string `json:"baseRef,omitempty"` // optional Git base ref override (default: main)
DryRun DryRun `json:"dryRun,omitempty"`
DryRun Value `json:"dryRun,omitempty"`

// IdentityFrom specifies the managed identity with which this deployment will run in Ev2.
IdentityFrom Input `json:"identityFrom,omitempty"`
Expand All @@ -664,12 +664,9 @@ func (s *ProwJobStep) Description() string {
}

func (s *ProwJobStep) RequiredInputs() []StepDependency {

var deps []StepDependency
for _, val := range s.DryRun.Variables {
if val.Input != nil {
deps = append(deps, val.Input.StepDependency)
}
if s.DryRun.Input != nil {
deps = append(deps, s.DryRun.Input.StepDependency)
}
for _, val := range []Input{s.IdentityFrom} {
deps = append(deps, val.StepDependency)
Expand Down
14 changes: 1 addition & 13 deletions pipelines/types/pipeline.schema.v1.json
Original file line number Diff line number Diff line change
Expand Up @@ -643,19 +643,7 @@
"$ref": "#/definitions/input"
},
"dryRun": {
"type": "object",
"additionalProperties": false,
"properties": {
"command": {
"type": "string"
},
"variables": {
"type": "array",
"items": {
"$ref": "#/definitions/variable"
}
}
}
"$ref": "#/definitions/value"
}
},
"required": [
Expand Down
18 changes: 15 additions & 3 deletions pipelines/types/testdata/zz_fixture_TestNewPipelineFromFile.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -556,9 +556,21 @@ resourceGroups:
- Internal
- action: ProwJob
dryRun:
variables:
- name: DRY_RUN
value: "true"
configRef: e2e.enabled
gatePromotion: "true"
identityFrom:
name: whatever
resourceGroup: regional
step: deploy
jobName: test-me
name: e2e2
tokenKeyvault: arohcpint-global.vault.azure.net
tokenSecret: prow-token
validation:
- Internal
- action: ProwJob
dryRun:
value: true
gatePromotion: "true"
identityFrom:
name: whatever
Expand Down
Loading