diff options
Diffstat (limited to 'jjb/fuel')
| -rw-r--r-- | jjb/fuel/fuel-daily-jobs.yaml | 14 | ||||
| -rw-r--r-- | jjb/fuel/fuel-project-jobs.yaml | 20 | ||||
| -rw-r--r-- | jjb/fuel/fuel-rtd-jobs.yaml | 8 |
3 files changed, 15 insertions, 27 deletions
diff --git a/jjb/fuel/fuel-daily-jobs.yaml b/jjb/fuel/fuel-daily-jobs.yaml index 7d90b0673..fb619c3f5 100644 --- a/jjb/fuel/fuel-daily-jobs.yaml +++ b/jjb/fuel/fuel-daily-jobs.yaml @@ -206,7 +206,7 @@ # 1.here the stream means the SUT stream, dovetail stream is defined in its own job # 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 + # 4.run default testsuite optional test cases against ha scenario twice one week # 5.not used for release criteria or compliance, only to debug the dovetail tool bugs - conditional-step: condition-kind: and @@ -214,9 +214,6 @@ - condition-kind: regex-match regex: '.*-ha' label: '{scenario}' - - condition-kind: regex-match - regex: 'fraser' - label: '{stream}' steps: - trigger-builds: - project: 'dovetail-fuel-{pod}-default-mandatory-{stream}' @@ -235,9 +232,12 @@ - condition-kind: regex-match regex: '.*-ha' label: '{scenario}' - - condition-kind: regex-match - regex: 'fraser' - label: '{stream}' + - condition-kind: day-of-week + day-selector: select-days + days: + MON: true + WED: true + use-build-time: true steps: - trigger-builds: - project: 'dovetail-fuel-{pod}-default-optional-{stream}' diff --git a/jjb/fuel/fuel-project-jobs.yaml b/jjb/fuel/fuel-project-jobs.yaml deleted file mode 100644 index f424c2014..000000000 --- a/jjb/fuel/fuel-project-jobs.yaml +++ /dev/null @@ -1,20 +0,0 @@ ---- -######################## -# Job configuration for fuel -######################## -- project: - name: fuel-project-jobs - - project: 'fuel' - - installer: 'fuel' - - stream: - - master: - branch: '{stream}' - gs-pathname: '' - disabled: false - - gambia: - branch: 'stable/{stream}' - gs-pathname: '/{stream}' - disabled: false diff --git a/jjb/fuel/fuel-rtd-jobs.yaml b/jjb/fuel/fuel-rtd-jobs.yaml index b2e8397a2..d40ef984f 100644 --- a/jjb/fuel/fuel-rtd-jobs.yaml +++ b/jjb/fuel/fuel-rtd-jobs.yaml @@ -8,5 +8,13 @@ rtd-build-url: 'https://readthedocs.org/api/v2/webhook/opnfv-fuel/47205/' rtd-token: '38f40bf6c08fd4bccb930871bc29b08404cf98b0' + stream: + - master: + branch: '{stream}' + disabled: false + - gambia: + branch: 'stable/{stream}' + disabled: false + jobs: - '{project-name}-rtd-jobs' |