Fix daexim jobs (not SR project)

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

diff --git a/jjb/integration/integration-templates.yaml b/jjb/integration/integration-templates.yaml
index 187dd76cbfa93cbae4a8226d3cfdf755cfdc325d..40cd2f1114a3667a2f5b189b92b781ca72a0f765 100644 (file)
--- a/jjb/integration/integration-templates.yaml
+++ b/jjb/integration/integration-templates.yaml
@@ -15,7 +15,7 @@
 # opendaylight-infra-parameters: main project integration/test ($PROJECT)
 # jre: (openjdk7 or openjdk8) Java runtime environment to use when launching ODL
 # integration-distribution-branch: distribution branch ($DISTROBRANCH)
-# integration-controller-bundleurl: distribution URL ($BUNDLEURL)
+# integration-controller-bundle-url: distribution URL ($BUNDLE_URL)
 # integration-controller-scope: only or all features ($CONTROLLERSCOPE)
 # integration-controller-features: features under test ($CONTROLLER FEATURES)
 # integration-test-options: robot options ($TESTOPTIONS)
@@ -48,8 +48,8 @@
           branch: '{verify-branch}'
       - integration-distribution-stream:
           stream: '{verify-stream}'
-      - integration-bundleurl:
-          bundleurl: '{bundleurl}'
+      - integration-bundle-url:
+          bundle-url: '{bundle-url}'
       - integration-controller-scope:
           controller-scope: 'only'
       - integration-controller-features:
@@ -62,6 +62,8 @@
           test-plan: '{project}-{functionality}.txt'
       - integration-jdk-version:
           jdkversion: '{verify-jdkversion}'
+      - distribution-karaf-version:
+          karaf-version: '{verify-karaf-version}'
 
     scm:
       - integration-gerrit-scm:
@@ -95,9 +97,7 @@
       - integration-get-slave-addresses
       - inject:
           properties-file: 'slave_addresses.txt'
-      - integration-get-bundle-vars
-      - inject:
-          properties-file: 'bundle_vars.txt'
+      - integration-detect-variables
       - integration-deploy-controller-run-test
       - integration-cleanup-tmp
 
@@ -114,6 +114,7 @@
 
 - job-template:
     name: '{project}-csit-1node-{functionality}-{install}-{stream}'
+    # Keep synchronized with *-csit4-*-carbon please.
     disabled: false
 
     project-type: freestyle
@@ -134,8 +135,8 @@
           branch: '{branch}'
       - integration-distribution-stream:
           stream: '{stream}'
-      - integration-bundleurl:
-          bundleurl: '{bundleurl}'
+      - integration-bundle-url:
+          bundle-url: '{bundle-url}'
       - integration-controller-scope:
           controller-scope: '{scope}'
       - integration-controller-features:
@@ -150,6 +151,8 @@
           branch: 'master'
       - integration-jdk-version:
           jdkversion: '{jre}'
+      - distribution-karaf-version:
+          karaf-version: '{karaf-version}'
 
     scm:
       - integration-gerrit-scm:
@@ -157,6 +160,11 @@
           refspec: '$PATCHREFSPEC'
           branch: 'master'
 
+    triggers:
+      # we need this for not SR projects
+      - integration-csit-trigger:
+          jobs: '{trigger-jobs}'
+
     wrappers:
       - opendaylight-infra-wrappers:
           build-timeout: '{build-timeout}'
@@ -176,9 +184,7 @@
       - integration-get-slave-addresses
       - inject:
           properties-file: 'slave_addresses.txt'
-      - integration-get-bundle-vars
-      - inject:
-          properties-file: 'bundle_vars.txt'
+      - integration-detect-variables
       - integration-deploy-controller-run-test
       - integration-cleanup-tmp
 
@@ -244,8 +250,8 @@
           branch: '{branch}'
       - integration-distribution-stream:
           stream: '{stream}'
-      - integration-bundleurl:
-          bundleurl: '{bundleurl}'
+      - integration-bundle-url:
+          bundle-url: '{bundle-url}'
       - integration-controller-scope:
           controller-scope: '{scope}'
       - integration-controller-features:
@@ -260,6 +266,8 @@
           branch: 'master'
       - integration-jdk-version:
           jdkversion: '{jre}'
+      - distribution-karaf-version:
+          karaf-version: '{karaf-version}'
 
     scm:
       - integration-gerrit-scm:
