Merge ~kzapalowicz/snappy-hwe-snaps/+git/jenkins-jobs:fix/use-ssh-for-jenkins-config into ~snappy-hwe-team/snappy-hwe-snaps/+git/jenkins-jobs:master

Proposed by Konrad Zapałowicz
Status: Merged
Approved by: Alfonso Sanchez-Beato
Approved revision: 030fcb9a22d853b41660a8e87eb330ccff6b62d0
Merged at revision: 8acfbaa83d3b9d0308ecb2dcc356378d52fb8931
Proposed branch: ~kzapalowicz/snappy-hwe-snaps/+git/jenkins-jobs:fix/use-ssh-for-jenkins-config
Merge into: ~snappy-hwe-team/snappy-hwe-snaps/+git/jenkins-jobs:master
Diff against target: 13 lines (+1/-1)
1 file modified
jobs/infrastructure/deploy-jenkins-jobs.sh (+1/-1)
Reviewer Review Type Date Requested Status
Konrad Zapałowicz (community) continuous-integration Approve
Alfonso Sanchez-Beato Approve
Review via email: mp+330969@code.launchpad.net

Description of the change

use jenkins_deploy_password

To post a comment you must log in.
Revision history for this message
Alfonso Sanchez-Beato (alfonsosanchezbeato) wrote :

LGTM

review: Approve
Revision history for this message
Konrad Zapałowicz (kzapalowicz) :
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/jobs/infrastructure/deploy-jenkins-jobs.sh b/jobs/infrastructure/deploy-jenkins-jobs.sh
2index f016db4..92dfd2a 100644
3--- a/jobs/infrastructure/deploy-jenkins-jobs.sh
4+++ b/jobs/infrastructure/deploy-jenkins-jobs.sh
5@@ -27,7 +27,7 @@ CONFIG_PATH="$CONFIG_DIR/jlp.config"
6
7 cat $CONFIG_PATH
8
9-JENKINS_API_TOKEN=$(cat $CONFIG_PATH | grep 'jenkins_password' | sed 's/[a-z_]*:[ ]//g')
10+JENKINS_API_TOKEN=$(cat $CONFIG_PATH | grep 'jenkins_deploy_password' | sed 's/[a-z_]*:[ ]//g')
11 JENKINS_DEPLOYMENT_SCOPE="jobs/infrastructure:jobs/snap:jobs/image"
12
13 rm -rf $WORKSPACE/$JENKINS_JOBS_FOLDER

Subscribers

People subscribed via source and target branches