X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fintegration%2Fintegration-templates.yaml;h=9399df8c0310523802adb92068a71f729171a061;hb=a9e6d23e97e172ce6844bca1196d72bb574caa89;hp=cdf9d9af9dbc7087ac02c36dbe4faffc31988638;hpb=93ca49e6a2382eb5412813485f1f6da1c27d87f0;p=releng%2Fbuilder.git diff --git a/jjb/integration/integration-templates.yaml b/jjb/integration/integration-templates.yaml index cdf9d9af9..9399df8c0 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: @@ -1021,6 +1051,8 @@ 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}' @@ -1077,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}' @@ -1178,7 +1214,7 @@ disabled: false project-type: freestyle - node: centos7-robot-2c-2g + node: centos7-robot-2c-8g concurrent: true properties: @@ -1214,6 +1250,8 @@ 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}' @@ -1271,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}' @@ -1374,10 +1416,11 @@ # triggers the project system test defined in {csit-list} when gerrit receives test-{project} keyword - job-template: - name: '{project}-patch-test-{feature}-{stream}' + name: '{prefix}{project}-patch-test-{feature}-{stream}' + id: inttest-patch-test project-type: freestyle - node: centos7-java-builder-2c-8g + node: centos7-builder-2c-8g concurrent: true jdk: '{jdk}' @@ -1419,7 +1462,7 @@ triggers: - gerrit: - server-name: '{server-name}' + server-name: '{gerrit-server-name}' trigger-on: - comment-added-contains-event: comment-contains-value: 'test-{project}-all' @@ -1450,6 +1493,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 @@ -1463,7 +1507,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