summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormeimei <meimei@huawei.com>2016-07-05 01:45:22 +0000
committerGerrit Code Review <gerrit@172.30.200.206>2016-07-05 01:45:22 +0000
commit58be8eeba1e45acede39340c661d6c12c187eb82 (patch)
tree1855a9fd3b768569556733d2837a3e4145e04138
parent6e5fc37495ddbf9dd6ac19efe4e8fbd0aa474dfe (diff)
parent91ef09ffa00d6cbc0c004dbfa50aa52efde0d29d (diff)
Merge "[compass] set mitaka as default os release"
-rw-r--r--jjb/compass4nfv/compass-ci-jobs.yml2
-rw-r--r--jjb/compass4nfv/compass-project-jobs.yml2
2 files changed, 2 insertions, 2 deletions
diff --git a/jjb/compass4nfv/compass-ci-jobs.yml b/jjb/compass4nfv/compass-ci-jobs.yml
index 8a43355ca..52d678554 100644
--- a/jjb/compass4nfv/compass-ci-jobs.yml
+++ b/jjb/compass4nfv/compass-ci-jobs.yml
@@ -215,8 +215,8 @@
- choice:
name: COMPASS_OPENSTACK_VERSION
choices:
- - 'liberty'
- 'mitaka'
+ - 'liberty'
########################
# trigger macros
diff --git a/jjb/compass4nfv/compass-project-jobs.yml b/jjb/compass4nfv/compass-project-jobs.yml
index a0438ee1f..8cd67ba0b 100644
--- a/jjb/compass4nfv/compass-project-jobs.yml
+++ b/jjb/compass4nfv/compass-project-jobs.yml
@@ -243,8 +243,8 @@
- choice:
name: COMPASS_OPENSTACK_VERSION
choices:
- - 'liberty'
- 'mitaka'
+ - 'liberty'
- choice:
name: COMPASS_OS_VERSION
choices: