summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRyota MIBU <r-mibu@cq.jp.nec.com>2015-11-26 11:00:47 +0000
committerGerrit Code Review <gerrit@172.30.200.206>2015-11-26 11:00:47 +0000
commit2ea0acb61e3ff686af94194fa5c4f7475d8d1f89 (patch)
tree7ac2f966afa97d8063df1a14f920b1fd8f9671ac
parentedb6f36e13d896ea6966f49af599329b2b40ddb3 (diff)
parent3464f8fc09569dd81bf52ddc8c99a30301310592 (diff)
Merge "docs: remove trailing spaces"
-rw-r--r--docs/how-to-use-docs/documentation-example.rst2
-rw-r--r--docs/jenkins-job-builder/opnfv-jjb-usage.rst40
2 files changed, 21 insertions, 21 deletions
diff --git a/docs/how-to-use-docs/documentation-example.rst b/docs/how-to-use-docs/documentation-example.rst
index fd0563fda..e18ce598b 100644
--- a/docs/how-to-use-docs/documentation-example.rst
+++ b/docs/how-to-use-docs/documentation-example.rst
@@ -50,7 +50,7 @@ For verify jobs a link to the documentation will show up as a comment in gerrit
* Merge jobs
-Once you are happy with the look of your documentation you can submit the patchset the merge job will
+Once you are happy with the look of your documentation you can submit the patchset the merge job will
copy the output of each documentation directory to http://artifacts.opnfv.org/$project/docs/$name_of_your_folder/index.html
Here are some quick examples of how to use rst markup
diff --git a/docs/jenkins-job-builder/opnfv-jjb-usage.rst b/docs/jenkins-job-builder/opnfv-jjb-usage.rst
index fa825c430..4aecc6de6 100644
--- a/docs/jenkins-job-builder/opnfv-jjb-usage.rst
+++ b/docs/jenkins-job-builder/opnfv-jjb-usage.rst
@@ -60,22 +60,22 @@ The Current merge and verify jobs for jenkins job builder as pulled from the rep
jobs:
- 'builder-verify-jjb'
- 'builder-merge'
-
+
project: 'releng'
-
+
- job-template:
name: builder-verify-jjb
-
+
node: master
-
+
project-type: freestyle
-
+
logrotate:
daysToKeep: 30
numToKeep: 10
artifactDaysToKeep: -1
artifactNumToKeep: -1
-
+
parameters:
- project-parameter:
project: '{project}'
@@ -86,11 +86,11 @@ The Current merge and verify jobs for jenkins job builder as pulled from the rep
credentials-id: '{ssh-credentials}'
refspec: '$GERRIT_REFSPEC'
choosing-strategy: 'gerrit'
-
+
wrappers:
- ssh-agent-credentials:
user: '{ssh-credentials}'
-
+
triggers:
- gerrit:
trigger-on:
@@ -114,45 +114,45 @@ The Current merge and verify jobs for jenkins job builder as pulled from the rep
pattern: jjb/**
- compare-type: ANT
pattern: jjb-templates/**
-
-
+
+
builders:
- shell:
!include-raw verify-releng
-
+
- job-template:
name: 'builder-merge'
-
+
node: master
-
+
# builder-merge job to run JJB update
#
# This job's purpose is to update all the JJB
-
+
project-type: freestyle
-
+
logrotate:
daysToKeep: 30
numToKeep: 40
artifactDaysToKeep: -1
artifactNumToKeep: 5
-
+
parameters:
- project-parameter:
project: '{project}'
- gerrit-parameter:
branch: 'master'
-
+
scm:
- gerrit-trigger-scm:
credentials-id: '{ssh-credentials}'
refspec: ''
choosing-strategy: 'default'
-
+
wrappers:
- ssh-agent-credentials:
user: '{ssh-credentials}'
-
+
triggers:
- gerrit:
trigger-on:
@@ -168,7 +168,7 @@ The Current merge and verify jobs for jenkins job builder as pulled from the rep
file-paths:
- compare-type: ANT
pattern: jjb/**
-
+
builders:
- shell: |
source /opt/virtualenv/jenkins-job-builder/bin/activate