Code Review
/
releng.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "add dashboard for bottlenecks project"
[releng.git]
/
jjb
/
compass4nfv
/
compass4nfv.yml
diff --git
a/jjb/compass4nfv/compass4nfv.yml
b/jjb/compass4nfv/compass4nfv.yml
index
3ef252f
..
f1bcee7
100644
(file)
--- a/
jjb/compass4nfv/compass4nfv.yml
+++ b/
jjb/compass4nfv/compass4nfv.yml
@@
-126,25
+126,30
@@
branch: '{branch}'
triggers:
branch: '{branch}'
triggers:
- - timed: '
@midnight
'
+ - timed: '
H 16 * * *
'
builders:
- trigger-builds:
builders:
- trigger-builds:
- - project: 'compass-build-iso'
+ - project: 'compass-build-iso
-{stream}
'
git-revision: true
block: true
- trigger-builds:
- project: 'compass-deploy-virtual-cluster'
git-revision: true
block: true
git-revision: true
block: true
- trigger-builds:
- project: 'compass-deploy-virtual-cluster'
git-revision: true
block: true
-
#
- trigger-builds:
-
#
- project: 'compass-deploy-virtual-cluster-odl'
-
#
git-revision: true
-
#
block: true
+ - trigger-builds:
+ - project: 'compass-deploy-virtual-cluster-odl'
+ git-revision: true
+ block: true
- trigger-builds:
- project: 'compass-deploy-virtual-cluster-onos'
git-revision: true
block: true
- trigger-builds:
- project: 'compass-deploy-virtual-cluster-onos'
git-revision: true
block: true
+ - trigger-builds:
+ - project: 'compass-deploy-bare-huawei-us'
+ git-revision: true
+ block: true
+
- job-template:
name: 'compass-build-iso-{stream}'
- job-template:
name: 'compass-build-iso-{stream}'
@@
-316,15
+321,15
@@
name: PPA_CACHE
default: "$WORKSPACE/work/repo/"
- choice:
name: PPA_CACHE
default: "$WORKSPACE/work/repo/"
- choice:
- name: COMPASS
-OPENSTACK-
VERSION
+ name: COMPASS
_OPENSTACK_
VERSION
choices:
- 'liberty'
- 'juno'
- choice:
choices:
- 'liberty'
- 'juno'
- choice:
- name: COMPASS
-OS-
VERSION
+ name: COMPASS
_OS_
VERSION
choices:
choices:
- - '
ubuntu-
trusty'
- - '
rhel
7'
+ - 'trusty'
+ - '
centos
7'
########################
# builder macros
########################
# builder macros
@@
-415,6
+420,8
@@
export EXTERNAL_NIC=vnic_ci
cd $WORKSPACE
export EXTERNAL_NIC=vnic_ci
cd $WORKSPACE
+ export OS_VERSION=${COMPASS_OS_VERSION}
+ export OPENSTACK_VERSION=${COMPASS_OPENSTACK_VERSION}
./deploy.sh $FLAVOR_CONF
if [ $? -ne 0 ]; then
echo "depolyment failed!"
./deploy.sh $FLAVOR_CONF
if [ $? -ne 0 ]; then
echo "depolyment failed!"
@@
-426,7
+433,7
@@
echo "Done!"
ssh_options="-o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no"
echo "Done!"
ssh_options="-o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no"
- sshpass -p root scp 2>/dev/null $ssh_options root@${installer_ip}:/var/ansible/run/openstack_
juno
-opnfv2/ansible.log ./ &> /dev/null
+ sshpass -p root scp 2>/dev/null $ssh_options root@${installer_ip}:/var/ansible/run/openstack_
${COMPASS_OPENSTACK_VERSION}
-opnfv2/ansible.log ./ &> /dev/null
exit $deploy_ret
exit $deploy_ret
@@
-449,8
+456,8
@@
cd $WORKSPACE
cd $WORKSPACE
- export OS_VERSION=${COMPASS
-OS-
VERSION}
- export OPENSTACK_VERSION=${COMPASS
-OPENSTACK-
VERSION}
+ export OS_VERSION=${COMPASS
_OS_
VERSION}
+ export OPENSTACK_VERSION=${COMPASS
_OPENSTACK_
VERSION}
./deploy.sh --dha $CONFDIR/dha.yml --network $CONFDIR/network.yml
if [ $? -ne 0 ]; then
echo "depolyment failed!"
./deploy.sh --dha $CONFDIR/dha.yml --network $CONFDIR/network.yml
if [ $? -ne 0 ]; then
echo "depolyment failed!"
@@
-462,7
+469,7
@@
echo "Done!"
ssh_options="-o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no"
echo "Done!"
ssh_options="-o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no"
- sshpass -p root scp 2>/dev/null $ssh_options root@${installer_ip}:/var/ansible/run/openstack_${COMPASS
-OPENSTACK-
VERSION}-opnfv2/ansible.log ./ &> /dev/null
+ sshpass -p root scp 2>/dev/null $ssh_options root@${installer_ip}:/var/ansible/run/openstack_${COMPASS
_OPENSTACK_
VERSION}-opnfv2/ansible.log ./ &> /dev/null
exit $deploy_ret
exit $deploy_ret