X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fintegration%2Fintegration-templates.yaml;h=1910b02f425449539d886ca547ae7a9a9869c290;hb=4ef2a863969dc4eda8c16975c8d11f7af0bdd565;hp=7dae0a2d8ed70064705dadbbb431bef4224a22c2;hpb=bd725532d0ee35b70923351b6812fdfe872f4655;p=releng%2Fbuilder.git diff --git a/jjb/integration/integration-templates.yaml b/jjb/integration/integration-templates.yaml index 7dae0a2d8..1910b02f4 100644 --- a/jjb/integration/integration-templates.yaml +++ b/jjb/integration/integration-templates.yaml @@ -2,12 +2,16 @@ # Job templates in this file (please update with every new template): # FIXME: Update # -# {project}-csit-verify-1node-{functionality} # {project}-csit-1node-{functionality}-{install}-{stream} # {project}-csit-1node-periodic-{functionality}-{install}-{stream} -# {project}-csit-verify-3node-{functionality} +# {project}-csit-3node-docker-{functionality}-{install}-{stream} # {project}-csit-3node-{functionality}-{install}-{stream} # {project}-csit-3node-periodic-{functionality}-{install}-{stream} +# {project}-csit-hwvtep-{topology}-openstack-{openstack}-{functionality}-{stream} +# {project}-csit-{topology}-openstack-{openstack}-{functionality}-{stream} +# {project}-csit-verify-1node-{functionality} +# {project}-csit-verify-3node-{functionality} +# {project}-patch-test-{feature}-{stream} # # Parameters: # FIXME: Distinguish variables, macros and arguments, then update. @@ -22,16 +26,18 @@ # integration-stream-test-plan: stream specific robot test plan ($STREAMTESTPLAN) # integration-test-plan: fallback robot test plan ($TESTPLAN) # integration-patch-refspec: test branch ($PATCHREFSPEC) +# integration-use-features-boot: bool to toggle use of featuresBoot ($USEFEATURESBOOT) # New templates - job-template: - name: '{project}-csit-verify-1node-{functionality}' + name: '{prefix}{project}-csit-verify-1node-{functionality}' + id: inttest-csit-verify-1node disabled: false project-type: freestyle - node: centos7-robot-2c-2g + node: centos7-robot-2c-8g properties: - opendaylight-infra-properties: @@ -64,7 +70,8 @@ jdkversion: '{verify-jdkversion}' - distribution-karaf-version: karaf-version: '{verify-karaf-version}' - + - integration-use-features-boot: + use-features-boot: 'True' scm: - integration-gerrit-scm: basedir: 'test' @@ -77,7 +84,7 @@ triggers: - integration-trigger-patch-submitted: - server: '{server-name}' + gerrit-server-name: '{gerrit-server-name}' project: 'integration/test' branch: 'master' files: 'csit/suites/{project}/**' @@ -113,12 +120,13 @@ - lf-infra-publish - job-template: - name: '{project}-csit-1node-{functionality}-{install}-{stream}' + name: '{prefix}{project}-csit-1node-{functionality}-{install}-{stream}' + id: inttest-csit-1node # Keep synchronized with *-csit4-*-carbon please. disabled: false project-type: freestyle - node: centos7-robot-2c-2g + node: centos7-robot-2c-8g properties: - opendaylight-infra-properties: @@ -147,12 +155,16 @@ stream-test-plan: '{project}-{functionality}-{stream}.txt' - integration-test-plan: test-plan: '{project}-{functionality}.txt' + - integration-test-suites: + test-suites: '{test-suites}' - integration-patch-refspec: branch: 'master' - integration-jdk-version: jdkversion: '{jre}' - distribution-karaf-version: karaf-version: '{karaf-version}' + - integration-use-features-boot: + use-features-boot: 'True' scm: - integration-gerrit-scm: @@ -233,7 +245,7 @@ disabled: false project-type: freestyle - node: centos7-robot-2c-2g + node: centos7-robot-2c-8g properties: - opendaylight-infra-properties: @@ -262,12 +274,16 @@ stream-test-plan: '{project}-{functionality}-{stream}.txt' - integration-test-plan: test-plan: '{project}-{functionality}.txt' + - integration-test-suites: + test-suites: '{test-suites}' - integration-patch-refspec: branch: 'master' - integration-jdk-version: jdkversion: '{jre}' - distribution-karaf-version: karaf-version: '{karaf-version}' + - integration-use-features-boot: + use-features-boot: 'True' scm: - integration-gerrit-scm: @@ -455,7 +471,7 @@ disabled: false project-type: freestyle - node: centos7-robot-2c-2g + node: centos7-robot-2c-8g properties: - opendaylight-infra-properties: @@ -484,10 +500,14 @@ stream-test-plan: '{project}-{functionality}-{verify-stream}.txt' - integration-test-plan: test-plan: '{project}-{functionality}.txt' + - integration-test-suites: + test-suites: '{test-suites}' - integration-jdk-version: jdkversion: '{verify-jdkversion}' - distribution-karaf-version: karaf-version: '{verify-karaf-version}' + - integration-use-features-boot: + use-features-boot: 'True' scm: - integration-gerrit-scm: @@ -501,7 +521,7 @@ triggers: - integration-trigger-patch-submitted: - server: '{server-name}' + gerrit-server-name: '{gerrit-server-name}' project: 'integration/test' branch: 'master' files: 'csit/suites/{project}/**' @@ -542,7 +562,7 @@ disabled: false project-type: freestyle - node: centos7-robot-2c-2g + node: centos7-robot-2c-8g properties: - opendaylight-infra-properties: @@ -571,12 +591,16 @@ stream-test-plan: '{project}-{functionality}-{stream}.txt' - integration-test-plan: test-plan: '{project}-{functionality}.txt' + - integration-test-suites: + test-suites: '{test-suites}' - integration-patch-refspec: branch: 'master' - integration-jdk-version: jdkversion: '{jre}' - distribution-karaf-version: karaf-version: '{karaf-version}' + - integration-use-features-boot: + use-features-boot: 'True' scm: - integration-gerrit-scm: @@ -651,7 +675,7 @@ disabled: false project-type: freestyle - node: centos7-robot-2c-2g + node: centos7-robot-2c-8g properties: - opendaylight-infra-properties: @@ -686,6 +710,8 @@ jdkversion: '{jre}' - distribution-karaf-version: karaf-version: '{karaf-version}' + - integration-use-features-boot: + use-features-boot: 'True' scm: - integration-gerrit-scm: @@ -762,7 +788,7 @@ disabled: false project-type: freestyle - node: centos7-robot-2c-2g + node: centos7-robot-2c-8g properties: - opendaylight-infra-properties: @@ -791,12 +817,16 @@ stream-test-plan: '{project}-{functionality}-{stream}.txt' - integration-test-plan: test-plan: '{project}-{functionality}.txt' + - integration-test-suites: + test-suites: '{test-suites}' - integration-patch-refspec: branch: 'master' - integration-jdk-version: jdkversion: '{jre}' - distribution-karaf-version: karaf-version: '{karaf-version}' + - integration-use-features-boot: + use-features-boot: 'True' scm: - integration-gerrit-scm: @@ -985,7 +1015,7 @@ disabled: false project-type: freestyle - node: centos7-robot-2c-2g + node: centos7-robot-2c-8g concurrent: true properties: @@ -1007,20 +1037,30 @@ 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}' + - integration-use-features-boot: + use-features-boot: '{use-features-boot}' - 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}' @@ -1069,7 +1109,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}' @@ -1129,16 +1173,20 @@ - 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' @@ -1166,7 +1214,7 @@ disabled: false project-type: freestyle - node: centos7-robot-2c-2g + node: centos7-robot-2c-8g concurrent: true properties: @@ -1188,20 +1236,30 @@ 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}' + - integration-use-features-boot: + use-features-boot: '{use-features-boot}' - 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}' @@ -1251,6 +1309,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}' @@ -1315,7 +1377,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}' @@ -1323,6 +1385,9 @@ 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' @@ -1354,7 +1419,7 @@ name: '{project}-patch-test-{feature}-{stream}' project-type: freestyle - node: centos7-java-builder-2c-8g + node: centos7-builder-2c-8g concurrent: true jdk: '{jdk}' @@ -1396,7 +1461,7 @@ triggers: - gerrit: - server-name: '{server-name}' + server-name: '{gerrit-server-name}' trigger-on: - comment-added-contains-event: comment-contains-value: 'test-{project}-all' @@ -1427,6 +1492,7 @@ -DgenerateReports=false -Dstream={stream} {opendaylight-infra-mvn-opts} + # TODO: {opendaylight-infra-parallel-mvn-opts}? java-opts: - '-Xmx4096m -XX:MaxPermSize=1024m -Dmaven.compile.fork=true' settings: integration-settings @@ -1440,7 +1506,7 @@ clean install dependency:tree -Pq -Dgitid.skip=false - {opendaylight-infra-mvn-opts} + {opendaylight-infra-parallel-mvn-opts} java-opts: - '-Xmx1024m -XX:MaxPermSize=256m -Dmaven.compile.fork=true' settings: integration-settings