Skip to content

Commit

Permalink
fix test files for reordering of the template
Browse files Browse the repository at this point in the history
  • Loading branch information
@BraisVQ
BraisVQ committed Aug 22, 2024
1 parent 8038fb6 commit 5ee4db2
Show file tree
Hide file tree
Showing 8 changed files with 128 additions and 135 deletions.
2 changes: 1 addition & 1 deletion jenkins/webhook-proxy/pipeline.json.tmpl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,4 +38,4 @@
],
"runPolicy": "Serial"
}
}
}
37 changes: 18 additions & 19 deletions jenkins/webhook-proxy/testdata/golden/build-component-pipeline.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,16 +7,16 @@
"resourceVersion": "0"
},
"spec": {
"triggers": [
{
"type": "Generic",
"generic": {
"secret": "s3cr3t",
"allowEnv": true
}
"output": {},
"resources": {},
"strategy": {
"type": "JenkinsPipeline",
"jenkinsPipelineStrategy": {
"jenkinsfilePath": "Jenkinsfile",
"env": [{"name":"FOO_BAR","value":"baz"}]
}
],
"runPolicy": "Serial",
},
"postCommit": {},
"source": {
"type": "Git",
"git": {
Expand All @@ -27,16 +27,15 @@
"name": "cd-user-with-password"
}
},
"strategy": {
"type": "JenkinsPipeline",
"jenkinsPipelineStrategy": {
"jenkinsfilePath": "Jenkinsfile",
"env": [{"name":"FOO_BAR","value":"baz"}]
"triggers": [
{
"type": "Generic",
"generic": {
"secret": "s3cr3t",
"allowEnv": true
}
}
},
"output": {},
"resources": {},
"postCommit": {},
"nodeSelector": {}
],
"runPolicy": "Serial"
}
}
37 changes: 18 additions & 19 deletions jenkins/webhook-proxy/testdata/golden/build-pipeline-branch.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,16 +7,16 @@
"resourceVersion": "42"
},
"spec": {
"triggers": [
{
"type": "Generic",
"generic": {
"secret": "s3cr3t",
"allowEnv": true
}
"output": {},
"resources": {},
"strategy": {
"type": "JenkinsPipeline",
"jenkinsPipelineStrategy": {
"jenkinsfilePath": "Jenkinsfile",
"env": [{"name":"FOO_BAR","value":"baz"}]
}
],
"runPolicy": "Serial",
},
"postCommit": {},
"source": {
"type": "Git",
"git": {
Expand All @@ -27,16 +27,15 @@
"name": "cd-user-with-password"
}
},
"strategy": {
"type": "JenkinsPipeline",
"jenkinsPipelineStrategy": {
"jenkinsfilePath": "Jenkinsfile",
"env": [{"name":"FOO_BAR","value":"baz"}]
"triggers": [
{
"type": "Generic",
"generic": {
"secret": "s3cr3t",
"allowEnv": true
}
}
},
"output": {},
"resources": {},
"postCommit": {},
"nodeSelector": {}
],
"runPolicy": "Serial"
}
}
37 changes: 18 additions & 19 deletions jenkins/webhook-proxy/testdata/golden/build-pipeline-jenkinsfilepath.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,16 +7,16 @@
"resourceVersion": "42"
},
"spec": {
"triggers": [
{
"type": "Generic",
"generic": {
"secret": "s3cr3t",
"allowEnv": true
}
"output": {},
"resources": {},
"strategy": {
"type": "JenkinsPipeline",
"jenkinsPipelineStrategy": {
"jenkinsfilePath": "bar/Jenkinsfile",
"env": [{"name":"FOO_BAR","value":"baz"}]
}
],
"runPolicy": "Serial",
},
"postCommit": {},
"source": {
"type": "Git",
"git": {
Expand All @@ -27,16 +27,15 @@
"name": "cd-user-with-password"
}
},
"strategy": {
"type": "JenkinsPipeline",
"jenkinsPipelineStrategy": {
"jenkinsfilePath": "bar/Jenkinsfile",
"env": [{"name":"FOO_BAR","value":"baz"}]
"triggers": [
{
"type": "Generic",
"generic": {
"secret": "s3cr3t",
"allowEnv": true
}
}
},
"output": {},
"resources": {},
"postCommit": {},
"nodeSelector": {}
],
"runPolicy": "Serial"
}
}
39 changes: 19 additions & 20 deletions jenkins/webhook-proxy/testdata/golden/build-pipeline.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,16 +7,16 @@
"resourceVersion": "0"
},
"spec": {
"triggers": [
{
"type": "Generic",
"generic": {
"secret": "s3cr3t",
"allowEnv": true
}
"output": {},
"resources": {},
"strategy": {
"type": "JenkinsPipeline",
"jenkinsPipelineStrategy": {
"jenkinsfilePath": "Jenkinsfile",
"env": [{"name":"FOO_BAR","value":"baz"}]
}
],
"runPolicy": "Serial",
},
"postCommit": {},
"source": {
"type": "Git",
"git": {
Expand All @@ -26,17 +26,16 @@
"sourceSecret": {
"name": "cd-user-with-password"
}
},
"strategy": {
"type": "JenkinsPipeline",
"jenkinsPipelineStrategy": {
"jenkinsfilePath": "Jenkinsfile",
"env": [{"name":"FOO_BAR","value":"baz"}]
},
"triggers": [
{
"type": "Generic",
"generic": {
"secret": "s3cr3t",
"allowEnv": true
}
}
},
"output": {},
"resources": {},
"postCommit": {},
"nodeSelector": {}
],
"runPolicy": "Serial"
}
}
37 changes: 18 additions & 19 deletions jenkins/webhook-proxy/testdata/golden/foo-cd-pipeline.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,16 +7,16 @@
"resourceVersion": "0"
},
"spec": {
"triggers": [
{
"type": "Generic",
"generic": {
"secret": "s3cr3t",
"allowEnv": true
}
"output": {},
"resources": {},
"strategy": {
"type": "JenkinsPipeline",
"jenkinsPipelineStrategy": {
"jenkinsfilePath": "Jenkinsfile",
"env": null
}
],
"runPolicy": "Serial",
},
"postCommit": {},
"source": {
"type": "Git",
"git": {
Expand All @@ -27,16 +27,15 @@
"name": "cd-user-with-password"
}
},
"strategy": {
"type": "JenkinsPipeline",
"jenkinsPipelineStrategy": {
"jenkinsfilePath": "Jenkinsfile",
"env": null
"triggers": [
{
"type": "Generic",
"generic": {
"secret": "s3cr3t",
"allowEnv": true
}
}
},
"output": {},
"resources": {},
"postCommit": {},
"nodeSelector": {}
],
"runPolicy": "Serial"
}
}
37 changes: 18 additions & 19 deletions jenkins/webhook-proxy/testdata/golden/pipeline.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,16 +7,16 @@
"resourceVersion": "0"
},
"spec": {
"triggers": [
{
"type": "Generic",
"generic": {
"secret": "s3cr3t",
"allowEnv": true
}
"output": {},
"resources": {},
"strategy": {
"type": "JenkinsPipeline",
"jenkinsPipelineStrategy": {
"jenkinsfilePath": "foo/Jenkinsfile",
"env": [{"name":"FOO","value":"bar"}]
}
],
"runPolicy": "Serial",
},
"postCommit": {},
"source": {
"type": "Git",
"git": {
Expand All @@ -27,16 +27,15 @@
"name": "cd-user-with-password"
}
},
"strategy": {
"type": "JenkinsPipeline",
"jenkinsPipelineStrategy": {
"jenkinsfilePath": "foo/Jenkinsfile",
"env": [{"name":"FOO","value":"bar"}]
"triggers": [
{
"type": "Generic",
"generic": {
"secret": "s3cr3t",
"allowEnv": true
}
}
},
"output": {},
"resources": {},
"postCommit": {},
"nodeSelector": {}
],
"runPolicy": "Serial"
}
}
37 changes: 18 additions & 19 deletions jenkins/webhook-proxy/testdata/golden/prov-app-pipeline.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,16 +7,16 @@
"resourceVersion": "0"
},
"spec": {
"triggers": [
{
"type": "Generic",
"generic": {
"secret": "s3cr3t",
"allowEnv": true
}
"output": {},
"resources": {},
"strategy": {
"type": "JenkinsPipeline",
"jenkinsPipelineStrategy": {
"jenkinsfilePath": "Jenkinsfile",
"env": null
}
],
"runPolicy": "Serial",
},
"postCommit": {},
"source": {
"type": "Git",
"git": {
Expand All @@ -27,16 +27,15 @@
"name": "cd-user-with-password"
}
},
"strategy": {
"type": "JenkinsPipeline",
"jenkinsPipelineStrategy": {
"jenkinsfilePath": "Jenkinsfile",
"env": null
"triggers": [
{
"type": "Generic",
"generic": {
"secret": "s3cr3t",
"allowEnv": true
}
}
},
"output": {},
"resources": {},
"postCommit": {},
"nodeSelector": {}
],
"runPolicy": "Serial"
}
}

0 comments on commit 5ee4db2

Please sign in to comment.