@@ -286,9 +294,7 @@
       - integration-get-slave-addresses
       - inject:
           properties-file: 'slave_addresses.txt'
-      - integration-get-bundle-vars
-      - inject:
-          properties-file: 'bundle_vars.txt'
+      - integration-detect-variables
       - integration-deploy-controller-run-test
       - integration-cleanup-tmp
 
@@ -466,8 +472,8 @@
           branch: '{verify-branch}'
       - integration-distribution-stream:
           stream: '{verify-stream}'
-      - integration-bundleurl:
-          bundleurl: '{bundleurl}'
+      - integration-bundle-url:
+          bundle-url: '{bundle-url}'
       - integration-controller-scope:
           controller-scope: 'only'
       - integration-controller-features:
@@ -480,6 +486,8 @@
           test-plan: '{project}-{functionality}.txt'
       - integration-jdk-version:
           jdkversion: '{verify-jdkversion}'
+      - distribution-karaf-version:
+          karaf-version: '{verify-karaf-version}'
 
     scm:
       - integration-gerrit-scm:
@@ -513,9 +521,7 @@
       - integration-get-slave-addresses
       - inject:
           properties-file: 'slave_addresses.txt'
-      - integration-get-bundle-vars
-      - inject:
-          properties-file: 'bundle_vars.txt'
+      - integration-detect-variables
       - integration-configure-clustering
       - integration-start-cluster-run-test
       - integration-cleanup-tmp
@@ -553,8 +559,8 @@
           branch: '{branch}'
       - integration-distribution-stream:
           stream: '{stream}'
-      - integration-bundleurl:
-          bundleurl: '{bundleurl}'
+      - integration-bundle-url:
+          bundle-url: '{bundle-url}'
       - integration-controller-scope:
           controller-scope: '{scope}'
       - integration-controller-features:
@@ -569,6 +575,8 @@
           branch: 'master'
       - integration-jdk-version:
           jdkversion: '{jre}'
+      - distribution-karaf-version:
+          karaf-version: '{karaf-version}'
 
     scm:
       - integration-gerrit-scm:
@@ -595,9 +603,7 @@
       - integration-get-slave-addresses
       - inject:
           properties-file: 'slave_addresses.txt'
-      - integration-get-bundle-vars
-      - inject:
-          properties-file: 'bundle_vars.txt'
+      - integration-detect-variables
       - integration-configure-clustering
       - integration-start-cluster-run-test
       - integration-cleanup-tmp
@@ -662,8 +668,8 @@
           branch: '{branch}'
       - integration-distribution-stream:
           stream: '{stream}'
-      - integration-bundleurl:
-          bundleurl: '{bundleurl}'
+      - integration-bundle-url:
+          bundle-url: '{bundle-url}'
       - integration-controller-scope:
           controller-scope: '{scope}'
       - integration-controller-features:
@@ -678,6 +684,8 @@
           branch: 'master'
       - integration-jdk-version:
           jdkversion: '{jre}'
+      - distribution-karaf-version:
+          karaf-version: '{karaf-version}'
 
     scm:
       - integration-gerrit-scm:
@@ -704,9 +712,7 @@
       - integration-get-slave-addresses
       - inject:
           properties-file: 'slave_addresses.txt'
-      - integration-get-bundle-vars
-      - inject:
-          properties-file: 'bundle_vars.txt'
+      - integration-detect-variables
       - integration-configure-clustering
       - integration-start-cluster-run-test
       - integration-cleanup-tmp
@@ -773,8 +779,8 @@
           branch: '{branch}'
       - integration-distribution-stream:
           stream: '{stream}'
-      - integration-bundleurl:
-          bundleurl: '{bundleurl}'
+      - integration-bundle-url:
+          bundle-url: '{bundle-url}'
       - integration-controller-scope:
           controller-scope: '{scope}'
       - integration-controller-features:
@@ -789,6 +795,8 @@
           branch: 'master'
       - integration-jdk-version:
           jdkversion: '{jre}'
+      - distribution-karaf-version:
+          karaf-version: '{karaf-version}'
 
     scm:
       - integration-gerrit-scm:
@@ -815,9 +823,7 @@
       - integration-get-slave-addresses
       - inject:
           properties-file: 'slave_addresses.txt'
