X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=jjb%2Ftldk%2Ftldk.yaml;h=b8e6e821fdb164e2aeb00f64eb612c6b00202d37;hb=0be40a9d0b67e53e20ec9b8ba77407f7696e881f;hp=83cfbf4af7e24368643bc1e752d0c90f0a51fc5d;hpb=2d286c0bfff820a47ba091d3952c6f3c6c7daa9d;p=ci-management.git

diff --git a/jjb/tldk/tldk.yaml b/jjb/tldk/tldk.yaml
index 83cfbf4af..b8e6e821f 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:
@@ -42,9 +42,6 @@
             choosing-strategy: 'gerrit'
 
     wrappers:
-        - ssh-agent-credentials:
-            users:
-                - 'jenkins-gerrit-credentials'
         - fdio-infra-wrappers:
             build-timeout: '{build-timeout}'
 
@@ -54,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
 
@@ -61,7 +62,7 @@
     name: '{project}-verify-image-{stream}-{os}'
 
     project-type: freestyle
-    node: 'verify-image-{os}'
+    node: '{os}-basebuild-4c-4g'
     concurrent: true
 
     logrotate:
@@ -85,9 +86,6 @@
             choosing-strategy: 'gerrit'
 
     wrappers:
-        - ssh-agent-credentials:
-            users:
-                - 'jenkins-gerrit-credentials'
         - fdio-infra-wrappers:
             build-timeout: '{build-timeout}'
 
@@ -117,7 +115,7 @@
     name: '{project}-merge-{stream}-{os}'
 
     project-type: freestyle
-    node: 'merge-{os}'
+    node: '{os}-basebuild-4c-4g'
 
     logrotate:
         daysToKeep: '{build-days-to-keep}'
@@ -140,9 +138,6 @@
             choosing-strategy: 'default'
 
     wrappers:
-        - ssh-agent-credentials:
-            users:
-                - 'jenkins-gerrit-credentials'
         - fdio-infra-wrappers:
             build-timeout: '{build-timeout}'