summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--jjb/compass4nfv/compass-ci-jobs.yml64
-rw-r--r--jjb/compass4nfv/compass-deploy.sh1
-rw-r--r--jjb/compass4nfv/compass-project-jobs.yml2
-rw-r--r--jjb/joid/joid-deploy.sh7
-rw-r--r--utils/push-test-logs.sh4
-rw-r--r--utils/test/declaration/addtestcase.php40
-rw-r--r--utils/test/declaration/index.php221
-rw-r--r--utils/test/declaration/testcases.php36
8 files changed, 363 insertions, 12 deletions
diff --git a/jjb/compass4nfv/compass-ci-jobs.yml b/jjb/compass4nfv/compass-ci-jobs.yml
index 6bfc73778..500984ada 100644
--- a/jjb/compass4nfv/compass-ci-jobs.yml
+++ b/jjb/compass4nfv/compass-ci-jobs.yml
@@ -63,6 +63,12 @@
- 'os-onos-sfc-ha':
disabled: false
auto-trigger-name: 'compass-{scenario}-{pod}-{stream}-trigger'
+ - 'os-odl_l2-moon-noha':
+ disabled: false
+ auto-trigger-name: 'compass-{scenario}-{pod}-{stream}-trigger'
+ - 'os-nosdn-kvm-ha':
+ disabled: false
+ auto-trigger-name: 'compass-{scenario}-{pod}-{stream}-trigger'
jobs:
- 'compass-{scenario}-{pod}-daily-{stream}'
@@ -236,11 +242,11 @@
- trigger:
name: 'compass-os-odl_l2-nofeature-ha-huawei-pod2-master-trigger'
triggers:
- - timed: '0 21 * * *'
+ - timed: '0 23 * * *'
- trigger:
name: 'compass-os-odl_l3-nofeature-ha-huawei-pod2-master-trigger'
triggers:
- - timed: ''
+ - timed: '0 19 * * *'
- trigger:
name: 'compass-os-onos-nofeature-ha-huawei-pod2-master-trigger'
triggers:
@@ -248,10 +254,18 @@
- trigger:
name: 'compass-os-ocl-nofeature-ha-huawei-pod2-master-trigger'
triggers:
- - timed: ''
+ - timed: '0 11 * * *'
- trigger:
name: 'compass-os-onos-sfc-ha-huawei-pod2-master-trigger'
triggers:
+ - timed: '0 7 * * *'
+- trigger:
+ name: 'compass-os-odl_l2-moon-noha-huawei-pod2-master-trigger'
+ triggers:
+ - timed: ''
+- trigger:
+ name: 'compass-os-nosdn-kvm-ha-huawei-pod2-master-trigger'
+ triggers:
- timed: ''
- trigger:
@@ -261,11 +275,11 @@
- trigger:
name: 'compass-os-odl_l2-nofeature-ha-baremetal-master-trigger'
triggers:
- - timed: '0 21 * * *'
+ - timed: '0 23 * * *'
- trigger:
name: 'compass-os-odl_l3-nofeature-ha-baremetal-master-trigger'
triggers:
- - timed: ''
+ - timed: '0 19 * * *'
- trigger:
name: 'compass-os-onos-nofeature-ha-baremetal-master-trigger'
triggers:
@@ -273,10 +287,18 @@
- trigger:
name: 'compass-os-ocl-nofeature-ha-baremetal-master-trigger'
triggers:
- - timed: '0 9 * * *'
+ - timed: '0 11 * * *'
- trigger:
name: 'compass-os-onos-sfc-ha-baremetal-master-trigger'
triggers:
+ - timed: '0 7 * * *'
+- trigger:
+ name: 'compass-os-odl_l2-moon-noha-baremetal-master-trigger'
+ triggers:
+ - timed: ''
+- trigger:
+ name: 'compass-os-nosdn-kvm-ha-baremetal-master-trigger'
+ triggers:
- timed: ''
- trigger:
@@ -303,6 +325,14 @@
name: 'compass-os-onos-sfc-ha-baremetal-brahmaputra-trigger'
triggers:
- timed: ''
+- trigger:
+ name: 'compass-os-odl_l2-moon-noha-baremetal-brahmaputra-trigger'
+ triggers:
+ - timed: ''
+- trigger:
+ name: 'compass-os-nosdn-kvm-ha-baremetal-brahmaputra-trigger'
+ triggers:
+ - timed: ''
- trigger:
name: 'compass-os-nosdn-nofeature-ha-virtual-master-trigger'
@@ -311,11 +341,11 @@
- trigger:
name: 'compass-os-odl_l2-nofeature-ha-virtual-master-trigger'
triggers:
- - timed: '0 21 * * *'
+ - timed: '0 23 * * *'
- trigger:
name: 'compass-os-odl_l3-nofeature-ha-virtual-master-trigger'
triggers:
- - timed: ''
+ - timed: '0 19 * * *'
- trigger:
name: 'compass-os-onos-nofeature-ha-virtual-master-trigger'
triggers:
@@ -323,10 +353,18 @@
- trigger:
name: 'compass-os-ocl-nofeature-ha-virtual-master-trigger'
triggers:
- - timed: '0 9 * * *'
+ - timed: '0 11 * * *'
- trigger:
name: 'compass-os-onos-sfc-ha-virtual-master-trigger'
triggers:
+ - timed: '0 7 * * *'
+- trigger:
+ name: 'compass-os-odl_l2-moon-noha-virtual-master-trigger'
+ triggers:
+ - timed: ''
+- trigger:
+ name: 'compass-os-nosdn-kvm-ha-virtual-master-trigger'
+ triggers:
- timed: ''
- trigger:
@@ -353,3 +391,11 @@
name: 'compass-os-onos-sfc-ha-virtual-brahmaputra-trigger'
triggers:
- timed: ''
+- trigger:
+ name: 'compass-os-odl_l2-moon-noha-virtual-brahmaputra-trigger'
+ triggers:
+ - timed: ''
+- trigger:
+ name: 'compass-os-nosdn-kvm-ha-virtual-brahmaputra-trigger'
+ triggers:
+ - timed: ''
diff --git a/jjb/compass4nfv/compass-deploy.sh b/jjb/compass4nfv/compass-deploy.sh
index 0231ea588..c70a4ec53 100644
--- a/jjb/compass4nfv/compass-deploy.sh
+++ b/jjb/compass4nfv/compass-deploy.sh
@@ -48,6 +48,7 @@ export OS_VERSION=${COMPASS_OS_VERSION}
export OPENSTACK_VERSION=${COMPASS_OPENSTACK_VERSION}
if [[ "${COMPASS_OS_VERSION_OPTION}" = "xenial" ]] && [[ "${OPENSTACK_VERSION}" = "mitaka" ]]; then
export OPENSTACK_VERSION=${OPENSTACK_VERSION}_${COMPASS_OS_VERSION_OPTION}
+ export OS_VERSION=${COMPASS_OS_VERSION_OPTION}
fi
./deploy.sh --dha ${DHA_CONF} --network ${NETWORK_CONF}
if [ $? -ne 0 ]; then
diff --git a/jjb/compass4nfv/compass-project-jobs.yml b/jjb/compass4nfv/compass-project-jobs.yml
index 6e10e2fc2..e92c7653b 100644
--- a/jjb/compass4nfv/compass-project-jobs.yml
+++ b/jjb/compass4nfv/compass-project-jobs.yml
@@ -170,7 +170,7 @@
branch: '{branch}'
triggers:
- - timed: 'H 14 * * *'
+ - timed: 'H 8 * * *'
builders:
- shell:
diff --git a/jjb/joid/joid-deploy.sh b/jjb/joid/joid-deploy.sh
index 6d9e8aeba..4b8e3ffda 100644
--- a/jjb/joid/joid-deploy.sh
+++ b/jjb/joid/joid-deploy.sh
@@ -135,6 +135,11 @@ echo "------ Set ceph disks ------"
sed -i -- "s@osd-devices: /srv@osd-devices: $CEPH_DISKS@" $SRCBUNDLE
sed -i -r -- "s/^(\s+osd-reformat: )'no'/\1'$CEPH_REFORMAT'/" $SRCBUNDLE
+# temporary sfc feature is availble only on onos and trusty
+if [ "$NFV_FEATURES" == 'sfc' ] && [ "$SDN_CONTROLLER" == 'onos' ];then
+ UBUNTU_DISTRO=trusty
+fi
+
##
## Configure Joid deployment
##
@@ -182,7 +187,7 @@ export OS_USERNAME=admin
export OS_PASSWORD=$OS_ADMIN_PASSWORD
export OS_TENANT_NAME=admin
export OS_AUTH_URL=http://$KEYSTONE:35357/v2.0
-export OS_REGION_NAME=Canonical
+export OS_REGION_NAME=RegionOne
export OS_ENDPOINT_TYPE='adminURL'
export CINDER_ENDPOINT_TYPE='adminURL'
export GLANCE_ENDPOINT_TYPE='adminURL'
diff --git a/utils/push-test-logs.sh b/utils/push-test-logs.sh
index 964b41908..8a4bbc3fc 100644
--- a/utils/push-test-logs.sh
+++ b/utils/push-test-logs.sh
@@ -23,7 +23,9 @@ dir_result="${HOME}/opnfv/$project/results/${branch}"
node_list=(\
'lf-pod1' 'lf-pod2' 'intel-pod2' 'intel-pod3' \
'intel-pod5' 'intel-pod6' 'intel-pod7' 'intel-pod8' \
-'ericsson-pod2' 'huawei-pod1' 'huawei-pod2' 'huawei-virtual1' 'huawei-virtual2' 'huawei-virtual3' 'huawei-virtual4')
+'ericsson-pod2' )
+#'huawei-pod1' 'huawei-pod2' 'huawei-virtual1' 'huawei-virtual2' 'huawei-virtual3' 'huawei-virtual4'
+
if [[ ! " ${node_list[@]} " =~ " ${testbed} " ]]; then
echo "This is not a CI POD. Aborting pushing the logs to artifacts."
diff --git a/utils/test/declaration/addtestcase.php b/utils/test/declaration/addtestcase.php
new file mode 100644
index 000000000..0e5bed689
--- /dev/null
+++ b/utils/test/declaration/addtestcase.php
@@ -0,0 +1,40 @@
+<?php
+function sendPostData($url, $post){
+ $ch = curl_init($url);
+ $headers= array('Accept: application/json','Content-Type: application/json');
+ curl_setopt($ch, CURLOPT_CUSTOMREQUEST, "POST");
+ curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
+ curl_setopt($ch, CURLOPT_HTTPHEADER, $headers);
+ curl_setopt($ch, CURLOPT_POSTFIELDS,$post);
+ curl_setopt($ch, CURLOPT_FOLLOWLOCATION, 1);
+ $result = curl_exec($ch);
+ curl_close($ch);
+ return $result;
+}
+
+if(isset($_REQUEST['url'])){
+ $url=$_REQUEST['url'];
+}
+if(isset($_REQUEST['name'])){
+ $name=$_REQUEST['name'];
+}
+if(isset($_REQUEST['desc'])){
+ $desc=$_REQUEST['desc'];
+}
+if(isset($_REQUEST['project'])){
+
+ $url_send=$_REQUEST['project'];
+ $url_send="http://testresults.opnfv.org:80/test/api/v1/projects/".$url_send."/cases";
+ $str_data=array('url'=>$url,'name'=>$name,'description'=>$desc);
+ $str_data=json_encode($str_data);
+ $res=sendPostData($url_send, $str_data);
+ echo '<div class="alert alert-success"> <strong>Success!</strong> Added New test Case </div>';
+
+}else{
+
+ echo '<div class="alert alert-danger"> <strong>Error!</strong> Failed to Add New test Case </div>';
+
+}
+
+?>
+
diff --git a/utils/test/declaration/index.php b/utils/test/declaration/index.php
new file mode 100644
index 000000000..b2c5d0370
--- /dev/null
+++ b/utils/test/declaration/index.php
@@ -0,0 +1,221 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+ <title>OPNFV DashBoard</title>
+ <meta charset="utf-8">
+ <meta name="viewport" content="width=device-width, initial-scale=1">
+ <link rel="stylesheet" href="http://maxcdn.bootstrapcdn.com/bootstrap/3.3.6/css/bootstrap.min.css">
+ <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.12.2/jquery.min.js"></script>
+ <script src="http://maxcdn.bootstrapcdn.com/bootstrap/3.3.6/js/bootstrap.min.js"></script>
+<script>
+$(function() {
+
+ $('form#new_testcase').on('submit', function(){
+ var selected = $('select#sel_pro2').find("option:selected").val();
+ var uri = $('input#uri').val();
+ var name = $('input#name').val();
+ var desc = $('textarea#desc').val();
+ var new_url="http://testresults.opnfv.org:80/test/api/v1/projects/"+selected+"/cases";
+ $.post("addtestcase.php", {"project":selected,"url":uri,"name":name,"description":desc}, function(result){
+ $("div#result").html(result);
+ });
+ });
+
+});
+
+$(function() {
+
+ $('select#sel1').on('change', function(){
+ var selected = $(this).find("option:selected").val();
+ var new_url="http://testresults.opnfv.org:80/test/api/v1/projects/"+selected+"/cases";
+ //$.post('testcases.php', {project: selected});
+ console.log(selected);
+ $.post("testcases.php", {project: selected}, function(result){
+ $("div#4a").html(result);
+ });
+
+ });
+
+});
+</script>
+<style>
+body {
+ padding : 10px ;
+}
+
+#exTab1 .tab-content {
+ color : black;
+ padding : 5px 15px;
+}
+
+#exTab2 h3 {
+ color : white;
+ background-color: #428bca;
+ padding : 5px 15px;
+}
+
+/* remove border radius for the tab */
+
+#exTab1 .nav-pills > li > a {
+ border-radius: 0;
+}
+
+/* change border radius for the tab , apply corners on top*/
+
+#exTab3 .nav-pills > li > a {
+ border-radius: 4px 4px 0 0 ;
+}
+
+#exTab3 .tab-content {
+ color : white;
+ background-color: #428bca;
+ padding : 5px 15px;
+}
+
+</style>
+</head>
+<body>
+
+<div class="container">
+ <h1>OPNFV DASHBOARD: </h1></div>
+<div id="exTab1" class="container">
+ <ul class="nav nav-pills">
+ <li class="active">
+ <a href="#1a" data-toggle="tab">PODS</a>
+ </li>
+ <li><a href="#2a" data-toggle="tab">PROJECTS</a>
+ </li>
+ <li><a href="#3a" data-toggle="tab">TESTCASES</a>
+ </li>
+ <li><a href="#5a" data-toggle="tab">ADD TESTCASE</a>
+ </li>
+ <li><a href="http://testresults.opnfv.org/kibana_dashboards/" >RESULTS</a>
+ </li>
+ </ul>
+ <div class="tab-content clearfix">
+ <div class="tab-pane active" id="1a">
+ <table class="table table-striped">
+ <thead>
+ <tr>
+ <th>#</th>
+ <th>Pod Name</th>
+ <th>Creation Date</th>
+ <th>Role</th>
+ <th>Mode</th>
+ </tr>
+ </thead>
+ <?php
+ $url = "http://testresults.opnfv.org:80/test/api/v1/pods";
+ $response = file_get_contents($url);
+ $data = json_decode($response);
+ $pods = $data->pods;
+ $i=1;
+ foreach ( $pods as $pod ){
+
+ $column_str="";
+ $column_str="<tr><td>".$i."</td>";
+ $column_str=$column_str."<td>".$pod->name."</td>";
+ $column_str= $column_str."<td>".$pod->creation_date."</td>";
+ $column_str= $column_str."<td>".$pod->role."</td>";
+ $column_str= $column_str."<td>".$pod->mode."</td>";
+ $column_str= $column_str."</tr>";
+ echo $column_str;
+ $i=$i+1;
+ }
+ ?>
+ </table>
+ </div>
+ <div class="tab-pane" id="2a">
+ <table class="table table-striped">
+ <thead>
+ <tr>
+ <th>#</th>
+ <th>Project</th>
+ <th>Creation Date</th>
+ </tr>
+ </thead>
+ <?php
+ $url = "http://testresults.opnfv.org:80/test/api/v1/projects";
+ $response = file_get_contents($url);
+ $data = json_decode($response);
+ $projects=$data->projects;
+ $i=0;
+ foreach ( $projects as $project ){
+
+ $column_str="";
+ $column_str="<tr><td>".$i."</td>";
+ $column_str=$column_str."<td>".$project->name."</td>";
+ $column_str= $column_str."<td>".$project->creation_date."</td>";
+ $column_str= $column_str."</tr>";
+ echo $column_str;
+ $i=$i+1;
+ }
+?>
+ </table>
+ </div>
+ <div class="tab-pane" id="3a">
+<div class="form-group">
+ <label for="sel1">Select list:</label>
+ <select class="form-control" id="sel1">
+<?php
+ $url = "http://testresults.opnfv.org:80/test/api/v1/projects";
+ $response = file_get_contents($url);
+ $data = json_decode($response);
+ $projects=$data->projects;
+ $i=0;
+ $firstvalue=$projects[0]->name;
+ foreach ( $projects as $project ){
+ $column_str="";
+ $column_str="<option>".$project->name."</option>";
+ echo $column_str;
+ }
+
+?>
+</select>
+</div>
+ <div class="tab-pane" id="4a">
+ <?php
+ require "testcases.php";
+ ?>
+ </div>
+ </div>
+ <div class="tab-pane" id="5a">
+ <form role="form" id="new_testcase">
+<div class="form-group">
+ <label for="sel1">Select list:</label>
+ <select class="form-control" id="sel_pro2">
+<?php
+ $url = "http://testresults.opnfv.org:80/test/api/v1/projects";
+ $response = file_get_contents($url);
+ $data = json_decode($response);
+ $projects=$data->projects;
+ $i=0;
+ $firstvalue=$projects[0]->name;
+ foreach ( $projects as $project ){
+ $column_str="";
+ $column_str="<option>".$project->name."</option>";
+ echo $column_str;
+ }
+?>
+</select>
+</div>
+<div class="form-group"> <!-- Name field -->
+ <label class="control-label " for="name">TestCase URI</label>
+ <input class="form-control" id="uri" name="uri" type="text"/>
+ </div>
+<div class="form-group"> <!-- Name field -->
+ <label class="control-label " for="name">TestCase Name</label>
+ <input class="form-control" id="name" name="name" type="text"/>
+ </div>
+<div class="form-group"> <!-- Name field -->
+ <label class="control-label " for="name">Description</label>
+ <textarea class="form-control" rows="5" id="desc"></textarea>
+ </div>
+ <button type="submit" class="btn btn-default">Submit</button>
+</form>
+ </div>
+<div class="container" id="result"></div>
+ </div>
+</div>
+</body>
+</html>
diff --git a/utils/test/declaration/testcases.php b/utils/test/declaration/testcases.php
new file mode 100644
index 000000000..20645807e
--- /dev/null
+++ b/utils/test/declaration/testcases.php
@@ -0,0 +1,36 @@
+<?php
+ if(isset($_REQUEST['project'])){
+ $selected=$_REQUEST['project'];
+ }
+ else{
+ $url = "http://testresults.opnfv.org:80/test/api/v1/projects";
+ $response = file_get_contents($url);
+ $data = json_decode($response);
+ $projects=$data->projects;
+ $selected=$projects[0]->name;
+ }
+ $new_url="http://testresults.opnfv.org:80/test/api/v1/projects/".$selected."/cases";
+ $response = file_get_contents($new_url);
+ $data = json_decode($response);
+ $testcases=$data->testcases;
+ $i=0;
+ $column_str="";
+ $column_str=$column_str."<table class=\"table table-striped\"><tr>";
+ $column_str=$column_str."<th>#</th><th>Test Case Name</th>";
+ $column_str=$column_str."<th>Creation Date</th>";
+ $column_str=$column_str."<th>Description</th></tr>";
+ foreach ( $testcases as $testcase ){
+ $i=$i+1;
+ $column_str=$column_str."<tr>";
+ $column_str=$column_str."<td>".$i."</td>";
+ $column_str=$column_str."<td>".$testcase->name."</td>";
+ $column_str=$column_str."<td>".$testcase->creation_date."</td>";
+ $column_str=$column_str."<td>".$testcase->description."</td>";
+ $column_str=$column_str."</tr>";
+
+ }
+ $column_str=$column_str."</table>";
+ echo $column_str;
+
+?>
+