diff options
Diffstat (limited to 'jjb')
| -rw-r--r-- | jjb/compass4nfv/compass-dovetail-jobs.yml | 25 | ||||
| -rw-r--r-- | jjb/dovetail/dovetail-ci-jobs.yml | 1 | ||||
| -rw-r--r-- | jjb/dovetail/dovetail-weekly-jobs.yml | 31 |
3 files changed, 22 insertions, 35 deletions
diff --git a/jjb/compass4nfv/compass-dovetail-jobs.yml b/jjb/compass4nfv/compass-dovetail-jobs.yml index d49d0ec5f..30c80e648 100644 --- a/jjb/compass4nfv/compass-dovetail-jobs.yml +++ b/jjb/compass4nfv/compass-dovetail-jobs.yml @@ -6,8 +6,8 @@ #---------------------------------- # BRANCH ANCHORS #---------------------------------- - colorado: &colorado - stream: colorado + danube: &danube + stream: danube branch: 'stable/{stream}' gs-pathname: '/{stream}' disabled: false @@ -20,14 +20,14 @@ pod: - baremetal: slave-label: compass-baremetal - os-version: 'trusty' - <<: *colorado + os-version: 'xenial' + <<: *danube #----------------------------------- # scenarios #----------------------------------- scenario: - 'os-nosdn-nofeature-ha': - disabled: false + disabled: true auto-trigger-name: 'compass-{scenario}-{pod}-weekly-{stream}-trigger' jobs: @@ -108,17 +108,6 @@ build-step-failure-threshold: 'never' failure-threshold: 'never' unstable-threshold: 'FAILURE' - - trigger-builds: - - project: 'dovetail-compass-{pod}-proposed_tests-weekly-{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: 'compass-deploy-{pod}-weekly-{stream}' @@ -192,13 +181,13 @@ - choice: name: COMPASS_OPENSTACK_VERSION choices: - - 'mitaka' + - 'newton' ######################## # trigger macros ######################## - trigger: - name: 'compass-os-nosdn-nofeature-ha-baremetal-weekly-colorado-trigger' + name: 'compass-os-nosdn-nofeature-ha-baremetal-weekly-danube-trigger' triggers: - timed: 'H H * * 0' diff --git a/jjb/dovetail/dovetail-ci-jobs.yml b/jjb/dovetail/dovetail-ci-jobs.yml index 5651fc3f2..869048088 100644 --- a/jjb/dovetail/dovetail-ci-jobs.yml +++ b/jjb/dovetail/dovetail-ci-jobs.yml @@ -140,7 +140,6 @@ #-------------------------------- testsuite: - 'debug' - - 'proposed_tests' - 'compliance_set' jobs: diff --git a/jjb/dovetail/dovetail-weekly-jobs.yml b/jjb/dovetail/dovetail-weekly-jobs.yml index eaa11b54a..915feb5e8 100644 --- a/jjb/dovetail/dovetail-weekly-jobs.yml +++ b/jjb/dovetail/dovetail-weekly-jobs.yml @@ -10,8 +10,8 @@ dovetail-branch: '{stream}' gs-pathname: '' docker-tag: 'latest' - colorado: &colorado - stream: colorado + danube: &danube + stream: danube branch: 'stable/{stream}' dovetail-branch: master gs-pathname: '/{stream}' @@ -28,40 +28,39 @@ pod: # - baremetal: # slave-label: apex-baremetal -# sut: apex -# <<: *colorado +# SUT: apex +# <<: *danube - baremetal: slave-label: compass-baremetal - sut: compass - <<: *colorado + SUT: compass + <<: *danube # - baremetal: # slave-label: fuel-baremetal -# sut: fuel -# <<: *master +# SUT: fuel +# <<: *danube # - baremetal: # slave-label: joid-baremetal -# sut: joid -# <<: *colorado +# SUT: joid +# <<: *danube testsuite: - 'debug' - - 'proposed_tests' - 'compliance_set' loop: - 'weekly': - job-timeout: 60 + job-timeout: 180 jobs: - - 'dovetail-{sut}-{pod}-{testsuite}-{loop}-{stream}' + - 'dovetail-{SUT}-{pod}-{testsuite}-{loop}-{stream}' ################################ # job template ################################ - job-template: - name: 'dovetail-{sut}-{pod}-{testsuite}-{loop}-{stream}' + name: 'dovetail-{SUT}-{pod}-{testsuite}-{loop}-{stream}' - disabled: false + disabled: true concurrent: true @@ -84,7 +83,7 @@ - project-parameter: project: '{project}' branch: '{dovetail-branch}' - - '{sut}-defaults' + - '{SUT}-defaults' - '{slave-label}-defaults' - string: name: DEPLOY_SCENARIO |