summaryrefslogtreecommitdiffstats
path: root/jjb/compass4nfv/compass4nfv.yml
diff options
context:
space:
mode:
Diffstat (limited to 'jjb/compass4nfv/compass4nfv.yml')
-rw-r--r--jjb/compass4nfv/compass4nfv.yml36
1 files changed, 25 insertions, 11 deletions
diff --git a/jjb/compass4nfv/compass4nfv.yml b/jjb/compass4nfv/compass4nfv.yml
index 40402011c..3645bbba3 100644
--- a/jjb/compass4nfv/compass4nfv.yml
+++ b/jjb/compass4nfv/compass4nfv.yml
@@ -7,8 +7,8 @@
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'
@@ -56,7 +56,7 @@
- project-parameter:
project: '{project}'
- gerrit-parameter:
- branch: 'master'
+ branch: '{branch}'
- compass-parameter:
installer: '{installer}'
- string:
@@ -86,7 +86,7 @@
project-pattern: '{project}'
branches:
- branch-compare-type: 'ANT'
- branch-pattern: '**/master'
+ branch-pattern: '**/{branch}'
forbidden-file-paths:
- compare-type: ANT
pattern: 'docs/**|.gitignore'
@@ -130,7 +130,7 @@
builders:
- trigger-builds:
- - project: 'compass-build-iso'
+ - project: 'compass-build-iso-{stream}'
git-revision: true
block: true
- trigger-builds:
@@ -147,7 +147,7 @@
block: true
- job-template:
- name: 'compass-build-iso'
+ name: 'compass-build-iso-{stream}'
node: ericsson-build
@@ -169,7 +169,7 @@
- git-scm:
credentials-id: '{ssh-credentials}'
refspec: ''
- branch: 'master'
+ branch: '{branch}'
builders:
- 'builder-compass-build-iso'
@@ -177,7 +177,7 @@
- 'builder-compass-workspace-cleanup'
- job-template:
- name: 'compass-build-ppa'
+ name: 'compass-build-ppa-{stream}'
description: "build ppa(using docker) in huawei lab"
@@ -201,7 +201,7 @@
- git-scm:
credentials-id: '{ssh-credentials}'
refspec: ''
- branch: 'master'
+ branch: '{branch}'
triggers:
- timed: 'H 16 * * *'
@@ -315,6 +315,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
@@ -405,6 +415,8 @@
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!"
@@ -416,7 +428,7 @@
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
@@ -439,6 +451,8 @@
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!"
@@ -450,7 +464,7 @@
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