Add step in all projects merge job to trigger distribution merge
[releng/builder.git] / jjb / integration / integration-templates.yaml
index f51cf4527c9eab66bfea831661c4d08da148281e..c56bf1cb29fe2d4762e70a2de9578c159fe01b84 100644 (file)
@@ -1,6 +1,6 @@
 # Job templates in this file (please update with every new template):
+# FIXME: Update
 #
-# New (for Be release):
 # {project}-csit-verify-1node-{functionality}
 # {project}-csit-1node-{functionality}-{install}-{stream}
 # {project}-csit-1node-periodic-{functionality}-{install}-{stream}
@@ -9,6 +9,7 @@
 # {project}-csit-3node-periodic-{functionality}-{install}-{stream}
 #
 # Parameters:
+# FIXME: Distinguish variables, macros and arguments, then update.
 #
 # opendaylight-infra-parameters: main project integration/test ($PROJECT)
 # jre: (openjdk7 or openjdk8) Java runtime environment to use when launching ODL
@@ -42,9 +43,9 @@
             refspec: 'refs/heads/{branch}'
             artifacts: '{archive-artifacts}'
         - integration-branch:
-            branch: 'stable/boron'
+            branch: '{verify-branch}'
         - integration-distribution-stream:
-            stream: 'boron'
+            stream: '{verify-stream}'
         - integration-bundleurl:
             bundleurl: '{bundleurl}'
         - integration-controller-scope:
         - integration-test-options:
             test-options: '{robot-options}'
         - integration-stream-test-plan:
-            stream-test-plan: '{project}-{functionality}-boron.txt'
+            stream-test-plan: '{project}-{functionality}-{verify-stream}.txt'
         - integration-test-plan:
             test-plan: '{project}-{functionality}.txt'
         - integration-jdk-version:
-            jdkversion: 'openjdk8'
+            jdkversion: '{verify-jdkversion}'
 
     scm:
         - integration-gerrit-scm:
     wrappers:
         - opendaylight-infra-wrappers:
             build-timeout: '{build-timeout}'
-        - integration-jclouds-controller-mininet:
-            controller-image: '{controller-image}'
-            controller-vms: 1
-            mininet-image: '{mininet-image}'
-            mininet-vms: '{mininet-vms}'
 
     triggers:
         - integration-trigger-patch-submitted:
             files: 'csit/suites/{project}/**'
 
     builders:
-        - integration-copy-ssh-keys
-        - integration-cleanup-workspace
+        - integration-infra-stack:
+            stack-template: '{stack-template}'
+            vm_0_count: '1'
+            vm_0_flavor: '{odl_system_flavor}'
+            vm_0_image: '{odl_system_image}'
+            vm_1_count: '{tools_system_count}'
+            vm_1_flavor: '{tools_system_flavor}'
+            vm_1_image: '{tools_system_image}'
         - integration-install-robotframework
         - inject:
             properties-file: 'env.properties'
     wrappers:
         - opendaylight-infra-wrappers:
             build-timeout: '{build-timeout}'
-        - integration-jclouds-controller-mininet:
-            controller-image: '{controller-image}'
-            controller-vms: 1
-            mininet-image: '{mininet-image}'
-            mininet-vms: '{mininet-vms}'
 
     triggers:
         - integration-csit-{install}:
             jobs: '{trigger-jobs}'
 
     builders:
-        - integration-copy-ssh-keys
-        - integration-cleanup-workspace
+        - integration-infra-stack:
+            stack-template: '{stack-template}'
+            vm_0_count: '1'
+            vm_0_flavor: '{odl_system_flavor}'
+            vm_0_image: '{odl_system_image}'
+            vm_1_count: '{tools_system_count}'
+            vm_1_flavor: '{tools_system_flavor}'
+            vm_1_image: '{tools_system_image}'
         - integration-install-robotframework
         - inject:
             properties-file: 'env.properties'
     wrappers:
         - opendaylight-infra-wrappers:
             build-timeout: '{build-timeout}'
