Merge remote-tracking branch 'origin/develop' into NR_scheduling_CSIRS

ci-scripts/cls_containerize.py

@@ -343,7 +343,7 @@ class Containerize():
 					startOfTargetImageCreation = False
 					buildStatus = False
 					for line in inputfile:
-						result = re.search('FROM .* as ' + image + '$', str(line))
+						result = re.search('FROM .* [aA][sS] ' + image + '$', str(line))
 						if result is not None:
 							startOfTargetImageCreation = True
 						if startOfTargetImageCreation:

ci-scripts/conf_files/gnb.band78.tm1.fr1.106PRB.usrpn310.conf

@@ -61,24 +61,15 @@ gNBs =
              initialDLBWPk0_0                    = 0;
              #initialULBWPmappingType
        #0=typeA,1=typeB
-             initialDLBWPmappingType_0           = 0;
+             initialDLBWPmappingType_0           = 0;#for DL slot
              #this is SS=1,L=13
              initialDLBWPstartSymbolAndLength_0  = 40;
 
-             initialDLBWPk0_1                    = 0;
+             initialDLBWPk0_1                    = 0;#for mixed slot
              initialDLBWPmappingType_1           = 0;
-             #this is SS=2,L=12 
+             #this is SS=1,L=5 
-             initialDLBWPstartSymbolAndLength_1  = 53;
+             initialDLBWPstartSymbolAndLength_1  = 57;
 
-             initialDLBWPk0_2                    = 0;
-             initialDLBWPmappingType_2           = 0;
-             #this is SS=1,L=12 
-             initialDLBWPstartSymbolAndLength_2  = 54;
-
-             initialDLBWPk0_3                    = 0;
-             initialDLBWPmappingType_3           = 0;
-             #this is SS=1,L=4 //5 (4 is for 43, 5 is for 57)
-             initialDLBWPstartSymbolAndLength_3  = 57; //43; //57;
   #uplinkConfigCommon 
      #frequencyInfoUL
       ul_frequencyBand                                                 = 78;
@@ -103,7 +94,7 @@ gNBs =
           prach_msg1_FDM                                            = 0;
           prach_msg1_FrequencyStart                                 = 0;
           zeroCorrelationZoneConfig                                 = 13;
-          preambleReceivedTargetPower                               = -100;
+          preambleReceivedTargetPower                               = -90;
 #preamblTransMax (0...10) = (3,4,5,6,7,8,10,20,50,100,200)
           preambleTransMax                                          = 6;
 #powerRampingStep

ci-scripts/ran_dashboard.py

@@ -40,6 +40,8 @@ import shlex      #lexical analysis
 import json       #json structures
 import datetime   #now() and date formating
 from datetime import datetime
+import re
+import gitlab
 
 #-----------------------------------------------------------
 # Class Declaration
@@ -79,7 +81,7 @@ class gDashboard:
         #line 2 empty
         #line 3 is for the column names
         i=3
-        row =["MR","Created_at","Author","Title","Assignee", "Reviewer", "CAN START","IN PROGRESS","COMPLETED","OK MERGE","Merge conflicts"]
+        row =["MR","Created_at","Author","Title","Assignee", "Reviewer", "CAN START","IN PROGRESS","COMPLETED","Review Form","OK MERGE","Merge conflicts"]
         self.sheet.insert_row(row, index=i, value_input_option='RAW')
 
         #line 4 onward, MR data lines
@@ -120,10 +122,32 @@ class gDashboard:
             else:
                 conflicts = ""
 
+
+            #add a column flagging that the review form is present
+            #we use gitlab API to parse the MR notes
+            gl = gitlab.Gitlab.from_config('OAI')
+            project_id = 223
+            project = gl.projects.get(project_id)
+            #get the opened MR in the project
+            mrs = project.mergerequests.list(state='opened')
+            for m in range (0,len(mrs)):
+                if mrs[m].iid==self.d[x]['iid']:#check the iid is the one we are on
+                    mr_notes = mrs[m].notes.list(all=True)
+                    n=0
+                    found=False
+                    review_form=""
+                    while found==False and n<len(mr_notes):
+                        res=re.search('Code Review by',mr_notes[n].body)#this is the marker we are looking for in all notes
+                        if res!=None:
+                            review_form = "X"
+                            found=True
+                        n+=1
+
+
             #build final row to be inserted, the first column is left empty for now, will be filled afterward with hyperlinks to gitlab MR
             row =["", str(date_time_obj.date()),str(self.d[x]['author']['name']),str(self.d[x]['title']),\
             assignee, reviewer,\
-            milestone1,milestone2,milestone3,milestone4,conflicts]
+            milestone1,milestone2,milestone3,review_form,milestone4,conflicts]
             
             #insert the row to worksheet
             self.sheet.insert_row(row, index=i, value_input_option='RAW')
@@ -246,10 +270,10 @@ class gDashboard:
                             "sheetId": sheetId,
                             "dimension": "COLUMNS",
                             "startIndex": 6,
-                            "endIndex": 10
+                            "endIndex": 11
                         },
                         "properties": {
-                            "pixelSize": 135
+                            "pixelSize": 120
                         },
                         "fields": "pixelSize"
                     }