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

Proposed by Paul Larson
Status: Merged
Approved by: Simon Fels
Approved revision: c8c80ac67ed99779356e0a5d87d1a4baba01d60e
Merged at revision: b1351ef59751a90b4067223539eba67044a0dea9
Proposed branch: ~pwlars/snappy-hwe-snaps/+git/jenkins-jobs:add-deploy-creds
Merge into: ~snappy-hwe-team/snappy-hwe-snaps/+git/jenkins-jobs:master
Diff against target: 41 lines (+8/-0)
3 files modified
jobs/infrastructure/credentials-2-launchpad-plugin.sh (+4/-0)
jobs/infrastructure/credentials-2-launchpad-plugin.yaml (+3/-0)
local.yaml (+1/-0)
Reviewer Review Type Date Requested Status
Simon Fels Approve
System Enablement Bot continuous-integration Approve
Review via email: mp+330687@code.launchpad.net

Description of the change

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

To post a comment you must log in.
Revision history for this message
System Enablement Bot (system-enablement-ci-bot) wrote :
review: Approve (continuous-integration)
Revision history for this message
Simon Fels (morphis) wrote :

LGTM

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/jobs/infrastructure/credentials-2-launchpad-plugin.sh b/jobs/infrastructure/credentials-2-launchpad-plugin.sh
2index d47164f..b963c69 100644
3--- a/jobs/infrastructure/credentials-2-launchpad-plugin.sh
4+++ b/jobs/infrastructure/credentials-2-launchpad-plugin.sh
5@@ -47,6 +47,10 @@ DEBFULLNAME:
6 jenkins_user: "{bot_username}"
7 jenkins_password: "${{jenkins_api_token}}"
8
9+#These credentials are only used for actually deploying jenkins jobs
10+jenkins_deploy_user: "{deploy_bot_username}"
11+jenkins_deploy_password: "${{jenkins_deploy_api_token}}"
12+
13 #Actual URL of your jenkins (e.g. the jenkins backend URL)
14 jenkins_url: "{backend_url}"
15
16diff --git a/jobs/infrastructure/credentials-2-launchpad-plugin.yaml b/jobs/infrastructure/credentials-2-launchpad-plugin.yaml
17index 0d8ca61..95eb8e3 100644
18--- a/jobs/infrastructure/credentials-2-launchpad-plugin.yaml
19+++ b/jobs/infrastructure/credentials-2-launchpad-plugin.yaml
20@@ -12,6 +12,9 @@
21 - password:
22 name: jenkins_api_token
23 description: Jenkins API key of the "{bot_username}" account
24+ - password:
25+ name: jenkins_deploy_api_token
26+ description: Jenkins API key of the "{deploy_bot_username}" account
27 axes:
28 - axis:
29 type: slave
30diff --git a/local.yaml b/local.yaml
31index eb6ea71..c5b7820 100644
32--- a/local.yaml
33+++ b/local.yaml
34@@ -9,6 +9,7 @@
35 jenkins-instance: localhost
36
37 bot_username: system-enablement-ci-bot
38+ deploy_bot_username: system-enablement-jb-bot
39 credentials_path: /var/lib/jenkins/.launchpad.credentials
40 allowed_users: "canonical-system-enablement"
41 backend_url: http://localhost:8080/

Subscribers

People subscribed via source and target branches

to all changes: