X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fdovetail%2Fdovetail-ci-jobs.yaml;h=d45a2eabb431da36719e3c2e0e61308abd991433;hb=f06619c6bdac4a4a81613897338899a3fbb3ac82;hp=e3b87c7cb6befbb25dc74fc222dec00d2ef4a47a;hpb=54f42524a0507f819df7cab9b1c4832c967c1411;p=releng.git diff --git a/jjb/dovetail/dovetail-ci-jobs.yaml b/jjb/dovetail/dovetail-ci-jobs.yaml index e3b87c7cb..d45a2eabb 100644 --- a/jjb/dovetail/dovetail-ci-jobs.yaml +++ b/jjb/dovetail/dovetail-ci-jobs.yaml @@ -20,12 +20,13 @@ dovetail-branch: '{stream}' gs-pathname: '' docker-tag: 'latest' - fraser: &fraser - stream: fraser + disabled: true + hunter: &hunter + stream: hunter branch: 'stable/{stream}' - dovetail-branch: 'stable/{stream}' + dovetail-branch: 'master' gs-pathname: '/{stream}' - docker-tag: 'ovp-2.0.0' + docker-tag: 'latest' # ---------------------------------- # POD, PLATFORM, AND BRANCH MAPPING @@ -54,12 +55,12 @@ slave-label: fuel-baremetal SUT: fuel auto-trigger-name: 'daily-trigger-disabled' - <<: *fraser + <<: *hunter - virtual: slave-label: fuel-virtual SUT: fuel auto-trigger-name: 'daily-trigger-disabled' - <<: *fraser + <<: *hunter # compass CI PODs - baremetal: slave-label: compass-baremetal @@ -75,12 +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 + <<: *hunter # ------------------------------- # Installers not using labels # CI PODs @@ -102,12 +103,12 @@ slave-label: apex-virtual-master SUT: apex auto-trigger-name: 'daily-trigger-disabled' - <<: *fraser + <<: *hunter - baremetal: slave-label: apex-baremetal-master SUT: apex auto-trigger-name: 'daily-trigger-disabled' - <<: *fraser + <<: *hunter # armband CI PODs - armband-baremetal: slave-label: armband-baremetal @@ -119,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 # ------------------------------- @@ -152,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: