Merge ~morphis/snappy-hwe-snaps/+git/jenkins-jobs:f/correct-params-for-docs-job into ~snappy-hwe-team/snappy-hwe-snaps/+git/jenkins-jobs:master

Proposed by Simon Fels
Status: Merged
Approved by: Konrad Zapałowicz
Approved revision: d53e8954d4155a0985a5fb3db563e8340e8fdcc7
Merged at revision: 89b225ea2fca860bac2c4354e01de2c922008917
Proposed branch: ~morphis/snappy-hwe-snaps/+git/jenkins-jobs:f/correct-params-for-docs-job
Merge into: ~snappy-hwe-team/snappy-hwe-snaps/+git/jenkins-jobs:master
Diff against target: 38 lines (+4/-4)
2 files modified
jobs/snap/snap-docs.sh (+1/-1)
jobs/snap/snap-docs.yaml (+3/-3)
Reviewer Review Type Date Requested Status
Konrad Zapałowicz (community) code Approve
Review via email: mp+330739@code.launchpad.net

Description of the change

Pass correct parameters to snap-docs job

To post a comment you must log in.
Revision history for this message
Konrad Zapałowicz (kzapalowicz) wrote :

ack

review: Approve (code)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/jobs/snap/snap-docs.sh b/jobs/snap/snap-docs.sh
2index e256294..4f7e186 100644
3--- a/jobs/snap/snap-docs.sh
4+++ b/jobs/snap/snap-docs.sh
5@@ -18,7 +18,7 @@ set -ex
6
7 . "$WORKSPACE/.build_env"
8
9-git clone -b $GIT_REPO_BRANCH $GIT_REPO $WORKSPACE/src
10+git clone -b $SOURCE_GIT_REPO_BRANCH $SOURCE_GIT_REPO $WORKSPACE/src
11 if [ ! -e $WORKSPACE/src/docs ]; then
12 echo "WARNING: repository does not contain any documentation we can build. Aborting."
13 exit 0
14diff --git a/jobs/snap/snap-docs.yaml b/jobs/snap/snap-docs.yaml
15index 3954f13..0dfc396 100644
16--- a/jobs/snap/snap-docs.yaml
17+++ b/jobs/snap/snap-docs.yaml
18@@ -8,11 +8,11 @@
19 node: snap && build
20 parameters:
21 - string:
22- name: GIT_REPO
23+ name: SOURCE_GIT_REPO
24 default:
25 description: "Source git repository"
26 - string:
27- name: GIT_REPO_BRANCH
28+ name: SOURCE_GIT_REPO_BRANCH
29 default:
30 description: "Branch of the source git repository to use"
31 - string:
32@@ -35,4 +35,4 @@
33 artifacts: 'docs-*.tar.xz'
34 allow-empty: 'true'
35 fingerprint: true
36- default-excludes: false
37\ No newline at end of file
38+ default-excludes: false

Subscribers

People subscribed via source and target branches

to all changes: