X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fintegration%2Fintegration-templates.yaml;h=f96a41b93c1a9bf6e66840b912e271265bd009bd;hb=dfe54cf86451de53221319dd0a10c3ec89c525c0;hp=741c47c35b09cc9f4e5552a160e7005ff4cc8ce4;hpb=bdbb198f4adc0536a1c7e886d24f1f85d701c4bb;p=releng%2Fbuilder.git diff --git a/jjb/integration/integration-templates.yaml b/jjb/integration/integration-templates.yaml index 741c47c35..f96a41b93 100644 --- a/jjb/integration/integration-templates.yaml +++ b/jjb/integration/integration-templates.yaml @@ -32,7 +32,8 @@ # 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 @@ -153,6 +154,8 @@ 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: @@ -270,6 +273,8 @@ 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: @@ -494,6 +499,8 @@ 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: @@ -583,6 +590,8 @@ 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: @@ -807,6 +816,8 @@ 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: @@ -1407,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}'