diff options
author | ShubhamRathi <shubhamiiitbackup@gmail.com> | 2017-01-27 00:00:39 +0530 |
---|---|---|
committer | ShubhamRathi <shubhamiiitbackup@gmail.com> | 2017-02-08 16:31:10 +0530 |
commit | fd8d915b212fb8adc943a74b537b5b5efffeaaad (patch) | |
tree | 14c22618779fb99cfc9f72575bf8623ad116b13a | |
parent | 75d391522cfe0b8acfe8b2b23283f0c136fb99a6 (diff) |
Add new jobs for doc merge and verify
New jobs for merge and verify added in tandem to ODLDocs. Intent of
keeping these doc jobs between ODL & OPNFV as similar as possible is
to keep the scope for common jobs and cross collaboration possible.
The archiving feature that is included in post build configuration of
ODLDoc jobs has been left out for now until CI Team can take it up.
Change-Id: Ifb494f1491f07ad0af39cd2644f895372b98edf3
Signed-off-by: ShubhamRathi <shubhamiiitbackup@gmail.com>
-rw-r--r-- | jjb/global/releng-macros.yml | 9 | ||||
-rw-r--r-- | jjb/opnfvdocs/docs-post-rtd.sh | 7 | ||||
-rw-r--r-- | jjb/opnfvdocs/docs-rtd.yaml | 69 |
3 files changed, 80 insertions, 5 deletions
diff --git a/jjb/global/releng-macros.yml b/jjb/global/releng-macros.yml index 06152fe6b..16f9d6c27 100644 --- a/jjb/global/releng-macros.yml +++ b/jjb/global/releng-macros.yml @@ -72,9 +72,8 @@ triggers: - timed: 'H H * * 0' -# NOTE: unused macro, but we may use this for some jobs. - trigger: - name: gerrit-trigger-patch-submitted + name: gerrit-trigger-patchset-created triggers: - gerrit: server-name: 'gerrit.opnfv.org' @@ -88,14 +87,14 @@ comment-contains-value: 'recheck' projects: - project-compare-type: 'ANT' - project-pattern: '{name}' + project-pattern: '{project}' branches: - branch-compare-type: 'ANT' branch-pattern: '**/{branch}' # NOTE: unused macro, but we may use this for some jobs. - trigger: - name: gerrit-trigger-patch-merged + name: gerrit-trigger-change-merged triggers: - gerrit: server-name: 'gerrit.opnfv.org' @@ -105,7 +104,7 @@ comment-contains-value: 'remerge' projects: - project-compare-type: 'ANT' - project-pattern: '{name}' + project-pattern: '{project}' branches: - branch-compare-type: 'ANT' branch-pattern: '**/{branch}' diff --git a/jjb/opnfvdocs/docs-post-rtd.sh b/jjb/opnfvdocs/docs-post-rtd.sh new file mode 100644 index 000000000..7faa26f38 --- /dev/null +++ b/jjb/opnfvdocs/docs-post-rtd.sh @@ -0,0 +1,7 @@ +#!/bin/bash +if [ $GERRIT_BRANCH == "master" ]; then + RTD_BUILD_VERSION=latest +else + RTD_BUILD_VERSION=${{GERRIT_BRANCH/\//-}} +fi +curl -X POST --data "version_slug=$RTD_BUILD_VERSION" https://readthedocs.org/build/{rtdproject} diff --git a/jjb/opnfvdocs/docs-rtd.yaml b/jjb/opnfvdocs/docs-rtd.yaml new file mode 100644 index 000000000..7ff8cd162 --- /dev/null +++ b/jjb/opnfvdocs/docs-rtd.yaml @@ -0,0 +1,69 @@ +- project: + name: docs-rtd + jobs: + - 'docs-merge-rtd-{stream}' + - 'docs-verify-rtd-{stream}' + + stream: + - danube: + branch: 'master' + - colorado: + branch: 'stable/colorado' + + project: 'opnfvdocs' + rtdproject: 'opnfv' + # TODO: Archive Artifacts + +- job-template: + name: 'docs-merge-rtd-{stream}' + + project-type: freestyle + + parameters: + - project-parameter: + project: '{project}' + branch: '{branch}' + scm: + - git-scm + + triggers: + - gerrit-trigger-change-merged + + builders: + - shell: !include-raw: docs-post-rtd.sh + +- job-template: + name: 'docs-verify-rtd-{stream}' + + project-type: freestyle + + parameters: + - project-parameter: + project: '{project}' + branch: '{branch}' + scm: + - git-scm + + triggers: + - gerrit-trigger-patchset-created: + server: 'gerrit.opnfv.org' + project: '**' + branch: '{branch}' + files: 'docs/**/*.rst' + - timed: 'H H * * *' + + builders: + - shell: | + if [ "$GERRIT_PROJECT" != "opnfvdocs" ]; then + cd opnfvdocs/submodules/$GERRIT_PROJECT + git fetch origin $GERRIT_REFSPEC && git checkout FETCH_HEAD + else + git fetch origin $GERRIT_REFSPEC && git checkout FETCH_HEAD + fi + - shell: | + virtualenv $WORKSPACE/venv + source $WORKSPACE/venv/bin/activate + pip install --upgrade pip + pip freeze + pip install tox + tox -edocs
\ No newline at end of file |