diff options
| -rw-r--r-- | jjb/functest/functest.yml | 30 | ||||
| -rw-r--r-- | jjb/octopus/octopus.yml | 4 | ||||
| -rw-r--r-- | jjb/parser/docu-build.sh | 2 | ||||
| -rw-r--r-- | jjb/prediction/docu-build.sh | 2 | ||||
| -rw-r--r-- | jjb/promise/docu-build.sh | 2 |
5 files changed, 35 insertions, 5 deletions
diff --git a/jjb/functest/functest.yml b/jjb/functest/functest.yml index 27f082c53..c4dfe4eaf 100644 --- a/jjb/functest/functest.yml +++ b/jjb/functest/functest.yml @@ -1,7 +1,11 @@ - project: name: functest + pod: + - 'opnfv-jump-1' + - 'opnfv-jump-2' jobs: + - 'functest-{pod}' - 'functest-openstack-bench-test' - 'functest-openstack-tempest-smoke-test' - 'functest-odl-test' @@ -108,6 +112,22 @@ python $HOME/.functest/vPing/vPing.py - job-template: + name: functest-{pod} + + project-type: freestyle + + node: '{pod}' + + logrotate: + daysToKeep: 30 + numToKeep: 10 + artifactDaysToKeep: -1 + artifactNumToKeep: -1 + + builders: + - 'functest-all' + +- job-template: name: 'functest-daily-{stream}' node: master @@ -255,3 +275,13 @@ - shell: !include-raw docu-build.sh +# macros +- builder: + name: functest-all + builders: + - shell: | + echo "Functest: run Functest suites" + python $HOME/.functest/run_rally.py all + python $HOME/.functest/run_rally.py smoke + python $HOME/.functest/vPing/vPing.py + $HOME/.functest/ODL/start_tests.sh diff --git a/jjb/octopus/octopus.yml b/jjb/octopus/octopus.yml index 459ba7a01..db35515c9 100644 --- a/jjb/octopus/octopus.yml +++ b/jjb/octopus/octopus.yml @@ -18,8 +18,6 @@ - job-template: name: octopus-test - node: master - project-type: freestyle logrotate: @@ -133,6 +131,8 @@ - job-template: name: 'octopus-merge' + node: master + # builder-merge job to run JJB update # # This job's purpose is to update all the JJB diff --git a/jjb/parser/docu-build.sh b/jjb/parser/docu-build.sh index 7358118bd..583654c82 100644 --- a/jjb/parser/docu-build.sh +++ b/jjb/parser/docu-build.sh @@ -44,7 +44,7 @@ done images=() while read -r -d ''; do - images+=("$REPLY) + images+=("$REPLY") done < <(find * -type f \( -iname \*.jpg -o -iname \*.png \) -print0) for img in "${{images[@]}}"; do diff --git a/jjb/prediction/docu-build.sh b/jjb/prediction/docu-build.sh index 7358118bd..583654c82 100644 --- a/jjb/prediction/docu-build.sh +++ b/jjb/prediction/docu-build.sh @@ -44,7 +44,7 @@ done images=() while read -r -d ''; do - images+=("$REPLY) + images+=("$REPLY") done < <(find * -type f \( -iname \*.jpg -o -iname \*.png \) -print0) for img in "${{images[@]}}"; do diff --git a/jjb/promise/docu-build.sh b/jjb/promise/docu-build.sh index 7358118bd..583654c82 100644 --- a/jjb/promise/docu-build.sh +++ b/jjb/promise/docu-build.sh @@ -44,7 +44,7 @@ done images=() while read -r -d ''; do - images+=("$REPLY) + images+=("$REPLY") done < <(find * -type f \( -iname \*.jpg -o -iname \*.png \) -print0) for img in "${{images[@]}}"; do |