-        - integration-jclouds-controller-mininet:
-            controller-image: '{controller-image}'
-            controller-vms: 1
-            mininet-image: '{mininet-image}'
-            mininet-vms: '{mininet-vms}'
 
     triggers:
         - timed: '{schedule}'
 
     builders:
-        - integration-copy-ssh-keys
-        - integration-cleanup-workspace
+        - integration-infra-stack:
+            stack-template: '{stack-template}'
+            vm_0_count: '1'
+            vm_0_flavor: '{odl_system_flavor}'
+            vm_0_image: '{odl_system_image}'
+            vm_1_count: '{tools_system_count}'
+            vm_1_flavor: '{tools_system_flavor}'
+            vm_1_image: '{tools_system_image}'
         - integration-install-robotframework
         - inject:
             properties-file: 'env.properties'
             refspec: 'refs/heads/{branch}'
             artifacts: '{archive-artifacts}'
         - integration-branch:
-            branch: 'stable/boron'
+            branch: '{verify-branch}'
         - integration-distribution-stream:
-            stream: 'boron'
+            stream: '{verify-stream}'
         - integration-bundleurl:
             bundleurl: '{bundleurl}'
         - integration-controller-scope:
         - integration-test-options:
             test-options: '{robot-options}'
         - integration-stream-test-plan:
-            stream-test-plan: '{project}-{functionality}-boron.txt'
+            stream-test-plan: '{project}-{functionality}-{verify-stream}.txt'
         - integration-test-plan:
             test-plan: '{project}-{functionality}.txt'
         - integration-jdk-version:
-            jdkversion: 'openjdk8'
+            jdkversion: '{verify-jdkversion}'
 
     scm:
         - integration-gerrit-scm:
     wrappers:
         - opendaylight-infra-wrappers:
             build-timeout: '{build-timeout}'
-        - integration-jclouds-controller-docker:
-            controller-image: '{controller-image}'
-            controller-vms: 3
-            docker-image: '{docker-image}'
-            docker-vms: 1
 
     triggers:
         - integration-csit-{install}:
             jobs: '{trigger-jobs}'
 
     builders:
-        - integration-copy-ssh-keys
-        - integration-cleanup-workspace
+        - integration-infra-stack:
+            stack-template: '{stack-template}'
+            vm_0_count: '3'
+            vm_0_flavor: '{odl_system_flavor}'
+            vm_0_image: '{odl_system_image}'
+            vm_1_count: '{docker_system_count}'
+            vm_1_flavor: '{docker_system_flavor}'
+            vm_1_image: '{docker_system_image}'
         - integration-install-robotframework
         - inject:
             properties-file: 'env.properties'
             maven-version: 'mvn33'
 
 - job-template:
-    name: '{project}-csit-1node-openstack-{openstack}-{functionality}-{stream}'
+    name: '{project}-csit-{topology}-openstack-{openstack}-{functionality}-{stream}'
     disabled: false
 
     project-type: freestyle
             name: PUBLIC_BRIDGE
             default: '{public-bridge}'
             description: 'Specifies public bridge for provider and external networking'
