X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fintegration%2Fintegration-templates.yaml;h=f96a41b93c1a9bf6e66840b912e271265bd009bd;hb=dfe54cf86451de53221319dd0a10c3ec89c525c0;hp=b71eea9d5514b5e34a8d7c887c5819717d26fa86;hpb=e11aa9b22421f328723f963d00c2c263d82d22e0;p=releng%2Fbuilder.git diff --git a/jjb/integration/integration-templates.yaml b/jjb/integration/integration-templates.yaml index b71eea9d5..f96a41b93 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}/**' @@ -109,8 +116,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-1node-{functionality}-{install}-{stream}' @@ -118,7 +125,7 @@ disabled: false project-type: freestyle - node: centos7-robot-2c-2g + node: centos7-robot-2c-8g properties: - opendaylight-infra-properties: @@ -147,12 +154,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: @@ -160,6 +171,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}' @@ -220,15 +236,15 @@ 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}' disabled: false project-type: freestyle - node: centos7-robot-2c-2g + node: centos7-robot-2c-8g properties: - opendaylight-infra-properties: @@ -257,12 +273,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: @@ -442,15 +462,15 @@ 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}' disabled: false project-type: freestyle - node: centos7-robot-2c-2g + node: centos7-robot-2c-8g properties: - opendaylight-infra-properties: @@ -479,10 +499,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: @@ -496,7 +520,7 @@ triggers: - integration-trigger-patch-submitted: - server: '{server-name}' + gerrit-server-name: '{gerrit-server-name}' project: 'integration/test' branch: 'master' files: 'csit/suites/{project}/**' @@ -529,15 +553,15 @@ 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}' disabled: false project-type: freestyle - node: centos7-robot-2c-2g + node: centos7-robot-2c-8g properties: - opendaylight-infra-properties: @@ -566,12 +590,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: @@ -638,15 +666,15 @@ 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}' disabled: false project-type: freestyle - node: centos7-robot-2c-2g + node: centos7-robot-2c-8g properties: - opendaylight-infra-properties: @@ -681,6 +709,8 @@ jdkversion: '{jre}' - distribution-karaf-version: karaf-version: '{karaf-version}' + - integration-use-features-boot: + use-features-boot: 'True' scm: - integration-gerrit-scm: @@ -749,15 +779,15 @@ 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}' disabled: false project-type: freestyle - node: centos7-robot-2c-2g + node: centos7-robot-2c-8g properties: - opendaylight-infra-properties: @@ -786,12 +816,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: @@ -972,15 +1006,15 @@ 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}' disabled: false project-type: freestyle - node: centos7-robot-2c-2g + node: centos7-robot-2c-8g concurrent: true properties: @@ -1002,20 +1036,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}' @@ -1064,7 +1108,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}' @@ -1124,16 +1172,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' @@ -1153,15 +1205,15 @@ 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}' disabled: false project-type: freestyle - node: centos7-robot-2c-2g + node: centos7-robot-2c-8g concurrent: true properties: @@ -1183,20 +1235,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}' @@ -1246,6 +1308,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}' @@ -1310,7 +1376,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}' @@ -1318,6 +1384,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' @@ -1337,8 +1406,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 @@ -1349,7 +1418,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}' @@ -1367,7 +1436,7 @@ - integration-distribution-branch: branch: '{branch}' - distribution-karaf-version: - karaf-version: 'karaf3' + karaf-version: '{karaf-version}' - integration-distribution-git-url: git-url: '{git-url}' - string: @@ -1391,7 +1460,7 @@ triggers: - gerrit: - server-name: '{server-name}' + server-name: '{gerrit-server-name}' trigger-on: - comment-added-contains-event: comment-contains-value: 'test-{project}-all' @@ -1422,11 +1491,12 @@ -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 settings-type: cfp - global-settings: odl-global-settings + global-settings: global-settings global-settings-type: cfp - maven-target: maven-version: mvn33 @@ -1435,12 +1505,12 @@ 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 settings-type: cfp - global-settings: odl-global-settings + global-settings: global-settings global-settings-type: cfp - integration-upload-distribution: dist-pom: distribution/pom.xml