From: Anil Belur <abelur@linuxfoundation.org>
Date: Wed, 18 Jul 2018 00:05:58 +0000 (+0000)
Subject: Merge "Fix VNFRQTS project path"
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=bd1eb46f90da44b7b6a29312114fe76fcc11db58;hp=09abdd0a8228cd46b2afed444dd85c405304c142;p=ci-management.git

Merge "Fix VNFRQTS project path"
---

diff --git a/jjb/global-macros.yaml b/jjb/global-macros.yaml
index abf7a83f3..1f751da62 100644
--- a/jjb/global-macros.yaml
+++ b/jjb/global-macros.yaml
@@ -452,3 +452,20 @@
             - 'onap-jenkins-ssh'
       - openstack:
           single-use: true
+
+- wrapper:
+    # This wrapper is used for docker build jobs to use the dedicated docker
+    # build VM and turn off OpenStack single-use
+    name: infra-wrappers-docker-build
+    wrappers:
+      - timestamps
+      - timeout:
+          type: absolute
+          timeout: '{build-timeout}'
+          timeout-var: 'BUILD_TIMEOUT'
+          fail: true
+      - ssh-agent-credentials:
+          users:
+            - 'onap-jenkins-ssh'
+      - openstack:
+          single-use: false
diff --git a/jjb/global-templates-python.yaml b/jjb/global-templates-python.yaml
index 24dba8737..98312bb55 100644
--- a/jjb/global-templates-python.yaml
+++ b/jjb/global-templates-python.yaml
@@ -188,17 +188,8 @@
           checkout-dir: '{checkout-dir3}'
 
     wrappers:
-      - timestamps
-      - timeout:
-          type: absolute
-          timeout: '{build-timeout}'
-          timeout-var: 'BUILD_TIMEOUT'
-          fail: true
-      - ssh-agent-credentials:
-          users:
-            - 'onap-jenkins-ssh'
-      - openstack:
-          single-use: false
+      - infra-wrappers-docker-build:
+          build-timeout: '{build-timeout}'
 
     triggers:
       - timed: '@daily'