Skip to content

Commit

Permalink
Merge 'trilinos/Trilinos:develop' (7a30176) into 'tcad-charon/Trilino…
Browse files Browse the repository at this point in the history 
…s:develop' (090613f).

* trilinos-develop:
  problem of logical operator macros in MSVC (trilinos#5257)
  Automatic snapshot commit from tribits at 35510d7
  • Loading branch information
Jenkins Pipeline committed May 27, 2019
2 parents 090613f + 7a30176 commit d1a6821
Show file tree
Hide file tree
Showing 5 changed files with 274 additions and 60 deletions.
98 changes: 65 additions & 33 deletions cmake/tribits/ci_support/CDashQueryAnalyzeReport.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@
from FindGeneralScriptSupport import *
from GeneralScriptSupport import *

import cdash_build_testing_date as CBTD

# Validate a date YYYY-MM-DD string and return a date object for the
# 'datetime' module.
Expand Down Expand Up @@ -1054,15 +1055,20 @@ def dateFromBuildStartTime(buildStartTime):
#
# Inputs:
#
# testHistoryLOD [in]: List of test dicts for the same test. This list nore
# its elements are modified in this call. (The base list object is shallow
# copied before it is sorted.)
# testHistoryLOD [in]: List of test dicts for the same test. This input
# list nore its elements are modified in this call. The base list object is
# shallow copied before it is sorted and returned.
#
# currentTestDate [in]: The current testing day (as a string YYYY-MM-DD).
# currentTestDate [in]: The current testing day (as a string "YYYY-MM-DD").
# This is needed to define a frame of reference for interpeting if the test
# is currently 'Passed', 'Failed', 'Not Run', or is 'Missing' (i.e. does not
# have any test results for curent testing date).
#
# testingDayStartTimeUtc [in]: The CDash project testing day start time
# "<hh>:<mm>" in UTC. For example, if the CDash project testing day start
# time is 6 PM MDT (18:00 MDT), then the testing day start time is "02:00"
# (UTC) (which is the next calendar day).
#
# daysOfHistory [in]: Number of days of history that were requested.
#
# Note that len(testHistoryLOD) may be less than daysOfHistory which is
Expand All @@ -1076,8 +1082,10 @@ def dateFromBuildStartTime(buildStartTime):
# where:
#
# sortedTestHistoryLOD: The sorted list of test dicts with most recent dict
# at the top. (New list object with references to the same test dict
# elements.)
# at the top. New list object with references to the same test dict
# elements. Therefore, if the list elements themselves are modified after
# the function returns, then the elements in the orignal list testHistoryLOD
# will be modifed as well.
#
# testHistoryStats: Dict that gives statistics for the test with fields:
# - 'pass_last_x_days': Number of times test 'Passed'
Expand All @@ -1086,20 +1094,25 @@ def dateFromBuildStartTime(buildStartTime):
# - 'consec_pass_days': Number of times the test consecutively passed
# - 'consec_nopass_days': Number of times the test consecutively did not pass
# - 'consec_missing_days': Number of days test is missing
# - 'previous_nopass_date': Before current date, the previous nopass date
# - 'previous_nopass_date': Before current date, the previous nopass date in UTC
#
# testStatus: The status of the test for the current testing day with values:
# - 'Passed': Most recent test 'Passed' had date matching curentTestDate
# - 'Failed': Most recent test 'Failed' had date matching curentTestDate
# - 'Not Run': Most recent test 'Not Run' had date matching curentTestDate
# - 'Missing': Most recent test has date before matching curentTestDate
#
def sortTestHistoryGetStatistics(testHistoryLOD, currentTestDate, daysOfHistory):
def sortTestHistoryGetStatistics(testHistoryLOD,
currentTestDate, testingDayStartTimeUtc,
daysOfHistory,
):

# Helper functions
def incr(testDict, key): testDict[key] = testDict[key] + 1
def decr(testDict, key): testDict[key] = testDict[key] - 1

# Initialize outputs assuming no history (i.e. missing)
# Initialize outputs assuming no history (i.e. test is missing for
# alldaysOfHistory of history)
sortedTestHistoryLOD = []
testHistoryStats = {
'pass_last_x_days': 0,
Expand All @@ -1120,26 +1133,36 @@ def decr(testDict, key): testDict[key] = testDict[key] - 1
# Sort the test history by the buildstarttime (most current date at top)
sortedTestHistoryLOD = copy.copy(testHistoryLOD)
sortedTestHistoryLOD.sort(reverse=True, key=DictSortFunctor(['buildstarttime']))

# Get testing day/time helper object
testingDayTimeObj = CBTD.CDashProjectTestingDay(currentTestDate, testingDayStartTimeUtc)
currentTestDateDT = testingDayTimeObj.getCurrentTestingDayDateDT()
#print("currentTestDateDT = "+str(currentTestDateDT))

# Top (most recent) test history data
topTestDict = sortedTestHistoryLOD[0]
#print("topTestDict['buildstarttime'] = "+topTestDict['buildstarttime'])

# Get the CDash testing date of the most recent test
topTestDictTestingDayDT = testingDayTimeObj.getTestingDayDateFromBuildStartTimeDT(
topTestDict['buildstarttime'] )
#print("topTestDictTestingDayDT ="+str(topTestDictTestingDayDT))

# testStatus (for this test based on history)
topTestBuildStartDate = dateFromBuildStartTime(topTestDict['buildstarttime'])
if topTestBuildStartDate == currentTestDate:
if topTestDictTestingDayDT == currentTestDateDT:
testStatus = topTestDict['status']
else:
testStatus = "Missing"
#print("testStatus = "+testStatus)

# testHistoryStats

# Set up for counting num of consecutive pass, nopass, or missing

if testStatus == "Missing":
# The test is missing so see how many consecutive days that it is missing
currentTestDateObj = validateAndConvertYYYYMMDD(currentTestDate)
topTestDateObj = validateAndConvertYYYYMMDD(topTestBuildStartDate)
testHistoryStats['consec_missing_days'] = (currentTestDateObj - topTestDateObj).days
testHistoryStats['consec_missing_days'] = \
(currentTestDateDT - topTestDictTestingDayDT).days
# There are no initial consecutive passing or nopassing days
initialTestStatusHasChanged = True
else:
Expand All @@ -1152,36 +1175,37 @@ def decr(testDict, key): testDict[key] = testDict[key] - 1

previousNopassDate = None

# Loop over test history and update quantities
for pastTestDict in sortedTestHistoryLOD:
pastTestStatus = pastTestDict['status']
pastTestDate = dateFromBuildStartTime(pastTestDict['buildstarttime'])
# Count the initial consecutive streaks
# Loop over test history for each of the kth entries and update quantities
for pastTestDict_k in sortedTestHistoryLOD:
pastTestStatus_k = pastTestDict_k['status']
pastTestDateUtc_k = testingDayTimeObj.getTestingDayDateFromBuildStartTimeStr(
pastTestDict_k['buildstarttime'])
# Count the initial consecutive streaks for passing and nonpassing
if (
(pastTestStatus=='Passed') == previousTestStatusPassed \
(pastTestStatus_k=='Passed') == previousTestStatusPassed \
and not initialTestStatusHasChanged \
):
# The initial consecutive streak continues!
if pastTestStatus == 'Passed':
# The initial consecutive streak for passing or nonpassing continues!
if pastTestStatus_k == 'Passed':
incr(testHistoryStats, 'consec_pass_days')
else:
incr(testHistoryStats, 'consec_nopass_days')
else:
# The initial consecutive streak has been broken
initialTestStatusHasChanged = True
# Count total pass/nopass/missing tests
decr(testHistoryStats, 'missing_last_x_days')
if pastTestStatus == 'Passed':
decr(testHistoryStats, 'missing_last_x_days') # Test not missing this day!
if pastTestStatus_k == 'Passed':
incr(testHistoryStats, 'pass_last_x_days')
else:
incr(testHistoryStats, 'nopass_last_x_days')
# Find most recent previous nopass test date
if (
previousNopassDate == None \
and pastTestDate != currentTestDate \
and pastTestStatus != 'Passed' \
and pastTestDateUtc_k != currentTestDate \
and pastTestStatus_k != 'Passed' \
):
previousNopassDate = pastTestDate
previousNopassDate = pastTestDateUtc_k
testHistoryStats['previous_nopass_date'] = previousNopassDate

# Return the computed stuff
Expand Down Expand Up @@ -1248,8 +1272,8 @@ def checkCDashTestDictsAreSame(testDict_1, testDict_1_name,
time_2 = testDict_2['time']
rel_err = abs(time_1 - time_2) / ( (time_1 + time_2 + 1e-5)/2.0 )
rel_err_max = 1.0 # ToDo: Make this adjustable?
print("rel_err = "+str(rel_err))
print("rel_err_max = "+str(rel_err_max))
#print("rel_err = "+str(rel_err))
#print("rel_err_max = "+str(rel_err_max))
if rel_err <= rel_err_max:
testDict_1_copy.pop('time', None)
testDict_2_copy.pop('time', None)
Expand Down Expand Up @@ -1285,14 +1309,15 @@ class AddTestHistoryToTestDictFunctor(object):
# By default, this wil always read the data from the cache file if that file
# already exists.
#
def __init__(self, cdashUrl, projectName, date, daysOfHistory,
def __init__(self, cdashUrl, projectName, date, testingDayStartTimeUtc, daysOfHistory,
testCacheDir, useCachedCDashData=True, alwaysUseCacheFileIfExists=True,
verbose=False, printDetails=False,
extractCDashApiQueryData_in=extractCDashApiQueryData, # For unit testing
):
self.__cdashUrl = cdashUrl
self.__projectName = projectName
self.__date = date
self.__testingDayStartTimeUtc = testingDayStartTimeUtc
self.__daysOfHistory = daysOfHistory
self.__testCacheDir = testCacheDir
self.__useCachedCDashData = useCachedCDashData
Expand Down Expand Up @@ -1329,11 +1354,18 @@ def __call__(self, testDict):
else:
testAlreadyHasCDashData = False

# Set up object to handle CDash testing day stuff
currentProjectTestingDayObj = \
CBTD.CDashProjectTestingDay(self.__date, self.__testingDayStartTimeUtc)
currentTestingDayStartUtcDT = currentProjectTestingDayObj.getTestingDayStartUtcDT()

# Date range for test history
dayAfterCurrentTestDay = \
(testDayDate+datetime.timedelta(days=1)).isoformat()
CBTD.getBuildStartTimeUtcStrFromUtcDT(
currentTestingDayStartUtcDT + datetime.timedelta(days=1), True )
daysBeforeCurrentTestDay = \
(testDayDate+datetime.timedelta(days=-1*daysOfHistory+1)).isoformat()
CBTD.getBuildStartTimeUtcStrFromUtcDT(
currentTestingDayStartUtcDT - datetime.timedelta(days=daysOfHistory-1), True)

# Define queryTests.php query filters for test history
testHistoryQueryFilters = \
Expand Down Expand Up @@ -1397,7 +1429,7 @@ def __call__(self, testDict):
# Sort and get test history stats and update core testDict fields

(testHistoryLOD, testHistoryStats, testStatus) = sortTestHistoryGetStatistics(
testHistoryLOD, self.__date, daysOfHistory)
testHistoryLOD, self.__date, self.__testingDayStartTimeUtc, daysOfHistory)

# Assert and update the status

Expand Down
19 changes: 14 additions & 5 deletions cmake/tribits/ci_support/cdash_analyze_and_report.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,12 @@ def injectCmndLineOptionsInParser(clp, gitoliteRootDefault=""):
help="Date for the testing day <YYYY-MM-DD>."+\
" [default yesterday '"+yesterday+"']" )

clp.add_option(
"--cdash-project-testing-day-start-time", dest="cdashProjectTestingDayStartTime",
type="string", default="00:00",
help="The CDash project testing day build star time in UTC in format '<hh>:<mm>'."+\
" [default = '00:00'" )

clp.add_option(
"--cdash-project-name", dest="cdashProjectName", type="string", default="",
help="CDash project name (e.g. 'Trilinos'). [REQUIRED] [default = '']" )
Expand Down Expand Up @@ -249,6 +255,7 @@ def getCmndLineOptions():
def fwdCmndLineOptions(inOptions, lt=""):
cmndLineOpts = \
" --date='"+inOptions.date+"'"+lt+\
" --cdash-project-testing-day-start-time='"+inOptions.cdashProjectTestingDayStartTime+"'"+lt+\
" --cdash-project-name='"+inOptions.cdashProjectName+"'"+lt+\
" --build-set-name='"+inOptions.buildSetName+"'"+lt+\
" --cdash-site-url='"+inOptions.cdashSiteUrl+"'"+lt+\
Expand Down Expand Up @@ -356,11 +363,12 @@ def testSetGetDataAnalyzeReport( self,
CDQAR.foreachTransform(
testSetSortedLimitedLOD,
CDQAR.AddTestHistoryToTestDictFunctor(
self.inOptions.cdashSiteUrl,
self.inOptions.cdashProjectName,
self.inOptions.date,
self.inOptions.testHistoryDays,
self.testHistoryCacheDir,
cdashUrl=self.inOptions.cdashSiteUrl,
projectName=self.inOptions.cdashProjectName,
date=self.inOptions.date,
testingDayStartTimeUtc=self.inOptions.cdashProjectTestingDayStartTime,
daysOfHistory=self.inOptions.testHistoryDays,
testCacheDir=self.testHistoryCacheDir,
useCachedCDashData=self.inOptions.useCachedCDashData,
alwaysUseCacheFileIfExists=True,
verbose=True,
Expand Down Expand Up @@ -820,6 +828,7 @@ def testSetGetDataAnalyzeReport( self,
inOptions.cdashSiteUrl,
inOptions.cdashProjectName,
inOptions.date,
inOptions.cdashProjectTestingDayStartTime,
inOptions.testHistoryDays,
testHistoryCacheDir,
useCachedCDashData=inOptions.useCachedCDashData,
Expand Down
Loading

0 comments on commit d1a6821

Please sign in to comment.