summaryrefslogtreecommitdiffstats
path: root/jjb/compass4nfv
diff options
context:
space:
mode:
authorJun Li <matthew.lijun@huawei.com>2016-01-11 04:11:03 +0000
committerGerrit Code Review <gerrit@172.30.200.206>2016-01-11 04:11:04 +0000
commitf70c960c329b78ff1ccf90b97f1ad9b1311f4e6e (patch)
tree4cceea21f09befabd5079c3aff6b73dddb4e2d82 /jjb/compass4nfv
parentf4a6f4cf5d8c6d5bb7875fa4199039612d474ab0 (diff)
parent31f32f6c3f2e3741aa2ee5b2e81ed735db6efa47 (diff)
Merge "enable onos in compass-virtual-deployment"
Diffstat (limited to 'jjb/compass4nfv')
-rw-r--r--jjb/compass4nfv/compass-ci-jobs.yml4
-rw-r--r--jjb/compass4nfv/compass-project-jobs.yml12
2 files changed, 8 insertions, 8 deletions
diff --git a/jjb/compass4nfv/compass-ci-jobs.yml b/jjb/compass4nfv/compass-ci-jobs.yml
index b79e21cf4..693e1b0cd 100644
--- a/jjb/compass4nfv/compass-ci-jobs.yml
+++ b/jjb/compass4nfv/compass-ci-jobs.yml
@@ -37,8 +37,8 @@
disabled: false
- 'onos':
disabled: false
- - 'opencontrail':
- disabled: true
+# - 'opencontrail':
+# disabled: true
jobs:
- 'compass-{sdn-controller}-{pod}-daily-{stream}'
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