diff options
Diffstat (limited to 'jjb/prediction')
| -rw-r--r-- | jjb/prediction/docu-build.sh | 80 | ||||
| -rw-r--r-- | jjb/prediction/prediction.yml | 120 |
2 files changed, 29 insertions, 171 deletions
diff --git a/jjb/prediction/docu-build.sh b/jjb/prediction/docu-build.sh deleted file mode 100644 index 057cc97d1..000000000 --- a/jjb/prediction/docu-build.sh +++ /dev/null @@ -1,80 +0,0 @@ -#!/bin/bash -set -e -set -o pipefail - -project="$(git remote -v | head -n1 | awk '{{print $2}}' | sed -e 's,.*:\(.*/\)\?,,' -e 's/\.git$//')" -export PATH=$PATH:/usr/local/bin/ - -git_sha1="$(git rev-parse HEAD)" -docu_build_date="$(date)" - -if [[ $JOB_NAME =~ "verify" ]] ; then - patchset="/$GERRIT_CHANGE_NUMBER" -fi - -files=() -while read -r -d ''; do - files+=("$REPLY") -done < <(find * -type f -iname '*.rst' -print0) - -for file in "${{files[@]}}"; do - - file_cut="${{file%.*}}" - gs_cp_folder="${{file_cut}}" - - # sed part - sed -i "s/_sha1_/$git_sha1/g" $file - sed -i "s/_date_/$docu_build_date/g" $file - - # rst2html part - echo "rst2html $file" - rst2html $file | gsutil cp -L gsoutput.txt - \ - gs://artifacts.opnfv.org/"$project""$patchset"/"$gs_cp_folder".html - gsutil setmeta -h "Content-Type:text/html" \ - -h "Cache-Control:private, max-age=0, no-transform" \ - gs://artifacts.opnfv.org/"$project""$patchset"/"$gs_cp_folder".html - cat gsoutput.txt - rm -f gsoutput.txt - - echo "rst2pdf $file" - rst2pdf $file -o - | gsutil cp -L gsoutput.txt - \ - gs://artifacts.opnfv.org/"$project""$patchset"/"$gs_cp_folder".pdf - gsutil setmeta -h "Content-Type:application/pdf" \ - -h "Cache-Control:private, max-age=0, no-transform" \ - gs://artifacts.opnfv.org/"$project""$patchset"/"$gs_cp_folder".pdf - cat gsoutput.txt - rm -f gsoutput.txt - - links+="http://artifacts.opnfv.org/"$project""$patchset"/"$gs_cp_folder".html \n" - links+="http://artifacts.opnfv.org/"$project""$patchset"/"$gs_cp_folder".pdf \n" - -done - -images=() -while read -r -d ''; do - images+=("$REPLY") -done < <(find * -type f \( -iname \*.jpg -o -iname \*.png \) -print0) - -for img in "${{images[@]}}"; do - - # uploading found images - echo "uploading $img" - cat "$img" | gsutil cp -L gsoutput.txt - \ - gs://artifacts.opnfv.org/"$project""$patchset"/"$img" - gsutil setmeta -h "Content-Type:image/jpeg" \ - -h "Cache-Control:private, max-age=0, no-transform" \ - gs://artifacts.opnfv.org/"$project""$patchset"/"$img" - cat gsoutput.txt - rm -f gsoutput.txt - -done - -if [[ $GERRIT_EVENT_TYPE = "change-merged" ]] ; then - patchset="/$GERRIT_CHANGE_NUMBER" - if [ ! -z "$patchset" ]; then - gsutil rm gs://artifacts.opnfv.org/"$project""$patchset"/** || true - fi -fi - -echo -e "$links" - diff --git a/jjb/prediction/prediction.yml b/jjb/prediction/prediction.yml index ee47f86c8..93fa33144 100644 --- a/jjb/prediction/prediction.yml +++ b/jjb/prediction/prediction.yml @@ -1,69 +1,41 @@ +################################################### +# All the jobs except verify have been removed! +# They will only be enabled on request by projects! +################################################### - project: name: prediction + + project: '{name}' + jobs: - - 'prediction-test' - - 'prediction-daily-{stream}' - - 'prediction-merge' - - 'prediction-verify' + - 'prediction-verify-{stream}' - # stream: branch with - in place of / (eg. stable-helium) - # branch: branch (eg. stable/helium) +# 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' - project: 'prediction' - somevar: 'foo' - -- job-template: - name: prediction-test - - builders: - - shell: | - echo "Hello world from prediction" - -- job-template: - name: 'prediction-daily-{stream}' - - # Job template for daily builders - # - # Required Variables: - # stream: branch with - in place of / (eg. stable) - # branch: branch (eg. stable) - - varsetabove: '{somevar}' +- job_defaults: &prediction_job_defaults + name: prediction_job_defaults parameters: - project-parameter: project: '{project}' - - scm: - - git-scm: - credentials-id: '{ssh-credentials}' - refspec: '' - branch: '{branch}' - - triggers: - - timed: 'H H * * *' - - prebuilders: - - test-macro - - builders: - - shell: - !include-raw docu-build.sh - - postbuilders: - - test-macro + - gerrit-parameter: + branch: '{stream}' - job-template: - name: 'prediction-verify' + name: 'prediction-verify-{stream}' + + <<: *prediction_job_defaults parameters: - - project-parameter: - project: '{project}' - - gerrit-parameter: - branch: 'master' + - 'opnfv-build-defaults' + scm: - gerrit-trigger-scm: credentials-id: '{ssh-credentials}' @@ -84,48 +56,14 @@ comment-contains-value: 'reverify' projects: - project-compare-type: 'ANT' - project-pattern: 'prediction' + project-pattern: '{project}' branches: - branch-compare-type: 'ANT' - branch-pattern: '**/master' - - builders: - - shell: - !include-raw docu-build.sh - -- job-template: - name: 'prediction-merge' - - # builder-merge job to run JJB update - # - # This job's purpose is to update all the JJB - - parameters: - - project-parameter: - project: '{project}' - - gerrit-parameter: - branch: 'master' - - 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: 'prediction' - branches: - - branch-compare-type: 'ANT' - branch-pattern: '**/master' + branch-pattern: '**/{stream}' + forbidden-file-paths: + - compare-type: ANT + pattern: 'docs/**|.gitignore' builders: - - shell: - !include-raw docu-build.sh - + - shell: | + echo "Nothing to verify!" |