diff options
| -rw-r--r-- | jjb/octopus/docu-build.sh | 80 | ||||
| -rw-r--r-- | jjb/octopus/octopus.yml | 42 |
2 files changed, 35 insertions, 87 deletions
diff --git a/jjb/octopus/docu-build.sh b/jjb/octopus/docu-build.sh deleted file mode 100644 index 057cc97d1..000000000 --- a/jjb/octopus/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/octopus/octopus.yml b/jjb/octopus/octopus.yml index fe1713c73..e44e5ea93 100644 --- a/jjb/octopus/octopus.yml +++ b/jjb/octopus/octopus.yml @@ -5,7 +5,7 @@ name: octopus jobs: - 'octopus-test' - - 'octopus-daily-master' + - 'octopus-daily-{stream}' - 'octopus-merge' - 'octopus-verify-{stream}' @@ -14,8 +14,10 @@ stream: - master: branch: 'master' + gs-pathname: '' - stable-arno: branch: 'stable/arno' + gs-pathname: '/arno' project: 'octopus' somevar: 'foo' @@ -39,7 +41,7 @@ echo "Hello world from octopus" - job-template: - name: 'octopus-daily-master' + name: 'octopus-daily-{stream}' node: master @@ -61,26 +63,28 @@ parameters: - project-parameter: project: '{project}' + - octopus-parameter: + gs-pathname: '{gs-pathname}' scm: - git-scm: credentials-id: '{ssh-credentials}' refspec: '' - branch: master + branch: '{branch}' wrappers: - ssh-agent-credentials: user: '{ssh-credentials}' triggers: - - timed: 'H H * * *' + - 'octopus-{stream}' prebuilders: - test-macro builders: - shell: - !include-raw docu-build.sh + !include-raw ../opnfvdocs/docu-build.sh postbuilders: - test-macro @@ -134,7 +138,7 @@ builders: - shell: - !include-raw docu-build.sh + !include-raw ../opnfvdocs/docu-build.sh - job-template: name: 'octopus-merge' @@ -184,5 +188,29 @@ builders: - shell: - !include-raw docu-build.sh + !include-raw ../opnfvdocs/docu-build.sh + + +######################## +## parameter macros +######################### +- parameter: + name: octopus-parameter + parameters: + - string: + name: GS_PATHNAME + default: '{gs-pathname}' + description: "Version directory where the octopus will be stored in gs repository" + +######################### +## trigger macros +######################### +- trigger: + name: 'octopus-master' + triggers: + - pollscm: "H 7 * * *" +- trigger: + name: 'octopus-stable-arno' + triggers: + - pollscm: "H 19 * * *" |