diff --git a/ci-scripts/Jenkinsfile-git-dashboard b/ci-scripts/Jenkinsfile-git-dashboard
deleted file mode 100644
index 87e781fe8a..0000000000
--- a/ci-scripts/Jenkinsfile-git-dashboard
+++ /dev/null
@@ -1,48 +0,0 @@
-#!/bin/groovy
-/*
- * Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The OpenAirInterface Software Alliance licenses this file to You under
- * the OAI Public License, Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.openairinterface.org/?page_id=698
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *-------------------------------------------------------------------------------
- * For more information about the OpenAirInterface (OAI) Software Alliance:
- * contact@openairinterface.org
- */
-
-// Template Jenkins Declarative Pipeline script to run Test w/ RF HW
-
-// Location of the python executor node shall be in the same subnet as the others servers
-def pythonExecutor = params.pythonExecutor
-
-
-pipeline {
- agent {
- label pythonExecutor
- }
- stages {
- stage ("gDashboard") {
- steps {
- script {
- dir ("ci-scripts/ran_dashboard") {
- //retrieve MR data from gitlab / mySQL db, build HTML pages and load them to AWS S3 bucket (configured as static web page hosting)
- //deprecated method : sh returnStdout: true, script: 'python3 ran_dashboard.py'
- sh returnStdout: true, script: 'python3 Hdashboard.py'
- }
- }
- }
- }
- }
-}
-
-
diff --git a/ci-scripts/Jenkinsfile-tmp-multi-enb-nsa b/ci-scripts/Jenkinsfile-tmp-multi-enb-nsa
index 1d977f00d3..43d6372a33 100644
--- a/ci-scripts/Jenkinsfile-tmp-multi-enb-nsa
+++ b/ci-scripts/Jenkinsfile-tmp-multi-enb-nsa
@@ -376,19 +376,6 @@ pipeline {
}
}
}
- stage ("Result Update"){
- when {
- expression { params.DataBaseHost != "none" }
- }
- agent {label DataBaseHost}
- steps {
- script {
- dir ('ci-scripts/ran_dashboard') {
- sh "python3 Hdashboard.py testevent ${params.eNB_MR} "
- }
- }
- }
- }
}
}
}
diff --git a/ci-scripts/ran_dashboard/Hdashboard.py b/ci-scripts/ran_dashboard/Hdashboard.py
index bfa07557bd..625baa8f46 100644
--- a/ci-scripts/ran_dashboard/Hdashboard.py
+++ b/ci-scripts/ran_dashboard/Hdashboard.py
@@ -32,488 +32,34 @@
#Author Remi
-import boto3
import shlex
import subprocess
import json #json structures
-import datetime #now() and date formating
-from datetime import datetime
-import re
import gitlab
-import yaml
-import os
-import time
import sys
-from sqlconnect import SQLConnect
-
#-----------------------------------------------------------
# Class Declaration
#-----------------------------------------------------------
class Dashboard:
def __init__(self):
-
-
- #init with data sources : git, yaml config file, test results databases
+ #init with data sources : git, test results databases
print("Collecting Data")
cmd="""curl --silent "https://gitlab.eurecom.fr/api/v4/projects/oai%2Fopenairinterface5g/merge_requests?state=opened&per_page=100" """
self.git = self.__getGitData(cmd) #git data from Gitlab
- self.tests = self.__loadCfg('ran_dashboard_cfg.yaml') #tests table setup from yaml
- self.db = self.__loadFromDB() #test results from database
self.mr_list=[] #mr list in string format
for x in range(len(self.git)):
self.mr_list.append(str(self.git[x]['iid']))
- def __loadCfg(self,yaml_file):
- with open(yaml_file,'r') as f:
- tests = yaml.load(f)
- return tests
-
def __getGitData(self,cmd):
- #cmd="""curl --silent "https://gitlab.eurecom.fr/api/v4/projects/oai%2Fopenairinterface5g/merge_requests?state=opened&per_page=100" """
process = subprocess.Popen(shlex.split(cmd), stdout=subprocess.PIPE)
output = process.stdout.readline()
tmp=output.decode("utf-8")
d = json.loads(tmp)
return d
- def __loadFromDB(self):
- mr_list=[]
- for x in range(len(self.git)):
- mr_list.append(str(self.git[x]['iid']))
- mydb=SQLConnect()
- for MR in mr_list:
- mydb.get(MR)
- mydb.close_connection()
- return mydb.data
-
- def singleMR_initHTML(self, date):
- self.f_html.write('\n')
- self.f_html.write('