Details
-
Bug
-
Resolution: Done
-
P1: Critical
-
2012q1
-
V2.2.1-NQT-008
Description
Occasionally, there is a mismatch in gerrit between what is actually in a build ref and what is marked as INTEGRATING in the database.
The build ref may contain commits which are not marked INTEGRATING.
At time of writing, the "INTEGRATING" changes for qt/qtbase master consist of:
I00d66d96 Fix warning about narrowing inside {} (INTEGRATING) I7df0ca94 configure: Escape '{' in getQMakeConf2 function (INTEGRATING) I439b6fad QtPrintSupport: Remove remaining LPR specific code (INTEGRATING) Iba04bc16 Load resources in in QTextDocument correctly (INTEGRATING) I29a04374 Add 'FullScreen' into QKeySequence::StandardKey (INTEGRATING) I37b5de4b Handle navigator events in BPS event filter (INTEGRATING) Ic07efa1d Register for and handle screen events delivered through BPS (INTEGRATING)
But the actual list of commits present in that build and not present in qt/qtbase master are:
$ git log --oneline refs/builds/master_201205010839 ^gerrit/master 94c9ed9 Fix warning about narrowing inside {} f470f04 configure: Escape '{' in getQMakeConf2 function 8dfd681 QtPrintSupport: Remove remaining LPR specific code 82cf85d Add 'FullScreen' into QKeySequence::StandardKey 9118767 Load resources in in QTextDocument correctly 8398dee Handle navigator events in BPS event filter 7a6d867 Register for and handle screen events delivered through BPS 61448b5 Fix compilation of public headers with QT_NO_DEPRECATED defined 1904a6d Initialize member variable 146b7a6 Reset pointer to 0 after freeing db71079 Initialize members 37b7933 Widgets: No longer use deprecated QPixmap::grabWindow(),grabWidget(). fa0d58f Fix warning 4141c45 Fix warning about narrowing inside {} a5eec4a Fix compiler warning in qdrawhelper.cpp
The build contains not only the commits it is supposed to, but various other commits as well.
This causes a fatal error at staging-approve time:
Command: ssh -p 29418 codereview.qt-project.org gerrit staging-approve -p qt/qtbase.git -i master_201205010839 -b master -r fail -m - Output: Change not in INTEGRATING state (I556c3f3657fb0490dd5543fcc56718fe9bd394e7)
It's unknown how to reproduce this. There also may be a relationship between this bug and QTQAINFRA-327.