X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fintegration%2Fintegration-test-jobs.yaml;h=9317ee400eabe6f0444012fe552dbf54307f19ea;hb=d7c3880fe4578a70a16e2237bb8be8a1742c0291;hp=cb0b81e1eb0e6e990781bc0c8ae008f4707f50ba;hpb=3d71eb64fefb6074ae485f9e35eeacded7a868c3;p=releng%2Fbuilder.git diff --git a/jjb/integration/integration-test-jobs.yaml b/jjb/integration/integration-test-jobs.yaml index cb0b81e1e..9317ee400 100644 --- a/jjb/integration/integration-test-jobs.yaml +++ b/jjb/integration/integration-test-jobs.yaml @@ -5,7 +5,6 @@ project-name: integration-test test-branch: master jobs: - - '{project-name}-verify-tox-master' - 'integration-distribution-test-{stream}' - 'integration-sanity-test-{stream}' - 'integration-patch-test-{stream}' @@ -13,40 +12,42 @@ - 'integration-distribution-weekly-test-trigger-{stream}' - 'integration-distribution-high-frequency-test-trigger-{stream}' - 'integration-update-csit-tests-{stream}' + - gerrit-tox-verify: + branch: master + stream: master # CSIT Lists in releng-defaults.yaml stream: - oxygen: branch: 'master' - jdk: 'openjdk8' - csit-blacklist: longevity gate sanity capwap centinel coe didm iotdm jsonrpc lacp netide tsdr + csit-blacklist: longevity gate sanity capwap centinel coe didm iotdm jsonrpc lacp netide csit-list: !include: csit-jobs-oxygen.lst csit-sanity-list: '{csit-sanity-list-oxygen}' csit-weekly-list: '{csit-weekly-list-oxygen}' csit-high-frequency-list: '{csit-high-frequency-list-oxygen}' + mvn-version: 'mvn33' - nitrogen: branch: 'stable/nitrogen' - jre: 'openjdk8' csit-blacklist: longevity gate sanity capwap centinel coe didm iotdm jsonrpc lacp netide tsdr csit-list: !include: csit-jobs-nitrogen.lst csit-sanity-list: '{csit-sanity-list-nitrogen}' csit-weekly-list: '{csit-weekly-list-nitrogen}' csit-high-frequency-list: '{csit-high-frequency-list-nitrogen}' + mvn-version: 'mvn33' - carbon: branch: 'stable/carbon' karaf-version: karaf3 - jdk: 'openjdk8' - jre: 'openjdk8' csit-blacklist: longevity gate sanity capwap centinel coe jsonrpc csit-list: !include: csit-jobs-carbon.lst csit-sanity-list: '{csit-sanity-list-carbon}' csit-weekly-list: '{csit-weekly-list-carbon}' csit-high-frequency-list: '{csit-high-frequency-list-carbon}' + mvn-version: 'mvn33' # tools system image - tools_system_image: Ubuntu 16.04 - mininet-ovs-25 - 20170808-0158 + tools_system_image: ZZCI - Ubuntu 16.04 - mininet-ovs-25 - 20171208-1847 # Template: integration-distribution-test-{stream} # Goal: Verify a distribution through all system test available @@ -56,7 +57,7 @@ name: 'integration-distribution-test-{stream}' project-type: freestyle - node: centos7-robot-2c-2g + node: centos7-robot-2c-8g properties: - opendaylight-infra-properties: @@ -91,7 +92,7 @@ name: 'integration-sanity-test-{stream}' project-type: freestyle - node: centos7-robot-2c-2g + node: centos7-robot-2c-8g properties: - opendaylight-infra-properties: @@ -125,7 +126,7 @@ name: 'integration-patch-test-{stream}' project-type: freestyle - node: centos7-java-builder-2c-8g + node: centos7-builder-2c-8g properties: - opendaylight-infra-properties: @@ -161,7 +162,7 @@ triggers: - gerrit: - server-name: '{server-name}' + server-name: '{gerrit-server-name}' trigger-on: - comment-added-contains-event: comment-contains-value: 'test-integration' @@ -229,30 +230,12 @@ - job-template: name: 'integration-multipatch-test-{stream}' # Goal: Build one or more patches and run all available system test on a distribution containing the change. - # Operation: This job template checks out and builds each patch provided in job parameters, creates a distribution - # containing these patches, and triggers the distribution test job which includes most (if not all) available - # CSIT jobs - # TODO: Move the following to appropriate readthedocs document. - # Recommended Sandbox usage: - # 0. Create this job and a CSIT job you want to run on the new .zip in Sandbox (disable timed triggers). - # 1. Copy the csit job name to clipboard. - # 2. Navigate to Sandbox page of this job. - # 3. Click "Configure". - # 4. Locate "Trigger/call builds on other projects" (under "Post Steps" tab). - # 5. Delete the long value of "Projects to build" field and paste the job name from clipboard (ctrl+a, ctrl+v). - # 6. Click "Save" button. - # 7. Click "Build with Parameters". - # yamllint disable-line rule:line-length - # 8. Start the job with your parameters, see https://wiki.opendaylight.org/view/Integration/Test/Running_System_Tests#Running_System_Tests_Using_Custom_Distribution_Built_From_Multiple_Patches - # 9. The multipatch job waits for the csit job to finish, so abort csit if you see something went wrong. - # 10. Navigate to Sandbox page of the csit job, click the run triggered from multipatch. - # 11. Click Parameters and copy the long value of BUNDLE_URL field to clipboard. - # 12. Run the same csit job woth different patchset or test options, or other csit jobs, with this BUNDLE_URL value - # so you do not have to wait for multipatch build. Repeat step 12. - # 13. Currently, the .zip lasts 24 hours (?) so you may need to jump to step 2 (or 0) after some time. + # Operation: This job template checks out and builds in order each patch provided in job parameters, finally + # it creates a distribution containing all patches and triggers the distribution test job which includes most + # (if not all) available CSIT jobs. project-type: freestyle - node: centos7-java-builder-8c-8g + node: centos7-builder-4c-4g jdk: '{jdk}' properties: @@ -266,6 +249,8 @@ run-test: 'false' - integration-distribution-branch: branch: '{branch}' + - integration-distribution-stream: + stream: '{stream}' - distribution-karaf-version: karaf-version: '{karaf-version}' - opendaylight-infra-parameters: @@ -281,29 +266,27 @@ - opendaylight-infra-wrappers: build-timeout: '1200' + triggers: + - gerrit: + server-name: '{gerrit-server-name}' + trigger-on: + - comment-added-contains-event: + comment-contains-value: 'multipatch-build:' + projects: + - project-compare-type: ANT + project-pattern: '**' + branches: + - branch-compare-type: ANT + branch-pattern: '**/{branch}' + builders: - wipe-org-opendaylight-repo - - integration-multipatch-builder + - lf-maven-install: + mvn-version: '{mvn-version}' - provide-maven-settings: global-settings-file: 'global-settings' - settings-file: 'yangtools-settings' - - maven-target: - maven-version: mvn33 - pom: patch_tester/pom.xml - # TODO: Make Maven options configurable. Currently tests are not skipped, everything else is. - goals: | - clean install dependency:tree -DoutputFile=dependency_tree.txt - -Pq - -Dstream={stream} - -Dsft.heap.max=4g - {opendaylight-infra-mvn-opts} - # TODO: {opendaylight-infra-parallel-mvn-opts}? - java-opts: - - '-Xmx3072m -Dmaven.compile.fork=true' - settings: integration-settings - settings-type: cfp - global-settings: global-settings - global-settings-type: cfp + settings-file: 'integration-distribution-settings' + - integration-multipatch-builder - integration-upload-distribution: dist-pom: patch_tester/distribution/pom.xml - conditional-step: @@ -327,7 +310,7 @@ name: 'integration-distribution-weekly-test-trigger-{stream}' project-type: freestyle - node: centos7-robot-2c-2g + node: centos7-robot-2c-8g properties: - opendaylight-infra-properties: @@ -359,7 +342,7 @@ name: 'integration-distribution-high-frequency-test-trigger-{stream}' project-type: freestyle - node: centos7-robot-2c-2g + node: centos7-robot-2c-8g properties: - opendaylight-infra-properties: @@ -407,7 +390,7 @@ ##################### project-type: freestyle - node: centos7-java-builder-2c-4g + node: centos7-builder-2c-8g properties: - lf-infra-properties: