From b79964c809a6465ce422787b619ae44f9710917f Mon Sep 17 00:00:00 2001 From: "Vazquez,Brais (IT EDP)" Date: Wed, 21 Aug 2024 15:25:41 +0200 Subject: [PATCH] Re-order template --- jenkins/webhook-proxy/pipeline.json.tmpl | 39 ++++++++++++------------ 1 file changed, 19 insertions(+), 20 deletions(-) diff --git a/jenkins/webhook-proxy/pipeline.json.tmpl b/jenkins/webhook-proxy/pipeline.json.tmpl index e1097b581..dbc48902e 100644 --- a/jenkins/webhook-proxy/pipeline.json.tmpl +++ b/jenkins/webhook-proxy/pipeline.json.tmpl @@ -7,16 +7,16 @@ "resourceVersion": "{{.ResourceVersion}}" }, "spec": { - "triggers": [ - { - "type": "Generic", - "generic": { - "secret": "{{.TriggerSecret}}", - "allowEnv": true - } + "output": {}, + "resources": {}, + "strategy": { + "type": "JenkinsPipeline", + "jenkinsPipelineStrategy": { + "jenkinsfilePath": "{{.JenkinsfilePath}}", + "env": {{.Env}} } - ], - "runPolicy": "Serial", + }, + "postCommit": {}, "source": { "type": "Git", "git": { @@ -27,16 +27,15 @@ "name": "cd-user-with-password" } }, - "strategy": { - "type": "JenkinsPipeline", - "jenkinsPipelineStrategy": { - "jenkinsfilePath": "{{.JenkinsfilePath}}", - "env": {{.Env}} + "triggers": [ + { + "type": "Generic", + "generic": { + "secret": "{{.TriggerSecret}}", + "allowEnv": true + } } - }, - "output": {}, - "resources": {}, - "postCommit": {}, - "nodeSelector": {} + ], + "runPolicy": "Serial" } -} +} \ No newline at end of file