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
diff --git a/jobs/snap/snap-docs.sh b/jobs/snap/snap-docs.sh
index e256294..4f7e186 100644
--- a/jobs/snap/snap-docs.sh
+++ b/jobs/snap/snap-docs.sh
@@ -18,7 +18,7 @@ set -ex
1818
19. "$WORKSPACE/.build_env"19. "$WORKSPACE/.build_env"
2020
21git clone -b $GIT_REPO_BRANCH $GIT_REPO $WORKSPACE/src21git clone -b $SOURCE_GIT_REPO_BRANCH $SOURCE_GIT_REPO $WORKSPACE/src
22if [ ! -e $WORKSPACE/src/docs ]; then22if [ ! -e $WORKSPACE/src/docs ]; then
23 echo "WARNING: repository does not contain any documentation we can build. Aborting."23 echo "WARNING: repository does not contain any documentation we can build. Aborting."
24 exit 024 exit 0
diff --git a/jobs/snap/snap-docs.yaml b/jobs/snap/snap-docs.yaml
index 3954f13..0dfc396 100644
--- a/jobs/snap/snap-docs.yaml
+++ b/jobs/snap/snap-docs.yaml
@@ -8,11 +8,11 @@
8 node: snap && build8 node: snap && build
9 parameters:9 parameters:
10 - string:10 - string:
11 name: GIT_REPO11 name: SOURCE_GIT_REPO
12 default:12 default:
13 description: "Source git repository"13 description: "Source git repository"
14 - string:14 - string:
15 name: GIT_REPO_BRANCH15 name: SOURCE_GIT_REPO_BRANCH
16 default:16 default:
17 description: "Branch of the source git repository to use"17 description: "Branch of the source git repository to use"
18 - string:18 - string:
@@ -35,4 +35,4 @@
35 artifacts: 'docs-*.tar.xz'35 artifacts: 'docs-*.tar.xz'
36 allow-empty: 'true'36 allow-empty: 'true'
37 fingerprint: true37 fingerprint: true
38 default-excludes: false
39\ No newline at end of file38\ No newline at end of file
39 default-excludes: false

Subscribers

People subscribed via source and target branches

to all changes: