summaryrefslogtreecommitdiffstats
path: root/jjb/compass4nfv
diff options
context:
space:
mode:
Diffstat (limited to 'jjb/compass4nfv')
-rw-r--r--jjb/compass4nfv/compass-ci-jobs.yml37
-rw-r--r--jjb/compass4nfv/compass-deploy.sh37
-rw-r--r--jjb/compass4nfv/compass-project-jobs.yml92
3 files changed, 73 insertions, 93 deletions
diff --git a/jjb/compass4nfv/compass-ci-jobs.yml b/jjb/compass4nfv/compass-ci-jobs.yml
index 64a4b317c..f43ab59ec 100644
--- a/jjb/compass4nfv/compass-ci-jobs.yml
+++ b/jjb/compass4nfv/compass-ci-jobs.yml
@@ -24,11 +24,15 @@
#--------------------------------
- huawei-us-deploy-bare-1:
<<: *brahmaputra
+ - huawei-virtual:
+ <<: *brahmaputra
#--------------------------------
# master
#--------------------------------
- intel-pod8:
<<: *master
+ - huawei-virtual:
+ <<: *master
scenario:
- 'os-nosdn-nofeature-ha':
@@ -103,7 +107,7 @@
condition: COMPLETED
projects:
- name: 'functest-compass-{pod}-daily-{stream}'
- current-parameters: false
+ current-parameters: true
predefined-parameters: 'DEPLOY_SCENARIO={scenario}'
kill-phase-on: NEVER
- multijob:
@@ -111,7 +115,7 @@
condition: COMPLETED
projects:
- name: 'yardstick-compass-{pod}-daily-{stream}'
- current-parameters: false
+ current-parameters: true
predefined-parameters: 'DEPLOY_SCENARIO={scenario}'
kill-phase-on: NEVER
@@ -204,7 +208,16 @@
choices:
- 'trusty'
- 'centos7'
-
+- parameter:
+ name: 'huawei-virtual-defaults'
+ parameters:
+ - label:
+ name: SLAVE_LABEL
+ default: 'huawei-deploy-vm'
+ - string:
+ name: GIT_BASE
+ default: https://gerrit.opnfv.org/gerrit/$PROJECT
+ description: 'Git URL to use on these Jenkins Slaves'
########################
# trigger macros
########################
@@ -231,7 +244,7 @@
- trigger:
name: 'compass-os-odl_l2-nofeature-ha-intel-pod8-trigger'
triggers:
- - timed: '0 16 * * *'
+ - timed: ''
- trigger:
name: 'compass-os-onos-nofeature-ha-intel-pod8-trigger'
triggers:
@@ -240,3 +253,19 @@
name: 'compass-os-ocl-nofeature-ha-intel-pod8-trigger'
triggers:
- timed: ''
+- trigger:
+ name: 'compass-os-nosdn-nofeature-ha-huawei-virtual-trigger'
+ triggers:
+ - timed: ''
+- trigger:
+ name: 'compass-os-odl_l2-nofeature-ha-huawei-virtual-trigger'
+ triggers:
+ - timed: '0 16 * * *'
+- trigger:
+ name: 'compass-os-onos-nofeature-ha-huawei-virtual-trigger'
+ triggers:
+ - timed: '0 16 * * *'
+- trigger:
+ name: 'compass-os-ocl-nofeature-ha-huawei-virtual-trigger'
+ triggers:
+ - timed: ''
diff --git a/jjb/compass4nfv/compass-deploy.sh b/jjb/compass4nfv/compass-deploy.sh
new file mode 100644
index 000000000..7f227708b
--- /dev/null
+++ b/jjb/compass4nfv/compass-deploy.sh
@@ -0,0 +1,37 @@
+#!/bin/bash
+set -x
+
+# log info to console
+echo "Starting the deployment on baremetal environment using $INSTALLER_TYPE. This could take some time..."
+echo "--------------------------------------------------------"
+echo
+
+export CONFDIR=$WORKSPACE/deploy/conf
+export ISO_URL=file://$BUILD_DIRECTORY/compass.iso
+if [[ "$NODE_NAME" =~ "-vm" ]]; then
+ export NETWORK_CONF=$CONFDIR/vm_environment/$NODE_NAME/network.yml
+ export DHA_CONF=$CONFDIR/vm_environment/${{DEPLOY_SCENARIO}}.yml
+else
+ export INSTALL_NIC=eth0
+ export NETWORK_CONF=$CONFDIR/hardware_environment/$NODE_NAME/network.yml
+ export DHA_CONF=$CONFDIR/hardware_environment/$NODE_NAME/${{DEPLOY_SCENARIO}}.yml
+fi
+
+cd $WORKSPACE
+
+export OS_VERSION=${{COMPASS_OS_VERSION}}
+export OPENSTACK_VERSION=${{COMPASS_OPENSTACK_VERSION}}
+./deploy.sh --dha ${DHA_CONF} --network ${NETWORK_CONF}
+if [ $? -ne 0 ]; then
+ echo "depolyment failed!"
+ deploy_ret=1
+fi
+
+echo
+echo "--------------------------------------------------------"
+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
+
+exit $deploy_ret
diff --git a/jjb/compass4nfv/compass-project-jobs.yml b/jjb/compass4nfv/compass-project-jobs.yml
index 565aaa33f..0316e6f70 100644
--- a/jjb/compass4nfv/compass-project-jobs.yml
+++ b/jjb/compass4nfv/compass-project-jobs.yml
@@ -33,8 +33,7 @@
- 'compass-verify-{stream}'
- 'compass-build-iso-{stream}'
- 'compass-build-ppa-{stream}'
- - 'compass-deploy-virtual-{scenario}-{stream}'
- - 'compass-virtual-daily-{stream}'
+
########################
# job templates
@@ -109,9 +108,9 @@
fingerprint: true
- job-template:
- name: 'compass-virtual-daily-{stream}'
+ name: 'compass-build-iso-{stream}'
- node: huawei-build
+ node: ericsson-build
concurrent: true
@@ -140,52 +139,6 @@
- timed: 'H 14 * * *'
builders:
- - trigger-builds:
- - project: 'compass-build-iso-{stream}'
- git-revision: true
- block: true
- - trigger-builds:
- - project: 'compass-deploy-virtual-os-nosdn-nofeature-ha-{stream}'
- git-revision: true
- block: false
- - trigger-builds:
- - project: 'compass-deploy-virtual-os-odl_l2-nofeature-ha-{stream}'
- git-revision: true
- block: false
- - trigger-builds:
- - project: 'compass-deploy-virtual-os-onos-nofeature-ha-{stream}'
- git-revision: true
- block: false
-
-- job-template:
- name: 'compass-build-iso-{stream}'
-
- node: ericsson-build
-
- concurrent: true
-
- properties:
- - throttle:
- enabled: true
- max-total: 1
- max-per-node: 1
-
- parameters:
- - project-parameter:
- project: '{project}'
- - compass-project-parameter:
- installer: '{installer}'
- gs-pathname: '{gs-pathname}'
- - '{node}-defaults'
- - '{installer}-defaults'
-
- scm:
- - git-scm:
- credentials-id: '{ssh-credentials}'
- refspec: ''
- branch: '{branch}'
-
- builders:
- shell:
!include-raw: ./compass-build.sh
- shell:
@@ -226,46 +179,7 @@
- shell:
!include-raw: ./compass-makeppa.sh
-- job-template:
- name: 'compass-deploy-virtual-{scenario}-{stream}'
-
- disabled: false
-
- node: '{node}'
-
- concurrent: true
-
- properties:
- - throttle:
- enabled: true
- max-total: 1
- max-per-node: 1
-
- parameters:
- - project-parameter:
- project: '{project}'
- - compass-project-parameter:
- installer: '{installer}'
- gs-pathname: '{gs-pathname}'
- - string:
- name: DEPLOY_SCENARIO
- default: '{scenario}'
- - '{node}-defaults'
- - '{installer}-defaults'
- builders:
- - shell:
- !include-raw: ./compass-workspace-precleanup.sh
- - shell:
- !include-raw: ./compass-download-artifact.sh
- - shell:
- !include-raw: ./compass-deploy-virtual.sh
-
- publishers:
- - archive:
- artifacts: 'ansible.log'
- allow-empty: 'true'
- fingerprint: true
########################
# parameter macros