jobs:
- 'compass-verify-{stream}'
- 'compass-daily-{stream}'
- - 'compass-build-iso'
- - 'compass-build-ppa'
+ - 'compass-build-iso-{stream}'
+ - 'compass-build-ppa-{stream}'
- 'compass-deploy-virtual-{flavor}'
- 'compass-deploy-bare-huawei-us'
- project-parameter:
project: '{project}'
- gerrit-parameter:
- branch: 'master'
+ branch: '{branch}'
- compass-parameter:
installer: '{installer}'
- string:
project-pattern: '{project}'
branches:
- branch-compare-type: 'ANT'
- branch-pattern: '**/master'
+ branch-pattern: '**/{branch}'
forbidden-file-paths:
- compare-type: ANT
pattern: 'docs/**|.gitignore'
block: true
- job-template:
- name: 'compass-build-iso'
+ name: 'compass-build-iso-{stream}'
node: ericsson-build
- git-scm:
credentials-id: '{ssh-credentials}'
refspec: ''
- branch: 'master'
+ branch: '{branch}'
builders:
- 'builder-compass-build-iso'
- 'builder-compass-workspace-cleanup'
- job-template:
- name: 'compass-build-ppa'
+ name: 'compass-build-ppa-{stream}'
description: "build ppa(using docker) in huawei lab"
- git-scm:
credentials-id: '{ssh-credentials}'
refspec: ''
- branch: 'master'
+ branch: '{branch}'
triggers:
- timed: 'H 16 * * *'
- string:
name: PPA_CACHE
default: "$WORKSPACE/work/repo/"
+ - choice:
+ name: COMPASS-OPENSTACK-VERSION
+ choices:
+ - 'liberty'
+ - 'juno'
+ - choice:
+ name: COMPASS-OS-VERSION
+ choices:
+ - 'ubuntu-trusty'
+ - 'rhel7'
########################
# builder macros
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
cd $WORKSPACE
+ 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!"
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