whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

lancelot: detect and handle Jenkins CI environment 

Make the test behave in Jenkins similarly as it behaves in Pulse:

  - a test run in Jenkins is not an ad-hoc run

  - the JENKINS_HOME environment variable implies we are running in
    Jenkins

  - the GIT_BRANCH environment variable, set by the Jenkins git plugin,
    is equivalent to PULSE_GIT_BRANCH

  - there is no equivalent to PULSE_TESTR_BRANCH, since testr is no
    longer used

Change-Id: I89ffeec659b4adaab309d8b93ad793ce640029c7
Reviewed-by: aavit <qt_aavit@ovi.com>
bb10
Rohan McGovern 2012-08-06 14:19:25 +10:00 committed by Qt by Nokia
parent b170668bb8
commit efdc35b680
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
tests/baselineserver/shared/baselineprotocol.cpp
View File

@ -142,6 +142,14 @@ PlatformInfo PlatformInfo::localHostInfo()
pi.insert(PI_PulseTestrBranch, QString::fromLatin1(tb));
pi.setAdHocRun(false);
}
if (!qgetenv("JENKINS_HOME").isEmpty()) {
pi.setAdHocRun(false);
gb = qgetenv("GIT_BRANCH");
if (!gb.isEmpty()) {
// FIXME: the string "Pulse" should be eliminated, since that is not the used tool.
pi.insert(PI_PulseGitBranch, QString::fromLatin1(gb));
}
}
return pi;
}