Merge "Use lf-infra-pre-build for openstack & lftools"

[releng/builder.git] / jjb / integration / integration-templates.yaml

diff --git a/jjb/integration/integration-templates.yaml b/jjb/integration/integration-templates.yaml
index 2d5752e383b80f9ec1920e64dc03b60838c072cc..1defd548879d536d64ace7f2d4d112aeb4f0a554 100644 (file)
--- a/jjb/integration/integration-templates.yaml
+++ b/jjb/integration/integration-templates.yaml
@@ -94,6 +94,7 @@
           files: 'csit/suites/{project}/**'
 
     builders:
+      - lf-infra-pre-build
       - integration-infra-stack:
           stack-template: '{stack-template}'
           vm_0_count: '1'
@@ -128,7 +129,8 @@
 - job-template:
     name: '{prefix}{project}-csit-1node-{functionality}-{install}-{stream}'
     id: inttest-csit-1node
-    disabled: false
+    disable-job: false
+    disabled: '{disable-job}'
 
     project-type: freestyle
     node: centos7-robot-2c-8g
@@ -195,6 +197,7 @@
           build-timeout: '{build-timeout}'
 
     builders:
+      - lf-infra-pre-build
       - integration-infra-stack:
           stack-template: '{stack-template}'
           vm_0_count: '1'
@@ -435,6 +438,7 @@
           files: 'csit/suites/{project}/**'
 
     builders:
+      - lf-infra-pre-build
       - integration-infra-stack:
           stack-template: '{stack-template}'
           vm_0_count: '3'
@@ -532,6 +536,7 @@
           build-timeout: '{build-timeout}'
 
     builders:
+      - lf-infra-pre-build
       - integration-infra-stack:
           stack-template: '{stack-template}'
           vm_0_count: '3'
@@ -766,6 +771,7 @@
           build-timeout: '{build-timeout}'
 
     builders:
+      - lf-infra-pre-build
       - integration-infra-stack:
           stack-template: '{stack-template}'
           vm_0_count: '3'
@@ -988,6 +994,11 @@
           name: ODL_SNAT_MODE
           default: '{odl-snat-mode}'
           description: 'The SNAT mode to be configured - options are conntrack/controller.'
+      - string:
+          name: OVS_INSTALL
+          default: '{ovs-install}'
+          description: 'Install a custom OVS. It can be an OVS version to build (like v2.9.2 or v2.6.1-nsh) or a yum
+          repo url to pull from.'
     scm:
       - integration-gerrit-scm:
           basedir: 'test'
@@ -1002,6 +1013,7 @@
       - timed: '{schedule}'
 
     builders:
+      - lf-infra-pre-build
       - integration-infra-stack-4-type:
           stack-template: '{stack-template}'
           vm_0_count: '{odl_system_count}'
@@ -1198,10 +1210,6 @@
           default: '{lbaas-service-provider}'
           description: 'The NEUTRON_LBAAS_SERVICE_PROVIDERV2 value to be used in local.conf - only relevant when using
           neutron-lbaas'
-      - string:
-          name: NUM_OPENSTACK_SITES
-          default: '{num-openstack-sites}'
-          description: 'Number of openstack sites'
       - string:
           name: ODL_SFC_DRIVER
           default: '{odl-sfc-driver}'
@@ -1210,7 +1218,11 @@
           name: ODL_SNAT_MODE
           default: '{odl-snat-mode}'
           description: 'The SNAT mode to be configured - options are conntrack/controller.'
-
+      - string:
+          name: OVS_INSTALL
+          default: '{ovs-install}'
+          description: 'Install a custom OVS. It can be an OVS version to build (like v2.9.2 or v2.6.1-nsh) or a yum
+          repo url to pull from.'
     scm:
       - integration-gerrit-scm:
           basedir: 'test'
@@ -1225,6 +1237,7 @@
       - timed: '{schedule}'
 
     builders:
+      - lf-infra-pre-build
       - integration-infra-stack-3-type:
           stack-template: '{stack-template}'
           vm_0_count: '{odl_system_count}'