Add tokenCredentialId parameter support to generic-webhook-trigger

Change-Id: Ied3cbe3758967659f83637ccea78d834079a1470

Add tokenCredentialId parameter support to generic-webhook-trigger

Change-Id: Ied3cbe3758967659f83637ccea78d834079a1470

jenkins_jobs/modules/triggers.py

@@ -2608,6 +2608,7 @@ def generic_webhook_trigger(registry, xml_parent, data):
 
 
     :arg str token: A token to use to trigger the job. (default '')
+    :arg str token-credential-id: A token credential id to use to trigger the job. (default '')
     :arg bool print-post-content: Print post content in job log.
     :arg bool print-contrib-var: Print contributed variables in job log.
     :arg bool silent-response: Avoid responding with information about
@@ -2717,6 +2718,7 @@ def generic_webhook_trigger(registry, xml_parent, data):
         ("print-contrib-var", "printContributedVariables", False),
         ("cause", "causeString", ""),
         ("token", "token", ""),
+        ("token-credential-id", "tokenCredentialId", ""),
         ("silent-response", "silentResponse", False),
     ]
     # This should cover all the top level

tests/triggers/fixtures/generic-webhook-trigger-full.xml

@@ -37,6 +37,7 @@
       <printContributedVariables>true</printContributedVariables>
       <causeString>Generic Cause</causeString>
       <token>blah</token>
+      <tokenCredentialId>token_credential_id</tokenCredentialId>
       <silentResponse>true</silentResponse>
     </org.jenkinsci.plugins.gwt.GenericTrigger>
   </triggers>

tests/triggers/fixtures/generic-webhook-trigger-full.yaml

@@ -23,4 +23,5 @@ triggers:
         print-contrib-var: true
         cause: Generic Cause
         token: blah
+        token-credential-id: token_credential_id
         silent-response: true

tests/triggers/fixtures/generic-webhook-trigger000.xml

@@ -18,6 +18,7 @@
       <printContributedVariables>false</printContributedVariables>
       <causeString/>
       <token/>
+      <tokenCredentialId/>
       <silentResponse>false</silentResponse>
     </org.jenkinsci.plugins.gwt.GenericTrigger>
   </triggers>

tests/triggers/fixtures/generic-webhook-trigger001.xml

@@ -15,6 +15,7 @@
       <printContributedVariables>false</printContributedVariables>
       <causeString/>
       <token/>
+      <tokenCredentialId/>
       <silentResponse>false</silentResponse>
     </org.jenkinsci.plugins.gwt.GenericTrigger>
   </triggers>

tests/triggers/fixtures/generic-webhook-trigger002.xml

@@ -15,6 +15,7 @@
       <printContributedVariables>false</printContributedVariables>
       <causeString/>
       <token/>
+      <tokenCredentialId/>
       <silentResponse>false</silentResponse>
     </org.jenkinsci.plugins.gwt.GenericTrigger>
   </triggers>

tests/triggers/fixtures/generic-webhook-trigger003.xml

@@ -15,6 +15,7 @@
       <printContributedVariables>false</printContributedVariables>
       <causeString/>
       <token/>
+      <tokenCredentialId/>
       <silentResponse>false</silentResponse>
     </org.jenkinsci.plugins.gwt.GenericTrigger>
   </triggers>