diff options
Diffstat (limited to 'jjb/doctor')
| -rw-r--r-- | jjb/doctor/doctor.yml | 74 | ||||
| -rw-r--r-- | jjb/doctor/docu-build.sh | 53 |
2 files changed, 36 insertions, 91 deletions
diff --git a/jjb/doctor/doctor.yml b/jjb/doctor/doctor.yml index 963e1fd73..7778ecc39 100644 --- a/jjb/doctor/doctor.yml +++ b/jjb/doctor/doctor.yml @@ -1,35 +1,54 @@ +################################################### +# All the jobs except verify have been removed! +# They will only be enabled on request by projects! +################################################### - project: name: doctor + project: '{name}' + jobs: - - '{project}-verify' - - '{project}-merge-{stream}' + - 'doctor-verify-{stream}' - # stream: branch with - in place of / (eg. stable-arno) - # branch: branch (eg. stable/arno) +# only master branch is enabled at the moment to keep no of jobs sane stream: - master: branch: 'master' + gs-pathname: '' +# - stable-brahmaputra: +# branch: 'stable/brahmaputra' +# gs-pathname: '/brahmaputra' + +- job_defaults: &doctor_job_defaults + name: doctor_job_defaults -- job_defaults: &job_defaults - name: job_defaults parameters: - project-parameter: project: '{project}' + - gerrit-parameter: + branch: '{stream}' - job-template: - name: '{project}-verify' - disabled: true - <<: *job_defaults + name: 'doctor-verify-{stream}' + + <<: *doctor_job_defaults + + parameters: + - 'opnfv-build-defaults' + scm: - gerrit-trigger-scm: credentials-id: '{ssh-credentials}' refspec: '$GERRIT_REFSPEC' choosing-strategy: 'gerrit' + triggers: - gerrit: trigger-on: - - patchset-created-event + - patchset-created-event: + exclude-drafts: 'false' + exclude-trivial-rebase: 'false' + exclude-no-code-change: 'false' - draft-published-event - comment-added-contains-event: comment-contains-value: 'recheck' @@ -39,33 +58,12 @@ - project-compare-type: 'ANT' project-pattern: '{project}' branches: - - branch-compare-type: 'ANT' - branch-pattern: '**' - builders: - - shell: - !include-raw docu-build.sh + - branch-compare-type: 'ANT' + branch-pattern: '**/{stream}' + forbidden-file-paths: + - compare-type: ANT + pattern: 'docs/**|.gitignore' -- job-template: - name: '{project}-merge-{stream}' - disabled: true - <<: *job_defaults - scm: - - gerrit-trigger-scm: - credentials-id: '{ssh-credentials}' - refspec: '' - choosing-strategy: 'default' - triggers: - - gerrit: - trigger-on: - - change-merged-event - - comment-added-contains-event: - comment-contains-value: 'remerge' - projects: - - project-compare-type: 'ANT' - project-pattern: '{project}' - branches: - - branch-compare-type: 'ANT' - branch-pattern: '**/{branch}' builders: - - shell: - !include-raw docu-build.sh + - shell: | + echo "Nothing to verify!" diff --git a/jjb/doctor/docu-build.sh b/jjb/doctor/docu-build.sh deleted file mode 100644 index 2a253b555..000000000 --- a/jjb/doctor/docu-build.sh +++ /dev/null @@ -1,53 +0,0 @@ -#!/bin/bash -set -e -set -o pipefail - -export PATH=$PATH:/usr/local/bin/ - -echo -echo "Build" -echo "-----" -echo - -make - -echo -echo "Upload" -echo "------" -echo - -# NOTE: make sure source parameters for GS paths are not empty. -[[ $GERRIT_CHANGE_NUMBER =~ .+ ]] -[[ $GERRIT_PROJECT =~ .+ ]] -[[ $GERRIT_BRANCH =~ .+ ]] - -gs_path_review="artifacts.opnfv.org/review/$GERRIT_CHANGE_NUMBER" -if [[ $GERRIT_BRANCH = "master" ]] ; then - gs_path_branch="artifacts.opnfv.org/$GERRIT_PROJECT" -else - gs_path_branch="artifacts.opnfv.org/$GERRIT_PROJECT/${{GERRIT_BRANCH##*/}}" -fi - -if [[ $JOB_NAME =~ "verify" ]] ; then - gsutil cp -r build/* "gs://$gs_path_review/" - echo - echo "Document is available at http://$gs_path_review" -else - if [ -e build/design_docs ]; then - gsutil cp -r build/design_docs "gs://$gs_path_branch/" - fi - if [ -e build/requirements/html ]; then - gsutil cp -r build/requirements/html "gs://$gs_path_branch/" - fi - if [ -e build/requirements/latex ]; then - gsutil cp -r build/requirements/latex/*.pdf "gs://$gs_path_branch/" - fi - echo - echo "Latest document is available at http://$gs_path_branch" - - if gsutil ls "gs://$gs_path_review" > /dev/null 2>&1 ; then - echo - echo "Deleting Out-of-dated Documents..." - gsutil rm -r "gs://$gs_path_review" - fi -fi |