diff options
Diffstat (limited to 'jjb/compass4nfv')
-rw-r--r-- | jjb/compass4nfv/compass-ci-jobs.yml | 12 | ||||
-rw-r--r-- | jjb/compass4nfv/compass-deploy-bare.sh | 3 | ||||
-rw-r--r-- | jjb/compass4nfv/compass-project-jobs.yml | 12 |
3 files changed, 13 insertions, 14 deletions
diff --git a/jjb/compass4nfv/compass-ci-jobs.yml b/jjb/compass4nfv/compass-ci-jobs.yml index b30345268..693e1b0cd 100644 --- a/jjb/compass4nfv/compass-ci-jobs.yml +++ b/jjb/compass4nfv/compass-ci-jobs.yml @@ -33,10 +33,10 @@ sdn-controller: - 'nosdn': disabled: false -# - 'odl': -# disabled: false -# - 'onos': -# disabled: false + - 'odl': + disabled: false + - 'onos': + disabled: false # - 'opencontrail': # disabled: true @@ -209,11 +209,11 @@ - trigger: name: 'compass-huawei-us-deploy-bare-1-nosdn-trigger' triggers: - - timed: '' + - timed: '0 16 * * * ' - trigger: name: 'compass-huawei-us-deploy-bare-1-odl-trigger' triggers: - - timed: '0 16 * * *' + - timed: '' - trigger: name: 'compass-huawei-us-deploy-bare-1-onos-trigger' triggers: diff --git a/jjb/compass4nfv/compass-deploy-bare.sh b/jjb/compass4nfv/compass-deploy-bare.sh index 1e5c62bdd..12b9b337b 100644 --- a/jjb/compass4nfv/compass-deploy-bare.sh +++ b/jjb/compass4nfv/compass-deploy-bare.sh @@ -8,8 +8,7 @@ echo export CONFDIR=$WORKSPACE/deploy/conf/hardware_environment/huawei_us_lab/pod1 export ISO_URL=file://$BUILD_DIRECTORY/compass.iso -export EXTERNAL_NIC=eth0 -export INSTALL_NIC=eth1 +export INSTALL_NIC=eth0 cd $WORKSPACE diff --git a/jjb/compass4nfv/compass-project-jobs.yml b/jjb/compass4nfv/compass-project-jobs.yml index c6133c3e3..1395fa532 100644 --- a/jjb/compass4nfv/compass-project-jobs.yml +++ b/jjb/compass4nfv/compass-project-jobs.yml @@ -19,12 +19,12 @@ - 'nosdn': disabled: false node: huawei-deploy-vm -# - 'odl': -# disabled: false -# node: huawei-deploy-vm -# - 'onos': -# disabled: false -# node: huawei-deploy-vm + - 'odl': + disabled: false + node: huawei-deploy-vm + - 'onos': + disabled: false + node: huawei-deploy-vm # - 'opencontrail': # disabled: true # node: huawei-deploy-vm |