scripts/jenkins/qt-jenkins-integrator.pl

@@ -1834,6 +1834,8 @@ sub do_state_monitor_jenkins_build
         url
         result
         fullDisplayName
+        timestamp
+        duration
     );
 
     my $json_tree;

scripts/jenkins/t/05-qt-jenkins-integrator.t

@@ -88,7 +88,7 @@ if ($OSNAME =~ m{win32}i) {
 my $QUEUE_JSON_QUERY_STRING = 'depth=2&tree=builds[number,actions[parameters[name,value]]]';
 
 # expected query string when monitoring a build
-my $BUILD_JSON_QUERY_STRING = 'depth=2&tree=building,number,url,result,fullDisplayName,runs[building,number,url,result,fullDisplayName]';
+my $BUILD_JSON_QUERY_STRING = 'depth=2&tree=building,number,url,result,fullDisplayName,timestamp,duration,runs[building,number,url,result,fullDisplayName,timestamp,duration]';
 
 # base configuration used in tests; override where appropriate
 my $GERRIT_BASE = 'ssh://gerrit.example.com';

scripts/qt/qt_update_submodules.pl

@@ -266,6 +266,11 @@ sub update_submodule
         confess "Command `@cmd' did not output a giturl";
     }
 
+    # .gitmodules may contain relative path for submodules
+    if ($giturl eq "../$submodule.git") {
+        $giturl = catfile("qtgitreadonly:qt", "$submodule.git");
+    }
+
     chdir catfile($base_dir, $submodule);
     $self->exe( qw(git fetch --verbose), $giturl, "+$ref:refs/heads/updated_submodule" );