diff options
Diffstat (limited to 'jjb/dovetail/dovetail-ci-jobs.yaml')
| -rw-r--r-- | jjb/dovetail/dovetail-ci-jobs.yaml | 82 |
1 files changed, 8 insertions, 74 deletions
diff --git a/jjb/dovetail/dovetail-ci-jobs.yaml b/jjb/dovetail/dovetail-ci-jobs.yaml index abbffb2af..d45a2eabb 100644 --- a/jjb/dovetail/dovetail-ci-jobs.yaml +++ b/jjb/dovetail/dovetail-ci-jobs.yaml @@ -21,14 +21,8 @@ gs-pathname: '' docker-tag: 'latest' disabled: true - fraser: &fraser - stream: fraser - branch: 'stable/{stream}' - dovetail-branch: 'stable/{stream}' - gs-pathname: '/{stream}' - docker-tag: 'ovp-2.0.0' - gambia: &gambia - stream: gambia + hunter: &hunter + stream: hunter branch: 'stable/{stream}' dovetail-branch: 'master' gs-pathname: '/{stream}' @@ -61,22 +55,12 @@ slave-label: fuel-baremetal SUT: fuel auto-trigger-name: 'daily-trigger-disabled' - <<: *fraser - - virtual: - slave-label: fuel-virtual - SUT: fuel - auto-trigger-name: 'daily-trigger-disabled' - <<: *fraser - - baremetal: - slave-label: fuel-baremetal - SUT: fuel - auto-trigger-name: 'daily-trigger-disabled' - <<: *gambia + <<: *hunter - virtual: slave-label: fuel-virtual SUT: fuel auto-trigger-name: 'daily-trigger-disabled' - <<: *gambia + <<: *hunter # compass CI PODs - baremetal: slave-label: compass-baremetal @@ -92,22 +76,12 @@ slave-label: compass-baremetal SUT: compass auto-trigger-name: 'daily-trigger-disabled' - <<: *fraser + <<: *hunter - virtual: slave-label: compass-virtual SUT: compass auto-trigger-name: 'daily-trigger-disabled' - <<: *fraser - - baremetal: - slave-label: compass-baremetal - SUT: compass - auto-trigger-name: 'daily-trigger-disabled' - <<: *gambia - - virtual: - slave-label: compass-virtual - SUT: compass - auto-trigger-name: 'daily-trigger-disabled' - <<: *gambia + <<: *hunter # ------------------------------- # Installers not using labels # CI PODs @@ -129,22 +103,12 @@ slave-label: apex-virtual-master SUT: apex auto-trigger-name: 'daily-trigger-disabled' - <<: *fraser - - baremetal: - slave-label: apex-baremetal-master - SUT: apex - auto-trigger-name: 'daily-trigger-disabled' - <<: *fraser - - virtual: - slave-label: apex-virtual-master - SUT: apex - auto-trigger-name: 'daily-trigger-disabled' - <<: *gambia + <<: *hunter - baremetal: slave-label: apex-baremetal-master SUT: apex auto-trigger-name: 'daily-trigger-disabled' - <<: *gambia + <<: *hunter # armband CI PODs - armband-baremetal: slave-label: armband-baremetal @@ -156,16 +120,6 @@ SUT: fuel auto-trigger-name: 'daily-trigger-disabled' <<: *master - - armband-baremetal: - slave-label: armband-baremetal - SUT: fuel - auto-trigger-name: 'daily-trigger-disabled' - <<: *fraser - - armband-virtual: - slave-label: armband-virtual - SUT: fuel - auto-trigger-name: 'daily-trigger-disabled' - <<: *fraser # ------------------------------- # None-CI PODs # ------------------------------- @@ -189,26 +143,6 @@ SUT: fuel auto-trigger-name: 'daily-trigger-disabled' <<: *master - - zte-pod1: - slave-label: zte-pod1 - SUT: fuel - auto-trigger-name: 'daily-trigger-disabled' - <<: *fraser - - zte-pod3: - slave-label: zte-pod3 - SUT: fuel - auto-trigger-name: 'daily-trigger-disabled' - <<: *fraser - - huawei-pod4: - slave-label: huawei-pod4 - SUT: apex - auto-trigger-name: 'daily-trigger-disabled' - <<: *fraser - - huawei-pod7: - slave-label: huawei-pod7 - SUT: compass - auto-trigger-name: 'daily-trigger-disabled' - <<: *fraser # ------------------------------- testsuite: |