From efdc35b680f2700b0326f10708337ff52ddcc143 Mon Sep 17 00:00:00 2001 From: Rohan McGovern Date: Mon, 6 Aug 2012 14:19:25 +1000 Subject: 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 --- tests/baselineserver/shared/baselineprotocol.cpp | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'tests/baselineserver/shared') diff --git a/tests/baselineserver/shared/baselineprotocol.cpp b/tests/baselineserver/shared/baselineprotocol.cpp index a687c8d61b..1af5c76803 100644 --- a/tests/baselineserver/shared/baselineprotocol.cpp +++ b/tests/baselineserver/shared/baselineprotocol.cpp @@ -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; } -- cgit v1.2.3