diff options
| -rw-r--r-- | jjb/functest/functest.yml | 64 | ||||
| -rw-r--r-- | jjb/genesis/genesis-docs.yml | 4 | ||||
| -rw-r--r-- | jjb/octopus/build-docu.sh | 1 | ||||
| -rw-r--r-- | jjb/octopus/octopus.yml | 69 | ||||
| -rw-r--r-- | jjb/opnfvdocs/opnfvdocs.yml | 5 | ||||
| -rw-r--r-- | jjb/pharos/pharos.yml | 66 |
6 files changed, 42 insertions, 167 deletions
diff --git a/jjb/functest/functest.yml b/jjb/functest/functest.yml index be7f68940..b16d0715c 100644 --- a/jjb/functest/functest.yml +++ b/jjb/functest/functest.yml @@ -10,7 +10,6 @@ - 'functest-daily-{stream}' - 'functest-merge' - 'functest-verify' - - 'functest-build-docs' # stream: branch with - in place of / (eg. stable-helium) # branch: branch (eg. stable/helium) @@ -146,10 +145,11 @@ - test-macro builders: + - shell: + !include-raw build-docu.sh - shell: | - pwd - find . - echo "Hello world from functest {somevar} daily" + gsutil cp docs/*.pdf gs://artifacts.opnfv.org/functest/docs/ + gsutil cp docs/*.html gs://artifacts.opnfv.org/functest/docs/ postbuilders: - test-macro @@ -200,10 +200,8 @@ branch-pattern: '**/master' builders: - - shell: | - pwd - find . - echo "verify logic goes here" + - shell: + !include-raw build-docu.sh - job-template: name: 'functest-merge' @@ -250,52 +248,10 @@ branch-pattern: '**/master' builders: - - shell: | - pwd - find . - echo "merge logic goes here" - -- job-template: - name: 'functest-build-docs' - - 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: - - change-merged-event - - comment-added-contains-event: - comment-contains-value: 'remerge' - projects: - - project-compare-type: 'ANT' - project-pattern: 'functest' - branches: - - branch-compare-type: 'ANT' - branch-pattern: '**/master' - - builders: - shell: !include-raw build-docu.sh + - shell: | + gsutil cp docs/*.pdf gs://artifacts.opnfv.org/functest/docs/ + gsutil cp docs/*.html gs://artifacts.opnfv.org/functest/docs/ + diff --git a/jjb/genesis/genesis-docs.yml b/jjb/genesis/genesis-docs.yml index aeee56280..2e2bd7332 100644 --- a/jjb/genesis/genesis-docs.yml +++ b/jjb/genesis/genesis-docs.yml @@ -60,3 +60,7 @@ builders: - shell: !include-raw build-docu.sh + - shell: | + gsutil cp docs/*.pdf gs://artifacts.opnfv.org/genesis/docs/ + gsutil cp docs/*.html gs://artifacts.opnfv.org/genesis/docs/ + diff --git a/jjb/octopus/build-docu.sh b/jjb/octopus/build-docu.sh index cbbf265d3..558451dbb 100644 --- a/jjb/octopus/build-docu.sh +++ b/jjb/octopus/build-docu.sh @@ -1,4 +1,5 @@ #!/bin/bash +set -xv for file in $(find . -type f -iname '*.rst'); do file_cut="${{file%.*}}" html_file=$file_cut".html" diff --git a/jjb/octopus/octopus.yml b/jjb/octopus/octopus.yml index 40b25dea5..b465537e7 100644 --- a/jjb/octopus/octopus.yml +++ b/jjb/octopus/octopus.yml @@ -69,10 +69,12 @@ - test-macro builders: + - shell: + !include-raw build-docu.sh - shell: | - pwd - find . - echo "Hello world from octopus {somevar} daily" + gsutil cp docs/*.pdf gs://artifacts.opnfv.org/octopus/docs/ + gsutil cp docs/*.html gs://artifacts.opnfv.org/octopus/docs/ + postbuilders: - test-macro @@ -123,10 +125,8 @@ branch-pattern: '**/master' builders: - - shell: | - pwd - find . - echo "verify logic goes here" + - shell: + !include-raw build-docu.sh - job-template: name: 'octopus-merge' @@ -173,58 +173,11 @@ branch-pattern: '**/master' builders: + - shell: + !include-raw build-docu.sh - shell: | - pwd - find . - echo "merge logic goes here" - -- job-template: - name: 'octopus-build-docs' - - 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: - - change-merged-event - - comment-added-contains-event: - comment-contains-value: 'remerge' - projects: - - project-compare-type: 'ANT' - project-pattern: 'octopus' - branches: - - branch-compare-type: 'ANT' - branch-pattern: '**/master' - - builders: - - shell: - !include-raw build-docu.sh - - - - + gsutil cp docs/*.pdf gs://artifacts.opnfv.org/octopus/docs/ + gsutil cp docs/*.html gs://artifacts.opnfv.org/octopus/docs/ diff --git a/jjb/opnfvdocs/opnfvdocs.yml b/jjb/opnfvdocs/opnfvdocs.yml index b717ec64d..3789dc3d1 100644 --- a/jjb/opnfvdocs/opnfvdocs.yml +++ b/jjb/opnfvdocs/opnfvdocs.yml @@ -150,3 +150,8 @@ builders: - shell: !include-raw build-docu.sh + - shell: | + gsutil cp docs/*.pdf gs://artifacts.opnfv.org/opnfvdocs/docs/ + gsutil cp docs/*.html gs://artifacts.opnfv.org/opnfvdocs/docs/ + + diff --git a/jjb/pharos/pharos.yml b/jjb/pharos/pharos.yml index 742e536bf..cee73a422 100644 --- a/jjb/pharos/pharos.yml +++ b/jjb/pharos/pharos.yml @@ -5,7 +5,6 @@ - 'pharos-daily-{stream}' - 'pharos-merge' - 'pharos-verify' - - 'pharos-build-docs' # stream: branch with - in place of / (eg. stable-helium) # branch: branch (eg. stable/helium) @@ -70,10 +69,12 @@ - test-macro builders: + - shell: + !include-raw build-docu.sh - shell: | - pwd - find . - echo "Hello world from pharos {somevar} daily" + gsutil cp docs/*.pdf gs://artifacts.opnfv.org/pharos/docs/ + gsutil cp docs/*.html gs://artifacts.opnfv.org/pharos/docs/ + postbuilders: - test-macro @@ -124,10 +125,8 @@ branch-pattern: '**/master' builders: - - shell: | - pwd - find . - echo "verify logic goes here" + - shell: + !include-raw build-docu.sh - job-template: name: 'pharos-merge' @@ -174,54 +173,11 @@ branch-pattern: '**/master' builders: - - shell: | - pwd - find . - echo "merge logic goes here" - -- job-template: - name: 'pharos-build-docs' - - 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: - - change-merged-event - - comment-added-contains-event: - comment-contains-value: 'remerge' - projects: - - project-compare-type: 'ANT' - project-pattern: 'pharos' - branches: - - branch-compare-type: 'ANT' - branch-pattern: '**/master' - - builders: - - shell: + - shell: !include-raw build-docu.sh + - shell: | + gsutil cp docs/*.pdf gs://artifacts.opnfv.org/pharos/docs/ + gsutil cp docs/*.html gs://artifacts.opnfv.org/pharos/docs/ |