diff options
| -rw-r--r-- | jjb/functest/functest-ci-jobs.yml | 6 | ||||
| -rw-r--r-- | jjb/joid/joid-ci-jobs.yml | 52 | ||||
| -rw-r--r-- | jjb/yardstick/yardstick-ci-jobs.yml | 8 | ||||
| -rw-r--r-- | utils/test/result_collection_api/dashboard/qtip2Dashboard.py | 4 |
4 files changed, 45 insertions, 25 deletions
diff --git a/jjb/functest/functest-ci-jobs.yml b/jjb/functest/functest-ci-jobs.yml index 5fea389ba..42dd6df17 100644 --- a/jjb/functest/functest-ci-jobs.yml +++ b/jjb/functest/functest-ci-jobs.yml @@ -41,6 +41,9 @@ - virtual: installer: compass <<: *brahmaputra + - virtual: + installer: joid + <<: *brahmaputra #-------------------------------- # master #-------------------------------- @@ -71,6 +74,9 @@ - virtual: installer: compass <<: *master + - virtual: + installer: joid + <<: *master #-------------------------------- testsuite: diff --git a/jjb/joid/joid-ci-jobs.yml b/jjb/joid/joid-ci-jobs.yml index 66f886f5d..849112319 100644 --- a/jjb/joid/joid-ci-jobs.yml +++ b/jjb/joid/joid-ci-jobs.yml @@ -71,8 +71,6 @@ - job-template: name: 'joid-{scenario}-{pod}-daily-{stream}' - project-type: multijob - concurrent: false properties: @@ -103,27 +101,35 @@ default: '{scenario}' builders: - - multijob: - name: deploy - condition: SUCCESSFUL - projects: - - name: 'joid-deploy-{pod}-daily-{stream}' - current-parameters: true - kill-phase-on: FAILURE - - multijob: - name: functest - condition: COMPLETED - projects: - - name: 'functest-joid-{pod}-daily-{stream}' - current-parameters: true - kill-phase-on: NEVER - - multijob: - name: yardstick - condition: COMPLETED - projects: - - name: 'yardstick-joid-{pod}-daily-{stream}' - current-parameters: true - kill-phase-on: NEVER + - trigger-builds: + - project: 'joid-deploy-{pod}-daily-{stream}' + current-parameters: false + predefined-parameters: + DEPLOY_SCENARIO={scenario} + same-node: true + block: true + - trigger-builds: + - project: 'functest-joid-{pod}-daily-{stream}' + current-parameters: false + predefined-parameters: + DEPLOY_SCENARIO={scenario} + same-node: true + block: true + block-thresholds: + build-step-failure-threshold: 'never' + failure-threshold: 'never' + unstable-threshold: 'FAILURE' + - trigger-builds: + - project: 'yardstick-joid-{pod}-daily-{stream}' + current-parameters: false + predefined-parameters: + DEPLOY_SCENARIO={scenario} + block: true + same-node: true + block-thresholds: + build-step-failure-threshold: 'never' + failure-threshold: 'never' + unstable-threshold: 'FAILURE' - job-template: name: 'joid-deploy-{pod}-daily-{stream}' diff --git a/jjb/yardstick/yardstick-ci-jobs.yml b/jjb/yardstick/yardstick-ci-jobs.yml index 6c2fe707e..8899baf15 100644 --- a/jjb/yardstick/yardstick-ci-jobs.yml +++ b/jjb/yardstick/yardstick-ci-jobs.yml @@ -51,6 +51,10 @@ installer: compass suite: daily <<: *brahmaputra + - virtual: + installer: joid + suite: daily + <<: *brahmaputra #-------------------------------- # master #-------------------------------- @@ -94,6 +98,10 @@ installer: compass suite: daily <<: *master + - virtual: + installer: joid + suite: daily + <<: *master #-------------------------------- jobs: diff --git a/utils/test/result_collection_api/dashboard/qtip2Dashboard.py b/utils/test/result_collection_api/dashboard/qtip2Dashboard.py index 138244dd0..0112945b1 100644 --- a/utils/test/result_collection_api/dashboard/qtip2Dashboard.py +++ b/utils/test/result_collection_api/dashboard/qtip2Dashboard.py @@ -99,7 +99,7 @@ def _get_results(db_url, testcase): def _test(): - db_url = "http://213.77.62.197" + db_url = "http://testresults.opnfv.org/testapi" raw_result = defaultdict() raw_result = _get_results(db_url, {"project": "qtip", "testcase": "compute_test_suite"}) @@ -118,4 +118,4 @@ def _test(): print result if __name__ == '__main__': - _test()
\ No newline at end of file + _test() |