Merge "Fix VNFRQTS project path"

diff --git a/jjb/global-macros.yaml b/jjb/global-macros.yaml
index abf7a83..1f751da 100644 (file)
--- 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 24dba87..98312bb 100644 (file)
--- 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'