X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fintegration%2Fintegration-templates.yaml;h=aa8d9587cd4a03b02c87299f08dda95bf6873c30;hb=d5bb0c9394923f644533410182566043e95d6181;hp=bc95b5d6454e733dcd35e10b3563bde621325c33;hpb=258253ac6a9255b39bc4b995011f49a4c5dd7e0d;p=releng%2Fbuilder.git diff --git a/jjb/integration/integration-templates.yaml b/jjb/integration/integration-templates.yaml index bc95b5d64..aa8d9587c 100644 --- 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 @@ -109,11 +109,12 @@ email-recipients: '{email-recipients}' email-prefix: '[{project}]' - integration-csit-archive-build - - opendaylight-infra-shiplogs: - maven-version: 'mvn33' + - integration-csit-run-postscript + - lf-infra-publish - 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 @@ -219,8 +225,8 @@ display-table: true format: csv - integration-csit-archive-build - - opendaylight-infra-shiplogs: - maven-version: 'mvn33' + - integration-csit-run-postscript + - lf-infra-publish - job-template: name: '{project}-csit-1node-periodic-{functionality}-{install}-{stream}' @@ -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 @@ -441,8 +447,8 @@ exclude: '{10-exclude-value}' format: csv - integration-csit-archive-build - - opendaylight-infra-shiplogs: - maven-version: 'mvn33' + - integration-csit-run-postscript + - lf-infra-publish - job-template: name: '{project}-csit-verify-3node-{functionality}' @@ -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 @@ -528,8 +534,8 @@ email-recipients: '{email-recipients}' email-prefix: '[{project}]' - integration-csit-archive-build - - opendaylight-infra-shiplogs: - maven-version: 'mvn33' + - integration-csit-run-postscript + - lf-infra-publish - job-template: name: '{project}-csit-3node-{functionality}-{install}-{stream}' @@ -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 @@ -637,8 +643,8 @@ display-table: true format: csv - integration-csit-archive-build - - opendaylight-infra-shiplogs: - maven-version: 'mvn33' + - integration-csit-run-postscript + - lf-infra-publish - job-template: name: '{project}-csit-3node-docker-{functionality}-{install}-{stream}' @@ -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 @@ -748,8 +754,8 @@ display-table: true format: csv - integration-csit-archive-build - - opendaylight-infra-shiplogs: - maven-version: 'mvn33' + - integration-csit-run-postscript + - lf-infra-publish - job-template: name: '{project}-csit-3node-periodic-{functionality}-{install}-{stream}' @@ -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 @@ -971,8 +977,8 @@ exclude: '{10-exclude-value}' format: csv - integration-csit-archive-build - - opendaylight-infra-shiplogs: - maven-version: 'mvn33' + - integration-csit-run-postscript + - lf-infra-publish - job-template: name: '{project}-csit-hwvtep-{topology}-openstack-{openstack}-{functionality}-{stream}' @@ -997,22 +1003,32 @@ 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-controller-debug-map: + controller-debug-map: '{debug-map}' - integration-test-options: test-options: '{robot-options}' - integration-test-plan: test-plan: '{testplan}' + - integration-test-suites: + test-suites: '{test-suites}' - integration-patch-refspec: branch: 'master' - integration-jdk-version: jdkversion: '{jre}' + - distribution-karaf-version: + karaf-version: '{karaf-version}' - string: name: OPENSTACK_BRANCH default: '{openstack-branch}' description: 'Openstack version to use with devstack' + - string: + name: DEVSTACK_HASH + default: '{devstack-hash}' + description: 'devstack hash to checkout' - string: name: ODL_ML2_DRIVER_REPO default: '{odl-ml2-driver-repo}' @@ -1061,7 +1077,11 @@ - string: name: ENABLE_OS_SERVICES default: '{enable-openstack-services}' - description: 'comma seperated list of services to enable' + description: 'comma separated list of services to enable on controller nodes' + - string: + name: ENABLE_OS_COMPUTE_SERVICES + default: '{enable-openstack-compute-services}' + description: 'comma separated list of services to enable on compute nodes' - string: name: ENABLE_OS_PLUGINS default: '{enable-openstack-plugins}' @@ -1121,25 +1141,27 @@ - timed: '{schedule}' builders: - - integration-infra-stack-3-type: + - integration-infra-stack-4-type: + stack-template: '{stack-template}' vm_0_count: '{odl_system_count}' 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}' - vm_2_count: '{tools_system_count}' - vm_2_flavor: '{tools_system_flavor}' - vm_2_image: '{tools_system_image}' + vm_2_count: '{openstack_system2_count}' + vm_2_flavor: '{openstack_system2_flavor}' + vm_2_image: '{openstack_system2_image}' + vm_3_count: '{tools_system_count}' + vm_3_flavor: '{tools_system_flavor}' + vm_3_image: '{tools_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-detect-variables - integration-deploy-controller-run-test - integration-deploy-openstack-run-test - integration-cleanup-tmp @@ -1152,8 +1174,8 @@ email-recipients: '{email-recipients}' email-prefix: '[{project}]' - integration-csit-archive-build - - opendaylight-infra-shiplogs: - maven-version: 'mvn33' + - integration-csit-run-postscript + - lf-infra-publish - job-template: name: '{project}-csit-{topology}-openstack-{openstack}-{functionality}-{stream}' @@ -1178,22 +1200,32 @@ 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-controller-debug-map: + controller-debug-map: '{debug-map}' - integration-test-options: test-options: '{robot-options}' - integration-test-plan: test-plan: '{testplan}' + - integration-test-suites: + test-suites: '{test-suites}' - integration-patch-refspec: branch: 'master' - integration-jdk-version: jdkversion: '{jre}' + - distribution-karaf-version: + karaf-version: '{karaf-version}' - string: name: OPENSTACK_BRANCH default: '{openstack-branch}' description: 'Openstack version to use with devstack' + - string: + name: DEVSTACK_HASH + default: '{devstack-hash}' + description: 'devstack hash to checkout' - string: name: ODL_ML2_DRIVER_REPO default: '{odl-ml2-driver-repo}' @@ -1243,6 +1275,10 @@ name: ENABLE_OS_SERVICES default: '{enable-openstack-services}' description: 'comma seperated list of services to enable' + - string: + name: ENABLE_OS_COMPUTE_SERVICES + default: '{enable-openstack-compute-services}' + description: 'comma separated list of services to enable on compute nodes' - string: name: ENABLE_OS_PLUGINS default: '{enable-openstack-plugins}' @@ -1307,7 +1343,7 @@ - timed: '{schedule}' builders: - - integration-infra-stack: + - integration-infra-stack-3-type: stack-template: '{stack-template}' vm_0_count: '{odl_system_count}' vm_0_flavor: '{odl_system_flavor}' @@ -1315,15 +1351,16 @@ vm_1_count: '{openstack_system_count}' vm_1_flavor: '{openstack_system_flavor}' vm_1_image: '{openstack_system_image}' + vm_2_count: '{openstack_system2_count}' + vm_2_flavor: '{openstack_system2_flavor}' + vm_2_image: '{openstack_system2_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-detect-variables - integration-deploy-controller-run-test - integration-deploy-openstack-run-test - integration-cleanup-tmp @@ -1336,8 +1373,8 @@ email-recipients: '{email-recipients}' email-prefix: '[{project}]' - integration-csit-archive-build - - opendaylight-infra-shiplogs: - maven-version: 'mvn33' + - integration-csit-run-postscript + - lf-infra-publish # Template: {project}-patch-test-{stream} # Goal: Build a patch and run project specific system test on a distribution containing the change @@ -1365,6 +1402,8 @@ artifacts: '{archive-artifacts}' - integration-distribution-branch: branch: '{branch}' + - distribution-karaf-version: + karaf-version: '{karaf-version}' - integration-distribution-git-url: git-url: '{git-url}' - string: @@ -1423,7 +1462,7 @@ - '-Xmx4096m -XX:MaxPermSize=1024m -Dmaven.compile.fork=true' settings: integration-settings settings-type: cfp - global-settings: odl-global-settings + global-settings: global-settings global-settings-type: cfp - maven-target: maven-version: mvn33 @@ -1437,15 +1476,16 @@ - '-Xmx1024m -XX:MaxPermSize=256m -Dmaven.compile.fork=true' settings: integration-settings settings-type: cfp - global-settings: odl-global-settings + global-settings: 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: