Merge ~pwlars/snappy-hwe-snaps/+git/jenkins-jobs:add-deploy-creds into ~snappy-hwe-team/snappy-hwe-snaps/+git/jenkins-jobs:master

[Paul Larson]

This adds some extra lines to the config to allow us to pass in credentials for the -jb bot user to deploy jobs

[System Enablement Bot (system-enablement-ci-bot)]

PASSED: Continuous integration, rev:c8c80ac67ed99779356e0a5d87d1a4baba01d60e
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/1954/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/generic-build-snap-worker/3437
    None: https://jenkins.canonical.com/system-enablement/job/generic-update-snap-mp/1861/console
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/generic-test-snap/3691

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/1954/rebuild

review: Approve (continuous-integration)

[Simon Fels (morphis)]

LGTM

review: Approve

diff --git a/jobs/infrastructure/credentials-2-launchpad-plugin.sh b/jobs/infrastructure/credentials-2-launchpad-plugin.sh
index d47164f..b963c69 100644
--- a/jobs/infrastructure/credentials-2-launchpad-plugin.sh
+++ b/jobs/infrastructure/credentials-2-launchpad-plugin.sh
@@ -47,6 +47,10 @@ DEBFULLNAME:
 jenkins_user: "{bot_username}"
 jenkins_password: "${{jenkins_api_token}}"
 
+#These credentials are only used for actually deploying jenkins jobs
+jenkins_deploy_user: "{deploy_bot_username}"
+jenkins_deploy_password: "${{jenkins_deploy_api_token}}"
+
 #Actual URL of your jenkins (e.g. the jenkins backend URL)
 jenkins_url: "{backend_url}"
 
diff --git a/jobs/infrastructure/credentials-2-launchpad-plugin.yaml b/jobs/infrastructure/credentials-2-launchpad-plugin.yaml
index 0d8ca61..95eb8e3 100644
--- a/jobs/infrastructure/credentials-2-launchpad-plugin.yaml
+++ b/jobs/infrastructure/credentials-2-launchpad-plugin.yaml
@@ -12,6 +12,9 @@
     - password:
         name: jenkins_api_token
         description: Jenkins API key of the "{bot_username}" account
+    - password:
+        name: jenkins_deploy_api_token
+        description: Jenkins API key of the "{deploy_bot_username}" account
     axes:
     - axis:
         type: slave
diff --git a/local.yaml b/local.yaml
index eb6ea71..c5b7820 100644
--- a/local.yaml
+++ b/local.yaml
@@ -9,6 +9,7 @@
     jenkins-instance: localhost
 
     bot_username: system-enablement-ci-bot
+    deploy_bot_username: system-enablement-jb-bot
     credentials_path: /var/lib/jenkins/.launchpad.credentials
     allowed_users: "canonical-system-enablement"
     backend_url: http://localhost:8080/