-      - integration-get-bundle-vars
-      - inject:
-          properties-file: 'bundle_vars.txt'
+      - integration-detect-variables
       - integration-configure-clustering
       - integration-start-cluster-run-test
       - integration-cleanup-tmp
@@ -997,8 +1003,8 @@
           branch: '{branch}'
       - integration-distribution-stream:
           stream: '{stream}'
-      - integration-bundleurl:
-          bundleurl: '{bundleurl}'
+      - integration-bundle-url:
+          bundle-url: '{bundle-url}'
       - integration-controller-features:
           controller-features: '{install-features}'
       - integration-test-options:
@@ -1009,6 +1015,8 @@
           branch: 'master'
       - integration-jdk-version:
           jdkversion: '{jre}'
+      - distribution-karaf-version:
+          karaf-version: '{karaf-version}'
       - string:
           name: OPENSTACK_BRANCH
           default: '{openstack-branch}'
@@ -1099,6 +1107,14 @@
           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: ODL_SFC_DRIVER
+          default: '{odl-sfc-driver}'
+          description: 'The SFC driver to be used in local.conf - only relevant when using networking-sfc'
+      - string:
+          name: ODL_SNAT_MODE
+          default: '{odl-snat-mode}'
+          description: 'The SNAT mode to be configured - options are conntrack/controller.'
     scm:
       - integration-gerrit-scm:
           basedir: 'test'
@@ -1129,9 +1145,7 @@
       - integration-get-slave-addresses
       - inject:
           properties-file: 'slave_addresses.txt'
-      - integration-get-bundle-vars
-      - inject:
-          properties-file: 'bundle_vars.txt'
+      - integration-detect-variables
       - integration-deploy-controller-run-test
       - integration-deploy-openstack-run-test
       - integration-cleanup-tmp
@@ -1170,8 +1184,8 @@
           branch: '{branch}'
       - integration-distribution-stream:
           stream: '{stream}'
-      - integration-bundleurl:
-          bundleurl: '{bundleurl}'
+      - integration-bundle-url:
+          bundle-url: '{bundle-url}'
       - integration-controller-features:
           controller-features: '{install-features}'
       - integration-test-options:
@@ -1182,6 +1196,8 @@
           branch: 'master'
       - integration-jdk-version:
           jdkversion: '{jre}'
+      - distribution-karaf-version:
+          karaf-version: '{karaf-version}'
       - string:
           name: OPENSTACK_BRANCH
           default: '{openstack-branch}'
@@ -1276,6 +1292,14 @@
           name: NUM_OPENSTACK_SITES
           default: '{num-openstack-sites}'
           description: 'Number of openstack sites'
+      - string:
+          name: ODL_SFC_DRIVER
+          default: '{odl-sfc-driver}'
+          description: 'The SFC driver to be used in local.conf - only relevant when using networking-sfc'
+      - string:
+          name: ODL_SNAT_MODE
+          default: '{odl-snat-mode}'
+          description: 'The SNAT mode to be configured - options are conntrack/controller.'
 
     scm:
       - integration-gerrit-scm:
@@ -1305,9 +1329,7 @@
       - integration-get-slave-addresses
       - inject:
           properties-file: 'slave_addresses.txt'
-      - integration-get-bundle-vars
-      - inject:
-          properties-file: 'bundle_vars.txt'
+      - integration-detect-variables
       - integration-deploy-controller-run-test
       - integration-deploy-openstack-run-test
       - integration-cleanup-tmp
@@ -1349,6 +1371,8 @@
           artifacts: '{archive-artifacts}'
       - integration-distribution-branch:
           branch: '{branch}'
+      - distribution-karaf-version:
+          karaf-version: 'karaf3'
       - integration-distribution-git-url:
           git-url: '{git-url}'
       - string:
@@ -1423,13 +1447,14 @@
           settings-type: cfp
           global-settings: odl-global-settings
           global-settings-type: cfp
-      - distribution-check-deploy-distribution:
+      - integration-upload-distribution:
           dist-pom: distribution/pom.xml
       - trigger-builds:
           - project: '{csit-list}'
             block: true
-            predefined-parameters:
-              BUNDLEURL=$BUNDLE_URL
+            predefined-parameters: |
+              BUNDLE_URL=$BUNDLE_URL
+              KARAF_VERSION=$KARAF_VERSION
 
     publishers:
       - email-notification: