X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=jjb%2Ftldk%2Ftldk.yaml;h=b37581ce6c77c3212e834fbe3ff6e4f9fcb646ae;hb=de493dd9ff7d03ec85b154dd4cbf0cc8c5e3aad2;hp=3f80c04810943bd0f8606090788224304dbeddfb;hpb=951b11905ff1c1556807e8f802136f5b3cc88d7a;p=ci-management.git

diff --git a/jjb/tldk/tldk.yaml b/jjb/tldk/tldk.yaml
index 3f80c0481..b37581ce6 100644
--- a/jjb/tldk/tldk.yaml
+++ b/jjb/tldk/tldk.yaml
@@ -18,7 +18,7 @@
     name: '{project}-verify-{stream}-{os}'
 
     project-type: freestyle
-    node: 'verify-{os}'
+    node: '{os}-basebuild-4c-4g'
     concurrent: true
 
     logrotate:
@@ -37,14 +37,13 @@
 
     scm:
         - gerrit-trigger-scm:
-            credentials-id: '{ssh-credentials}'
+            credentials-id: 'jenkins-gerrit-credentials'
             refspec: '$GERRIT_REFSPEC'
             choosing-strategy: 'gerrit'
 
     wrappers:
-        - ssh-agent-credentials:
-            users:
-                - '{ssh-credentials}'
+        - fdio-infra-wrappers:
+            build-timeout: '{build-timeout}'
 
     triggers:
         - gerrit-trigger-patch-submitted:
@@ -52,6 +51,10 @@
             branch: '{branch}'
 
     builders:
+        - shell:
+            !include-raw-escape: gtest-build.sh
+        - inject:
+            properties-file: gtest-env.prop
         - shell:
             !include-raw-escape: include-raw-build.sh
 
@@ -59,7 +62,7 @@
     name: '{project}-verify-image-{stream}-{os}'
 
     project-type: freestyle
-    node: 'verify-image-{os}'
+    node: '{os}-basebuild-4c-4g'
     concurrent: true
 
     logrotate:
@@ -78,14 +81,13 @@
 
     scm:
         - gerrit-trigger-scm:
-            credentials-id: '{ssh-credentials}'
+            credentials-id: 'jenkins-gerrit-credentials'
             refspec: '$GERRIT_REFSPEC'
             choosing-strategy: 'gerrit'
 
     wrappers:
-        - ssh-agent-credentials:
-            users:
-                - '{ssh-credentials}'
+        - fdio-infra-wrappers:
+            build-timeout: '{build-timeout}'
 
     triggers:
         - gerrit:
@@ -106,6 +108,10 @@
                 notbuilt: true
 
     builders:
+        - shell:
+            !include-raw-escape: gtest-build.sh
+        - inject:
+            properties-file: gtest-env.prop
         - shell:
             !include-raw-escape: include-raw-build.sh
 
@@ -113,7 +119,7 @@
     name: '{project}-merge-{stream}-{os}'
 
     project-type: freestyle
-    node: 'merge-{os}'
+    node: '{os}-basebuild-4c-4g'
 
     logrotate:
         daysToKeep: '{build-days-to-keep}'
@@ -131,14 +137,13 @@
 
     scm:
         - gerrit-trigger-scm:
-            credentials-id: '{ssh-credentials}'
+            credentials-id: 'jenkins-gerrit-credentials'
             refspec: ''
             choosing-strategy: 'default'
 
     wrappers:
-        - ssh-agent-credentials:
-            users:
-                - '{ssh-credentials}'
+        - fdio-infra-wrappers:
+            build-timeout: '{build-timeout}'
 
     triggers:
         - gerrit-trigger-patch-merged:
@@ -147,4 +152,8 @@
 
     builders:
         - shell:
-            !include-raw-escape: include-raw-build.sh
\ No newline at end of file
+            !include-raw-escape: gtest-build.sh
+        - inject:
+            properties-file: gtest-env.prop
+        - shell:
+            !include-raw-escape: include-raw-build.sh