diff options
Diffstat (limited to 'jjb/fuel')
| -rw-r--r-- | jjb/fuel/fuel-daily-jobs.yaml | 31 | ||||
| -rw-r--r-- | jjb/fuel/fuel-verify-jobs.yaml | 13 | ||||
| -rw-r--r-- | jjb/fuel/fuel-weekly-jobs.yaml | 6 |
3 files changed, 10 insertions, 40 deletions
diff --git a/jjb/fuel/fuel-daily-jobs.yaml b/jjb/fuel/fuel-daily-jobs.yaml index e636538ef..885096557 100644 --- a/jjb/fuel/fuel-daily-jobs.yaml +++ b/jjb/fuel/fuel-daily-jobs.yaml @@ -194,27 +194,19 @@ failure-threshold: 'never' unstable-threshold: 'FAILURE' # 1.here the stream means the SUT stream, dovetail stream is defined in its own job - # 2.testsuite proposed_tests here is for new test cases planning to add into OVP - # 3.run proposed_tests on Monday, Wednesday and Friday against ha scenario - # 4.testsuite default here is for the test cases already added into OVP - # 5.run default testsuite on Tuesday against ha scenario - # 6.not used for release criteria or compliance, only to debug the dovetail tool bugs + # 2.testsuite default here is for the test cases already added into OVP + # 3.run default testsuite mandatory test cases against ha scenario + # 4.run default testsuite optional test cases against ha scenario + # 5.not used for release criteria or compliance, only to debug the dovetail tool bugs - conditional-step: condition-kind: and condition-operands: - condition-kind: regex-match regex: '.*-ha' label: '{scenario}' - - condition-kind: day-of-week - day-selector: select-days - days: - MON: true - WED: true - FRI: true - use-build-time: true steps: - trigger-builds: - - project: 'dovetail-fuel-{pod}-proposed_tests-{stream}' + - project: 'dovetail-fuel-{pod}-default-mandatory-{stream}' current-parameters: false predefined-parameters: DEPLOY_SCENARIO={scenario} @@ -230,14 +222,9 @@ - condition-kind: regex-match regex: '.*-ha' label: '{scenario}' - - condition-kind: day-of-week - day-selector: select-days - days: - TUES: true - use-build-time: true steps: - trigger-builds: - - project: 'dovetail-fuel-{pod}-default-{stream}' + - project: 'dovetail-fuel-{pod}-default-optional-{stream}' current-parameters: false predefined-parameters: DEPLOY_SCENARIO={scenario} @@ -267,8 +254,7 @@ unstable-threshold: 'FAILURE' publishers: - - email: - recipients: peter.barabas@ericsson.com fzhadaev@mirantis.com + - email-fuel-ptl - email-jenkins-admins-on-failure - job-template: @@ -324,8 +310,7 @@ !include-raw-escape: ./fuel-deploy.sh publishers: - - email: - recipients: peter.barabas@ericsson.com fzhadaev@mirantis.com + - email-fuel-ptl - email-jenkins-admins-on-failure - report-provision-result diff --git a/jjb/fuel/fuel-verify-jobs.yaml b/jjb/fuel/fuel-verify-jobs.yaml index f48822d7f..8eb5ab0cd 100644 --- a/jjb/fuel/fuel-verify-jobs.yaml +++ b/jjb/fuel/fuel-verify-jobs.yaml @@ -141,19 +141,6 @@ node-parameters: true kill-phase-on: NEVER abort-all-job: true - - name: 'functest-fuel-virtual-suite-{stream}' - current-parameters: false - predefined-parameters: | - FUNCTEST_MODE=testcase - FUNCTEST_SUITE_NAME=vping_ssh - DEPLOY_SCENARIO=$DEPLOY_SCENARIO - BRANCH=$BRANCH - GERRIT_REFSPEC=$GERRIT_REFSPEC - GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER - GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE - node-parameters: true - kill-phase-on: NEVER - abort-all-job: true - job-template: name: 'fuel-verify-{phase}-{stream}' diff --git a/jjb/fuel/fuel-weekly-jobs.yaml b/jjb/fuel/fuel-weekly-jobs.yaml index aca625d2b..c6b921729 100644 --- a/jjb/fuel/fuel-weekly-jobs.yaml +++ b/jjb/fuel/fuel-weekly-jobs.yaml @@ -118,8 +118,7 @@ unstable-threshold: 'FAILURE' publishers: - - email: - recipients: peter.barabas@ericsson.com fzhadaev@mirantis.com + - email-fuel-ptl - email-jenkins-admins-on-failure - job-template: @@ -173,8 +172,7 @@ !include-raw-escape: ./fuel-deploy.sh publishers: - - email: - recipients: peter.barabas@ericsson.com fzhadaev@mirantis.com + - email-fuel-ptl - email-jenkins-admins-on-failure - report-provision-result |