Merge "Migrate docs-rtd to archive-builds macro"

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

diff --git a/jjb/integration/integration-templates.yaml b/jjb/integration/integration-templates.yaml
index 024ed1f0b94c46c28b2cdca79b0c675f55eeb2f8..f96ef155fd36797662780cd4cd8e09db835bb672 100644 (file)
--- a/jjb/integration/integration-templates.yaml
+++ b/jjb/integration/integration-templates.yaml
@@ -10,7 +10,7 @@
 #
 # Parameters:
 #
-# project-parameter: main project integration/test ($PROJECT)
+# opendaylight-infra-parameters: main project integration/test ($PROJECT)
 # jre: (openjdk7 or openjdk8) Java runtime environment to use when launching ODL
 # integration-branch: distribution branch ($BRANCH)
 # integration-controller-bundleurl: distribution URL ($BUNDLEURL)
@@ -38,8 +38,11 @@
         artifactNumToKeep: '{build-num-to-keep}'
 
     parameters:
-        - project-parameter:
+        - opendaylight-infra-parameters:
             project: 'integration/test'
+            branch: '{branch}'
+            refspec: 'refs/heads/{branch}'
+            artifacts: '{archive-artifacts}'
         - integration-branch:
             branch: 'stable/beryllium'
         - integration-distribution-stream:
@@ -120,8 +123,11 @@
         artifactNumToKeep: '{build-num-to-keep}'
 
     parameters:
-        - project-parameter:
+        - opendaylight-infra-parameters:
             project: 'integration/test'
+            branch: '{branch}'
+            refspec: 'refs/heads/{branch}'
+            artifacts: '{archive-artifacts}'
         - integration-branch:
             branch: '{branch}'
         - integration-distribution-stream:
@@ -226,8 +232,11 @@
         artifactNumToKeep: '{build-num-to-keep}'
 
     parameters:
-        - project-parameter:
+        - opendaylight-infra-parameters:
             project: 'integration/test'
+            branch: '{branch}'
+            refspec: 'refs/heads/{branch}'
+            artifacts: '{archive-artifacts}'
         - integration-branch:
             branch: '{branch}'
         - integration-distribution-stream:
@@ -331,8 +340,11 @@
         artifactNumToKeep: '{build-num-to-keep}'
 
     parameters:
-        - project-parameter:
+        - opendaylight-infra-parameters:
             project: 'integration/test'
+            branch: '{branch}'
+            refspec: 'refs/heads/{branch}'
+            artifacts: '{archive-artifacts}'
         - integration-branch:
             branch: 'stable/beryllium'
         - integration-distribution-stream:
@@ -414,8 +426,11 @@
         artifactNumToKeep: '{build-num-to-keep}'
 
     parameters:
-        - project-parameter:
+        - opendaylight-infra-parameters:
             project: 'integration/test'
+            branch: '{branch}'
+            refspec: 'refs/heads/{branch}'
+            artifacts: '{archive-artifacts}'
         - integration-branch:
             branch: '{branch}'
         - integration-distribution-stream:
@@ -521,8 +536,11 @@
         artifactNumToKeep: '{build-num-to-keep}'
 
     parameters:
-        - project-parameter:
+        - opendaylight-infra-parameters:
             project: 'integration/test'
+            branch: '{branch}'
+            refspec: 'refs/heads/{branch}'
+            artifacts: '{archive-artifacts}'
         - integration-branch:
             branch: '{branch}'
         - integration-distribution-stream:
@@ -613,78 +631,6 @@
         - archive-build:
             maven-version: '{mvn33}'
 
-- job-template:
-    name: '{project}-openstack-{functionality}-daily-{openstack}-{odl}'
-
-    project-type: freestyle
-    node: dynamic_robot
-
-    logrotate:
-        daysToKeep: '{build-days-to-keep}'
-        numToKeep: '{build-num-to-keep}'
-        artifactDaysToKeep: '{build-artifact-days-to-keep}'
-        artifactNumToKeep: '{build-num-to-keep}'
-
-    parameters:
-        - project-parameter:
-            project: 'integration/test'
-        - integration-patch-refspec:
-            branch: 'master'
-        - integration-test-plan:
-            test-plan: '{project}-{functionality}.txt'
-        - string:
-            name: OPENSTACK_BRANCH
-            default: '{openstack-branch}'
-            description: 'Openstack branch to use with devstack'
-        - string:
-            name: ODL_VERSION
-            default: '{odl-version}'
-            description: 'OpenDaylight version to use with devstack + networking_odl project'
-        - string:
-            name: TEMPEST_REGEX
-            default: 'tempest.api.network'
-            description: 'Default grouping of tempest tests to run'
-
-    scm:
-        - integration-gerrit-scm:
-            basedir: 'test'
-            refspec: '$PATCHREFSPEC'
-            branch: 'master'
-
-    wrappers:
-        - opendaylight-infra-wrappers:
-            build-timeout: '{build-timeout}'
-        - openstack:
-            instances:
-              - cloud-name: 'ODLRPC'
-                template-name: 'centos7-devstack'
-                count: '1'
-
-    # Trigger jobs (daily)
-    triggers:
-        - integration-csit-all
-
-    builders:
-        - integration-copy-ssh-keys
-        - integration-install-robotframework
-        - inject:
-            properties-file: 'env.properties'
-        - integration-get-slave-addresses
-        - inject:
-            properties-file: 'slave_addresses.txt'
-        - include-raw-integration-deploy-devstack-testing
-        - integration-cleanup-tmp
-
-    publishers:
-        - integration-robot:
-            unstable-if: 0.0
-            pass-if: 100.0
-        - email-notification:
-            email-prefix: '[{project}]'
-        - integration-csit-archive-build
-        - archive-build:
-            maven-version: '{mvn33}'
-
 - job-template:
     name: '{project}-csit-1node-openstack-{openstack}-{functionality}-{stream}'
     disabled: false
@@ -699,8 +645,11 @@
         artifactNumToKeep: '{build-num-to-keep}'
 
     parameters:
-        - project-parameter:
+        - opendaylight-infra-parameters:
             project: 'integration/test'
+            branch: '{branch}'
+            refspec: 'refs/heads/{branch}'
+            artifacts: '{archive-artifacts}'
         - integration-branch:
             branch: '{branch}'
         - integration-distribution-stream:
@@ -801,8 +750,11 @@
         artifactNumToKeep: '{build-num-to-keep}'
 
     parameters:
-        - project-parameter:
+        - opendaylight-infra-parameters:
             project: 'integration/test'
+            branch: '{branch}'
+            refspec: 'refs/heads/{branch}'
+            artifacts: '{archive-artifacts}'
         - integration-branch:
             branch: '{branch}'
         - integration-distribution-stream:
@@ -913,12 +865,11 @@
         artifactNumToKeep: '{build-artifact-num-to-keep}'
 
     parameters:
-        - gerrit-parameters:
+        - opendaylight-infra-parameters:
             project: '{project}'
             branch: '{branch}'
             refspec: '$GERRIT_REFSPEC'
-        - project-parameter:
-            project: '{project}'
+            artifacts: '{archive-artifacts}'
         - integration-branch:
             branch: '{branch}'
         - integration-distribution-git-url