-        - string:
-            name: ENABLE_OS_SERVICES
-            default: '{enable-openstack-services}'
-            description: 'comma seperated list of services to enable'
-        - string:
-            name: DISABLE_OS_SERVICES
-            default: '{disable-openstack-services}'
-            description: 'comma seperated list of services to enable'
-        - string:
-            name: TENANT_NETWORK_TYPE
-            default: '{tenant-network-type}'
-            description: 'Tenant Network Type supported by the implementation'
-        - string:
-            name: SECURITY_GROUP_MODE
-            default: '{security-group-mode}'
-            description: 'Security Group Mode to be used in netvirt aclservice config'
-    scm:
-        - integration-gerrit-scm:
-            basedir: 'test'
-            refspec: '$PATCHREFSPEC'
-            branch: 'master'
-
-    wrappers:
-        - opendaylight-infra-wrappers:
-            build-timeout: '{build-timeout}'
-
-    triggers:
-        - timed: '{schedule}'
-
-    builders:
-        - integration-infra-stack:
-            stack-template: '{stack-template}'
-            vm_0_count: '1'
-            vm_0_flavor: '{odl_system_flavor}'
-            vm_0_image: '{odl_system_image}'
-            vm_1_count: '{openstack_system_count}'
-            vm_1_flavor: '{openstack_system_flavor}'
-            vm_1_image: '{openstack_system_image}'
-        - integration-install-robotframework
-        - inject:
-            properties-file: 'env.properties'
-        - integration-get-slave-addresses
-        - inject:
-            properties-file: 'slave_addresses.txt'
-        - integration-get-bundle-vars
-        - inject:
-            properties-file: 'bundle_vars.txt'
-        - integration-deploy-controller-run-test
-        - integration-deploy-openstack-run-test
-        - integration-cleanup-tmp
-
-    publishers:
-        - integration-robot-tempest:
-            unstable-if: 0.0
-            pass-if: 100.0
-        - email-notification:
-            email-recipients: '{email-recipients}'
-            email-prefix: '[{project}]'
-        - integration-csit-archive-build
-        - opendaylight-infra-shiplogs:
-            maven-version: 'mvn33'
-
-- job-template:
-    name: '{project}-csit-3node-openstack-{openstack}-{functionality}-{stream}'
-    disabled: false
-
-    project-type: freestyle
-    node: centos7-robot-2c-2g
-    concurrent: true
-
-    properties:
-        - opendaylight-infra-properties:
-            build-days-to-keep: '{build-days-to-keep}'
-
-    parameters:
-        - opendaylight-infra-parameters:
-            project: 'integration/test'
-            branch: '{branch}'
-            refspec: 'refs/heads/{branch}'
-            artifacts: '{archive-artifacts}'
-        - integration-branch:
-            branch: '{branch}'
-        - integration-distribution-stream:
-            stream: '{stream}'
-        - integration-bundleurl:
-            bundleurl: '{bundleurl}'
-        - integration-controller-features:
-            controller-features: 'odl-jolokia,{install-features}'
-        - integration-test-options:
-            test-options: '{robot-options}'
-        - integration-test-plan:
-            test-plan: '{project}-3node-openstack.txt'
-        - integration-patch-refspec:
-            branch: 'master'
-        - integration-jdk-version:
-            jdkversion: '{jre}'
-        - string:
-            name: OPENSTACK_BRANCH
-            default: '{openstack-branch}'
-            description: 'Openstack version to use with devstack'
-        - string:
-            name: ODL_ML2_DRIVER_REPO
-            default: '{odl-ml2-driver-repo}'
-            description: 'URL to fetch networking-odl driver'
-        - string:
-            name: ODL_ML2_BRANCH
-            default: '{odl-ml2-branch}'
-            description: 'Version of networking-odl to checkout from the repo'
-        - string:
-            name: ODL_ML2_DRIVER_VERSION
-            default: '{odl-ml2-driver-version}'
-            description: 'Mode of networking-odl (v1 or v2)'
-        - string:
-            name: ODL_ENABLE_L3_FWD
-            default: '{odl-enable-l3}'
-            description: 'Enable L3 FWD in ODL for createing br-ex'
-        - string:
-            name: PUBLIC_BRIDGE
-            default: '{public-bridge}'
-            description: 'Specifies public bridge for provider and external networking'
         - string:
             name: ENABLE_HAPROXY_FOR_NEUTRON
             default: '{enable-haproxy}'
             name: SECURITY_GROUP_MODE
             default: '{security-group-mode}'
             description: 'Security Group Mode to be used in netvirt aclservice config'
-
     scm:
         - integration-gerrit-scm:
             basedir: 'test'
     builders:
         - integration-infra-stack:
             stack-template: '{stack-template}'
-            vm_0_count: '3'
+            vm_0_count: '{odl_system_count}'
             vm_0_flavor: '{odl_system_flavor}'
             vm_0_image: '{odl_system_image}'
             vm_1_count: '{openstack_system_count}'
         - integration-get-bundle-vars
         - inject:
             properties-file: 'bundle_vars.txt'
-        - integration-configure-clustering
-        - integration-start-cluster-run-test
+        - integration-deploy-controller-run-test
         - integration-deploy-openstack-run-test
         - integration-cleanup-tmp