From d0b160da00058fb46b01268d71a571a7cfdcf7da Mon Sep 17 00:00:00 2001
From: gwu <gary.i.wu@huawei.com>
Date: Tue, 17 Jul 2018 09:46:52 -0700
Subject: [PATCH] Leverage docker layer caching for testsuite

Use new queue-docker-4c-4g persistent build node type to
test the use of docker layer caching.

Also remove amsterdam job for testsuite.

Change-Id: Ieb2470092fddf392799d0d5faead820dd663531e
Issue-ID: INT-588
Signed-off-by: gwu <gary.i.wu@huawei.com>
---
 jjb/global-templates-python.yaml | 18 +++++++++++++-----
 jjb/testsuite/testsuite.yaml     |  2 --
 2 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/jjb/global-templates-python.yaml b/jjb/global-templates-python.yaml
index 966ecb324..24dba8737 100644
--- a/jjb/global-templates-python.yaml
+++ b/jjb/global-templates-python.yaml
@@ -151,7 +151,7 @@
 
     name: '{project-name}-{stream}-3scm-docker-shell-daily'
     project-type: freestyle
-    node: 'ubuntu1604-docker-8c-8g'
+    node: 'queue-docker-4c-4g'
 
     properties:
       - infra-properties:
@@ -188,12 +188,20 @@
           checkout-dir: '{checkout-dir3}'
 
     wrappers:
-      - infra-wrappers:
-          build-timeout: '{build-timeout}'
+      - timestamps
+      - timeout:
+          type: absolute
+          timeout: '{build-timeout}'
+          timeout-var: 'BUILD_TIMEOUT'
+          fail: true
+      - ssh-agent-credentials:
+          users:
+            - 'onap-jenkins-ssh'
+      - openstack:
+          single-use: false
 
     triggers:
-      # 12 AM UTC
-      - timed: 'H 12 * * *'
+      - timed: '@daily'
       - gerrit-trigger-release-manually:
           server: '{server-name}'
           project: '{project}'
diff --git a/jjb/testsuite/testsuite.yaml b/jjb/testsuite/testsuite.yaml
index f2e862d8c..92d5ffa47 100644
--- a/jjb/testsuite/testsuite.yaml
+++ b/jjb/testsuite/testsuite.yaml
@@ -27,6 +27,4 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'amsterdam':
-          branch: 'amsterdam'
     mvn-settings: 'testsuite-settings'
-- 
2.16.6