Changes In Branch v1.64-tcintegration Through [bcc1b4e559] Excluding Merge-Ins
This is equivalent to a diff from 3a8e2b2276 to bcc1b4e559
2017-08-07
| ||
18:07 | looking better check-in: 97d67b762b user: mrwellan tags: v1.64-tcintegration | |
15:31 | Quite a mess. check-in: bcc1b4e559 user: mrwellan tags: v1.64-tcintegration | |
2017-08-06
| ||
23:57 | Refactoring for delayed output mostly done. Bugs remain. check-in: 790604d640 user: matt tags: v1.64-tcintegration | |
2017-08-04
| ||
00:05 | Fixed possible memory growth problem where used dbstructs were not being pushed back on the stack check-in: 6cd5eb771a user: matt tags: v1.64 | |
2017-08-03
| ||
23:02 | Enforced full sync every hour check-in: 3dffe8fa8a user: matt tags: v1.64-bad-full-sync-fix | |
22:26 | Updated with latest changes from v1.64 check-in: 5a8ae7b6c4 user: matt tags: v1.64-areas-dashboard | |
17:51 | Partially implemented teamcity support changes as requested. WIP. check-in: 264909ff3b user: mrwellan tags: v1.64-tcintegration | |
16:15 | Remove the added-on local access support in dashboard, rely instead on rmt built-in support. Improved the refresh button behavior. Added DEAD to statuses to clear in -rerun-clean. check-in: 3a8e2b2276 user: mrwellan tags: v1.64 | |
2017-07-31
| ||
14:23 | Bump version to v1.6428 check-in: 7cdeaee37d user: mrwellan tags: v1.64 | |
Modified tcmt.scm from [3e1895cf52] to [20ab1594ad].
11 12 13 14 15 16 17 | ;; ;; Wrapper to enable running Megatest flows under teamcity ;; ;; 1. Run the megatest process and pass it all the needed parameters ;; 2. Every five seconds check for state/status changes and print the info ;; | | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | | | | | | | | | | > | | | | | | | | | < | | | | | | | | | | | | | | | | | | | | | | | | > > | < | | | | < | | | | | | | | 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 | ;; ;; Wrapper to enable running Megatest flows under teamcity ;; ;; 1. Run the megatest process and pass it all the needed parameters ;; 2. Every five seconds check for state/status changes and print the info ;; (use srfi-1 posix srfi-69 srfi-18 regex defstruct) (declare (uses margs)) (declare (uses rmt)) (declare (uses common)) (declare (uses megatest-version)) (include "megatest-fossil-hash.scm") (include "db_records.scm") (define origargs (cdr (argv))) (define remargs (args:get-args (argv) `( "-target" "-reqtarg" "-runname" ) `("-tc-repl" ) args:arg-hash 0)) (defstruct testdat (tc-type #f) (state #f) (status #f) (overall #f) flowid tctname tname (event-time #f) details comment duration (printed #f)) (defstruct testrecord last-tdat (define (tcmt:print tdat) (let* ((comment (if (testdat-comment tdat) (conc " message='" (testdat-comment tdat)) "")) (details (if (testdat-details tdat) (conc " details='" (testdat-details tdat)) "")) (flowid (conc " flowId='" (testdat-flowid tdat) "'")) (duration (conc " duration='" (* 1e3 (testdat-duration tdat)) "'")) (tcname (conc " name='" (testdat-tctname tdat) "'"))) (case (string->symbol (testdat-overall tdat)) ;; (testdat-tc-type tdat) ((RUNNING) (print "##teamcity[testStarted " tcname flowid "]")) ((COMPLETED) (if (member (testdat-status tdat) '("PASS" "WARN" "SKIP" "WAIVED")) (print "##teamcity[testFinished " tcname flowid comment details duration "]") (print "##teamcity[testFailed " tcname flowid comment details "]"))) ((ignore) #f) (else (print "ERROR: tc-type \"" (testdat-tc-type tdat) "\" not recognised for " tcname))) (flush-output))) ;; process the queue of tests gathered so far. List includes one entry for every test so far seen ;; the last record for a test is preserved. Items are only removed from the list if over 15 seconds ;; have passed since it happened. This allows for compression of COMPLETED/FAIL followed by some other ;; state/status ;; (define (process-queue data flush-mode) ;; here we process tqueue and gather those over 15 seconds (configurable?) old (let* ((tqueue (reverse (hash-table-ref/default data 'tqueue '()))) ;; need oldest to newest (newtq '()) (pqueue (make-hash-table)) ;; ( tname => ( tdat1 tdat2 ... ) ... ) ;; (items '()) (targtm (- now 15)) (leftov (if (null? tqueue) '() (let loop ((hed (car tqueue)) (tal (cdr tqueue)) (new '())) (let ((event-time (testdat-event-time hed)) (tname (testdat-tname hed)) (state (testdat-state hed)) (status (testdat-status hed))) (cond ((or flush-mode ;; handle everything if we are in flush mode (> event-time targtm)) ;; print this one ;; (hash-table-set! pqueue tname (cons hed (hash-table-ref/default pqueue tname '()))) (set! newtq (cons hed newtq)) (if (null? tal) new (loop (car tal) (cdr tal) (if (and (equal? state "COMPLETED") (member? status '("ABORT" "CHECK" "FAIL"))) ;; keep these around (cons hed new) new)))) (else (if (null? tal) new (loop (car tal)(cdr tal)(cons hed new)))))))))) (hash-table-set! data ' ;; Now have: ;; leftov - items not processed, put these back in tqueue ;; pqueue - candidates for printing. print but filter for COMPLETED changes (hash-table-set! data 'tqueue leftov) ;; handle in the future (hash-table-for-each pqueue (lambda (k v) ;; v is a list of tdats, if only one, just print it! (let ((compressed (compress-state-status v))) (for-each (lambda (tdat) (tcmt:print tdat)) ;; (hash-table-set! data k (car (reverse v))) ;; not needed, the pqueue data is thrown away ... ))))) now)) ;; ##teamcity[testStarted name='suite.testName'] ;; ##teamcity[testStdOut name='suite.testName' out='text'] ;; ##teamcity[testStdErr name='suite.testName' out='error text'] ;; ##teamcity[testFailed name='suite.testName' message='failure message' details='message and stack trace'] ;; ##teamcity[testFinished name='suite.testName' duration='50'] ;; ;; flush; #f, normal call. #t, last call, print out something for NOT_STARTED, etc. ;; ;;;;;;; (begin ;;;;;;; (case (string->symbol newstat) ;;;;;;; ((UNK) ) ;; do nothing ;;;;;;; ((RUNNING) (print "##teamcity[testStarted name='" tctname "' flowId='" flowid "']")) ;;;;;;; ((PASS SKIP WARN WAIVED) (print "##teamcity[testFinished name='" tctname "' duration='" (* 1e3 duration) "'" cmtstr details " flowId='" flowid "']")) ;;;;;;; (else ;;;;;;; (print "##teamcity[testFailed name='" tctname "' " cmtstr details " flowId='" flowid "']"))) ;;;;;;; (flush-output) (define (update-queue-since data run-ids last-update tsname target runname flowid flush) ;; (let ((now (current-seconds))) ;; (handle-exceptions ;; exn ;; (begin (print-call-chain) (print "Error message: " ((condition-property-accessor 'exn 'message) exn))) (for-each (lambda (run-id) (let* ((tests (rmt:get-tests-for-run run-id "%" '() '() #f #f #f #f #f #f last-update #f))) ;; (print "DEBUG: got tests=" tests) (for-each (lambda (test-rec) (let* ((tqueue (hash-table-ref/default data 'tqueue '())) ;; NOTE: the key is a symbol! This allows keeping disparate info in the one hash, lazy but a quick solution for right now. (tname (db:test-get-fullname test-rec)) (testname (db:test-get-testname test-rec)) (itempath (db:test-get-item-path test-rec)) (tctname (if (string=? itempath "") testname (conc testname "." (string-translate itempath "/" ".")))) (state (db:test-get-state test-rec)) (status (db:test-get-status test-rec)) (duration (or (any->number (db:test-get-run_duration test-rec)) 0)) (comment (db:test-get-comment test-rec)) (logfile (db:test-get-final_logf test-rec)) (newstat (cond ((equal? state "RUNNING") "RUNNING") ((equal? state "COMPLETED") status) (flush (conc state "/" status)) (else "UNK"))) (cmtstr (if (and (not flush) comment) comment (if flush (conc "Test ended in state/status=" state "/" status (if (string-match "^\\s*$" comment) ", no Megatest comment found." (conc ", Megatest comment=\"" comment "\""))) ;; special case, we are handling stragglers #f))) (details (if (string-match ".*html$" logfile) (conc *toppath* "/lt/" target "/" runname "/" testname (if (equal? itempath "") "/" (conc "/" itempath "/")) logfile) #f)) ;; (prev-tdat (hash-table-ref/default data tname #f)) (tdat (let ((new (make-testdat))) (testdat-flowid-set! new flowid) (testdat-tctname-set! new tctname) (testdat-tname-set! new tname) (testdat-comment-set! new cmtstr) (testdat-details-set! new details) (testdat-duration-set! new duration) (testdat-event-time-set! new (current-seconds)) (testdat-overall-set! new newstat) (hash-table-set! data tname new) new))) (hash-table-set! data 'tqueue (cons tdat tqueue)) (hash-table-set! data tname tdat))) tests))) run-ids))) (define (monitor pid) (let* ((run-ids '()) (testdats (make-hash-table)) ;; each entry is a list of testdat structs (keys #f) (last-update 0) (target (or (args:get-arg "-target") (args:get-arg "-reqtarg"))) (runname (args:get-arg "-runname")) (tsname #f) (flowid (conc target "/" runname))) (if (and target runname) (begin (launch:setup) (set! keys (rmt:get-keys)))) (set! tsname (common:get-testsuite-name)) (print "TCMT: for testsuite=" tsname " found runname=" runname ", target=" target ", keys=" keys " and successfully ran launch:setup. Using " flowid " as the flowId.") (let loop () ;;;;;; (handle-exceptions ;;;;;; exn ;;;;;; ;; (print "Process done.") ;;;;;; (begin (print-call-chain) (print "Error message: " ((condition-property-accessor 'exn 'message) exn))) (let-values (((pidres exittype exitstatus) (process-wait pid #t))) (if (and keys (or (not run-ids) (null? run-ids))) (let* ((runs (rmt:get-runs-by-patt keys runname |
138 139 140 141 142 143 144 | (db:get-value-by-header row header "id")) rows))) (set! run-ids run-ids-in))) ;; (print "TCMT: pidres=" pidres " exittype=" exittype " exitstatus=" exitstatus " run-ids=" run-ids) (if (eq? pidres 0) (begin (if keys | > | > | | > | > > > | 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 | (db:get-value-by-header row header "id")) rows))) (set! run-ids run-ids-in))) ;; (print "TCMT: pidres=" pidres " exittype=" exittype " exitstatus=" exitstatus " run-ids=" run-ids) (if (eq? pidres 0) (begin (if keys (begin (set! last-update (update-queue-since testdats run-ids last-update tsname target runname flowid #f)) (process-queue data #f))) (thread-sleep! 3) (loop)) (begin ;; (print "TCMT: pidres=" pidres " exittype=" exittype " exitstatus=" exitstatus " run-ids=" run-ids) (print "TCMT: processing any tests that did not formally complete.") (print-changes-since testdats run-ids 0 tsname target runname flowid #t) ;; call in flush mode (process-queue data #t) (print "TCMT: All done.") )))))) ;;;;; ) ;; (trace print-changes-since) ;; (if (not (eq? pidres 0)) ;; (not exitstatus)) ;; (begin ;; (thread-sleep! 3) ;; (loop)) ;; (print "Process: megatest " (string-intersperse origargs " ") " is done."))))) (define (main) |