From: Thanh Ha <thanh.ha@linuxfoundation.org>
Date: Mon, 19 Dec 2016 21:55:35 +0000 (+0000)
Subject: Merge "Revert "Add dependencies for tldk jjb""
X-Git-Url: https://gerrit.fd.io/r/gitweb?a=commitdiff_plain;h=0be40a9d0b67e53e20ec9b8ba77407f7696e881f;hp=-c;p=ci-management.git

Merge "Revert "Add dependencies for tldk jjb""
---

0be40a9d0b67e53e20ec9b8ba77407f7696e881f
diff --combined jjb/tldk/tldk.yaml
index b37581ce6,0a29baf73..b8e6e821f
--- a/jjb/tldk/tldk.yaml
+++ b/jjb/tldk/tldk.yaml
@@@ -18,7 -18,7 +18,7 @@@
      name: '{project}-verify-{stream}-{os}'
  
      project-type: freestyle
 -    node: 'verify-{os}'
 +    node: '{os}-basebuild-4c-4g'
      concurrent: true
  
      logrotate:
@@@ -62,7 -62,7 +62,7 @@@
      name: '{project}-verify-image-{stream}-{os}'
  
      project-type: freestyle
 -    node: 'verify-image-{os}'
 +    node: '{os}-basebuild-4c-4g'
      concurrent: true
  
      logrotate:
@@@ -108,10 -108,6 +108,6 @@@
                  notbuilt: true
  
      builders:
-         - shell:
-             !include-raw-escape: gtest-build.sh
-         - inject:
-             properties-file: gtest-env.prop
          - shell:
              !include-raw-escape: include-raw-build.sh
  
@@@ -119,7 -115,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}'
@@@ -151,9 -147,5 +147,5 @@@
              branch: '{branch}'
  
      builders:
-         - shell:
-             !include-raw-escape: gtest-build.sh
-         - inject:
-             properties-file: gtest-env.prop
          - shell:
              !include-raw-escape: include-raw-build.sh