From 2a0b748e74840fe8871dd9d7f22efb414552bc7b Mon Sep 17 00:00:00 2001 From: Fatih Degirmenci Date: Fri, 22 Jan 2016 09:57:25 +0100 Subject: fuel: Enable test jobs for fuel virtual deploys This change also adds build blocker for generic job. Change-Id: I2d1987ca632b30ad8497d14de79b66735afea611 Signed-off-by: Fatih Degirmenci --- jjb/fuel/fuel-ci-jobs.yml | 3 +++ jjb/fuel/fuel-project-jobs.yml | 4 ++++ jjb/functest/functest-ci-jobs.yml | 12 ++++++++++++ jjb/yardstick/yardstick-ci-jobs.yml | 29 +++++++++++++++++++++++++++++ 4 files changed, 48 insertions(+) diff --git a/jjb/fuel/fuel-ci-jobs.yml b/jjb/fuel/fuel-ci-jobs.yml index 97d3bc5de..7652927e1 100644 --- a/jjb/fuel/fuel-ci-jobs.yml +++ b/jjb/fuel/fuel-ci-jobs.yml @@ -125,12 +125,14 @@ current-parameters: false predefined-parameters: DEPLOY_SCENARIO={scenario} + node-parameters: true block: true - trigger-builds: - project: 'functest-fuel-{pod}-daily-{stream}' current-parameters: false predefined-parameters: DEPLOY_SCENARIO={scenario} + node-parameters: true block: true block-thresholds: build-step-failure-threshold: 'never' @@ -142,6 +144,7 @@ predefined-parameters: DEPLOY_SCENARIO={scenario} block: true + node-parameters: true block-thresholds: build-step-failure-threshold: 'never' failure-threshold: 'never' diff --git a/jjb/fuel/fuel-project-jobs.yml b/jjb/fuel/fuel-project-jobs.yml index 979117fa9..8c1a85c03 100644 --- a/jjb/fuel/fuel-project-jobs.yml +++ b/jjb/fuel/fuel-project-jobs.yml @@ -277,6 +277,10 @@ enabled: true max-total: 1 max-per-node: 1 + - build-blocker: + use-build-blocker: true + blocking-jobs: + - 'fuel-os-.*?-ericsson-pod2-daily-{stream}' parameters: - project-parameter: diff --git a/jjb/functest/functest-ci-jobs.yml b/jjb/functest/functest-ci-jobs.yml index 6c33bd0a5..5fea389ba 100644 --- a/jjb/functest/functest-ci-jobs.yml +++ b/jjb/functest/functest-ci-jobs.yml @@ -35,6 +35,12 @@ - ericsson-pod1: installer: fuel <<: *brahmaputra + - virtual: + installer: fuel + <<: *brahmaputra + - virtual: + installer: compass + <<: *brahmaputra #-------------------------------- # master #-------------------------------- @@ -59,6 +65,12 @@ - orange-pod2: installer: joid <<: *master + - virtual: + installer: fuel + <<: *master + - virtual: + installer: compass + <<: *master #-------------------------------- testsuite: diff --git a/jjb/yardstick/yardstick-ci-jobs.yml b/jjb/yardstick/yardstick-ci-jobs.yml index d2f251d36..6c2fe707e 100644 --- a/jjb/yardstick/yardstick-ci-jobs.yml +++ b/jjb/yardstick/yardstick-ci-jobs.yml @@ -43,6 +43,14 @@ installer: fuel suite: daily <<: *brahmaputra + - virtual: + installer: fuel + suite: daily + <<: *brahmaputra + - virtual: + installer: compass + suite: daily + <<: *brahmaputra #-------------------------------- # master #-------------------------------- @@ -78,6 +86,14 @@ installer: apex suite: daily <<: *master + - virtual: + installer: fuel + suite: daily + <<: *master + - virtual: + installer: compass + suite: daily + <<: *master #-------------------------------- jobs: @@ -305,6 +321,14 @@ default: '' description: 'Arguments to use in order to choose the backend DB' +- parameter: + name: 'yardstick-params-virtual' + parameters: + - string: + name: YARDSTICK_DB_BACKEND + default: '' + description: 'Arguments to use in order to choose the backend DB' + ####################### ## trigger macros ####################### @@ -358,3 +382,8 @@ name: 'yardstick-orange-pod2-trigger' triggers: - timed: '' + +- trigger: + name: 'yardstick-virtual-trigger' + triggers: + - timed: '' -- cgit 1.2.3-korg