diff options
| author |   Jun Li <matthew.lijun@huawei.com> | 2016-08-24 07:29:12 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@172.30.200.206> | 2016-08-24 07:29:13 +0000 |
| commit | f2cb55182f9b056091d6a66971fa3078386fb6d3 (patch) | |
| tree | 9d2b626549ad94522d8f2af7763a0c679ffe6f8b | |
| parent | d4cf83c7e3fbaa9d5ec96dfd7814050b8f8d6e9b (diff) | |
| parent | fb41712ab28fd8cb88bd0d87116b3876f4b3e401 (diff) | |
Merge "[compass] create new job for verify of colorado"
| -rw-r--r-- | jjb/compass4nfv/compass-ci-jobs.yml | 40 | ||||
| -rw-r--r-- | jjb/compass4nfv/compass-project-jobs.yml | 2 |
2 files changed, 21 insertions, 21 deletions
diff --git a/jjb/compass4nfv/compass-ci-jobs.yml b/jjb/compass4nfv/compass-ci-jobs.yml index efd1fc150..426e59777 100644 --- a/jjb/compass4nfv/compass-ci-jobs.yml +++ b/jjb/compass4nfv/compass-ci-jobs.yml @@ -10,8 +10,8 @@ stream: master branch: '{stream}' gs-pathname: '' - brahmaputra: &brahmaputra - stream: brahmaputra + colorado: &colorado + stream: colorado branch: 'stable/{stream}' gs-pathname: '/{stream}' #-------------------------------- @@ -31,11 +31,11 @@ - baremetal: slave-label: compass-baremetal os-version: 'trusty' - <<: *brahmaputra + <<: *colorado - virtual: slave-label: compass-virtual os-version: 'trusty' - <<: *brahmaputra + <<: *colorado #-------------------------------- # master #-------------------------------- @@ -311,35 +311,35 @@ - timed: '' - trigger: - name: 'compass-os-nosdn-nofeature-ha-baremetal-brahmaputra-trigger' + name: 'compass-os-nosdn-nofeature-ha-baremetal-colorado-trigger' triggers: - timed: '' - trigger: - name: 'compass-os-odl_l2-nofeature-ha-baremetal-brahmaputra-trigger' + name: 'compass-os-odl_l2-nofeature-ha-baremetal-colorado-trigger' triggers: - timed: '' - trigger: - name: 'compass-os-odl_l3-nofeature-ha-baremetal-brahmaputra-trigger' + name: 'compass-os-odl_l3-nofeature-ha-baremetal-colorado-trigger' triggers: - timed: '' - trigger: - name: 'compass-os-onos-nofeature-ha-baremetal-brahmaputra-trigger' + name: 'compass-os-onos-nofeature-ha-baremetal-colorado-trigger' triggers: - timed: '' - trigger: - name: 'compass-os-ocl-nofeature-ha-baremetal-brahmaputra-trigger' + name: 'compass-os-ocl-nofeature-ha-baremetal-colorado-trigger' triggers: - timed: '' - trigger: - name: 'compass-os-onos-sfc-ha-baremetal-brahmaputra-trigger' + name: 'compass-os-onos-sfc-ha-baremetal-colorado-trigger' triggers: - timed: '' - trigger: - name: 'compass-os-odl_l2-moon-ha-baremetal-brahmaputra-trigger' + name: 'compass-os-odl_l2-moon-ha-baremetal-colorado-trigger' triggers: - timed: '' - trigger: - name: 'compass-os-nosdn-kvm-ha-baremetal-brahmaputra-trigger' + name: 'compass-os-nosdn-kvm-ha-baremetal-colorado-trigger' triggers: - timed: '' @@ -377,34 +377,34 @@ - timed: '' - trigger: - name: 'compass-os-nosdn-nofeature-ha-virtual-brahmaputra-trigger' + name: 'compass-os-nosdn-nofeature-ha-virtual-colorado-trigger' triggers: - timed: '' - trigger: - name: 'compass-os-odl_l2-nofeature-ha-virtual-brahmaputra-trigger' + name: 'compass-os-odl_l2-nofeature-ha-virtual-colorado-trigger' triggers: - timed: '' - trigger: - name: 'compass-os-odl_l3-nofeature-ha-virtual-brahmaputra-trigger' + name: 'compass-os-odl_l3-nofeature-ha-virtual-colorado-trigger' triggers: - timed: '' - trigger: - name: 'compass-os-onos-nofeature-ha-virtual-brahmaputra-trigger' + name: 'compass-os-onos-nofeature-ha-virtual-colorado-trigger' triggers: - timed: '' - trigger: - name: 'compass-os-ocl-nofeature-ha-virtual-brahmaputra-trigger' + name: 'compass-os-ocl-nofeature-ha-virtual-colorado-trigger' triggers: - timed: '' - trigger: - name: 'compass-os-onos-sfc-ha-virtual-brahmaputra-trigger' + name: 'compass-os-onos-sfc-ha-virtual-colorado-trigger' triggers: - timed: '' - trigger: - name: 'compass-os-odl_l2-moon-ha-virtual-brahmaputra-trigger' + name: 'compass-os-odl_l2-moon-ha-virtual-colorado-trigger' triggers: - timed: '' - trigger: - name: 'compass-os-nosdn-kvm-ha-virtual-brahmaputra-trigger' + name: 'compass-os-nosdn-kvm-ha-virtual-colorado-trigger' triggers: - timed: '' diff --git a/jjb/compass4nfv/compass-project-jobs.yml b/jjb/compass4nfv/compass-project-jobs.yml index e92c7653b..bede7de46 100644 --- a/jjb/compass4nfv/compass-project-jobs.yml +++ b/jjb/compass4nfv/compass-project-jobs.yml @@ -12,7 +12,7 @@ - master: branch: '{stream}' gs-pathname: '' - - brahmaputra: + - colorado: branch: 'stable/{stream}' gs-pathname: '/{stream}' |