Merge "Revert "Add dependencies for tldk jjb""
authorThanh Ha <thanh.ha@linuxfoundation.org>
Mon, 19 Dec 2016 21:55:35 +0000 (21:55 +0000)
committerGerrit Code Review <gerrit@fd.io>
Mon, 19 Dec 2016 21:55:35 +0000 (21:55 +0000)
1  2 
jjb/tldk/tldk.yaml

diff --combined 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:
                  notbuilt: true
  
      builders:
-         - shell:
-             !include-raw-escape: gtest-build.sh
-         - inject:
-             properties-file: gtest-env.prop
          - shell:
              !include-raw-escape: include-raw-build.sh
  
      name: '{project}-merge-{stream}-{os}'
  
      project-type: freestyle
 -    node: 'merge-{os}'
 +    node: '{os}-basebuild-4c-4g'
  
      logrotate:
          daysToKeep: '{build-days-to-keep}'
              branch: '{branch}'
  
      builders:
-         - shell:
-             !include-raw-escape: gtest-build.sh
-         - inject:
-             properties-file: gtest-env.prop
          - shell:
              !include-raw-escape: include-raw-build.sh