lancelot: detect and handle Jenkins CI environment
authorRohan McGovern <rohan.mcgovern@nokia.com>
Mon, 6 Aug 2012 04:19:25 +0000 (14:19 +1000)
committerQt by Nokia <qt-info@nokia.com>
Mon, 6 Aug 2012 14:04:22 +0000 (16:04 +0200)
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>
tests/baselineserver/shared/baselineprotocol.cpp

index a687c8d..1af5c76 100644 (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;
 }