X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=jjb%2Fcsit%2Fcsit.yaml;h=83ca7c0c3809bc9c7eca6dea77f0051baef54ca1;hb=1953da748207d22ea2262716d24e9983243a1d83;hp=c09ffb0ffe9df5a6e7a45cc7167544a81d8cfbd4;hpb=75e7bb916db2173aa47b8d71536ca98a692732e0;p=ci-management.git diff --git a/jjb/csit/csit.yaml b/jjb/csit/csit.yaml index c09ffb0ff..83ca7c0c3 100644 --- a/jjb/csit/csit.yaml +++ b/jjb/csit/csit.yaml @@ -1,4 +1,4 @@ -# Copyright (c) 2018 Cisco and/or its affiliates. +# Copyright (c) 2019 Cisco and/or its affiliates. # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at: @@ -35,6 +35,7 @@ - 'csit-docs-merge-{stream_timed}' - 'csit-docs-verify-{stream}' - 'csit-report-merge-{stream}' + - 'csit-report-merge-1901_1' - 'csit-trending-daily-master' - 'csit-dpdk-perf-verify-{stream}-{topo}-{arch}' - 'csit-dpdk-perf-mrr-weekly-master' @@ -58,35 +59,36 @@ project: 'csit' branch: 'master' branch-id: 'oper' + docs-executor: 'ubuntu1804-us' + perf-executor: 'ubuntu1804-us' build-artifact-num-to-keep: 10 - type: - - all stream_timed: - master: branch: 'master' branch-id: 'oper' - - '1901': - branch: 'rls1901' - branch-id: 'oper-rls1901' + docs-executor: 'ubuntu1804-us' + perf-executor: 'ubuntu1804-us' stream: - master: branch: 'master' branch-id: 'oper' - - '1801': - branch: 'rls1801' - branch-id: 'oper-rls1801' - - '1804': - branch: 'rls1804' - branch-id: 'oper-rls1804' + docs-executor: 'ubuntu1804-us' + perf-executor: 'ubuntu1804-us' - '1807': branch: 'rls1807' branch-id: 'oper-rls1807' + docs-executor: 'ubuntu1604-basebuild-4c-4g' + perf-executor: 'ubuntu1604-basebuild-8c-32g' - '1810': branch: 'rls1810' branch-id: 'oper-rls1810' + docs-executor: 'ubuntu1604-basebuild-4c-4g' + perf-executor: 'ubuntu1604-basebuild-8c-32g' - '1901': branch: 'rls1901' branch-id: 'oper-rls1901' + docs-executor: 'ubuntu1604-basebuild-4c-4g' + perf-executor: 'ubuntu1604-basebuild-8c-32g' - project: name: csit-view @@ -184,7 +186,7 @@ project-type: freestyle - node: 'ubuntu1604-basebuild-4c-4g' + node: '{perf-executor}' concurrent: true build-discarder: @@ -289,6 +291,10 @@ # yamllint enable rule:line-length project-type: freestyle + # As the nomad executors are running docker containers we cannot run + # ligato-perf job due to dependency on using docker inside. + # TODO: Find the mechanics how to offload job logic from compiling docker + # image so we can move this executor to ubuntu1804-us node: 'ubuntu1804-basebuild-4c-4g' concurrent: true @@ -465,14 +471,11 @@ maven-version: 'mvn33-new' - job-template: - name: 'csit-vpp-verify-{stream_timed}-centos7-nightly' - # yamllint disable-line rule:line-length - description: 'Purpose of this job is to validate latest centos7 vpp build from corresponding branch stored in nexus against verified CSIT codebase of corresponding branch.' - # yamllint enable rule:line-length + name: 'csit-docs-verify-{stream}' project-type: freestyle - node: centos7-basebuild-4c-4g' - concurrent: false + node: '{docs-executor}' + concurrent: true build-discarder: daysToKeep: '{build-days-to-keep}' @@ -485,47 +488,54 @@ project: '{project}' - gerrit-parameter: branch: '{branch}' + - maven-exec: + maven-version: 'mvn33-new' scm: - - git-scm: + - gerrit-trigger-scm: credentials-id: 'jenkins-gerrit-credentials' - branch: '{branch}' + refspec: '$GERRIT_REFSPEC' + choosing-strategy: 'gerrit' wrappers: - - fdio-infra-wrappers: + - fdio-infra-wrappers-non-activity-timeout: build-timeout: '{build-timeout}' triggers: - - timed: 'H H(3-4) * * *' - - - gerrit-trigger-manually-triggered: - comment-trigger-value: 'vpp-verify-func-centos7' + - gerrit-trigger-patch-submitted: name: '{project}' branch: '{branch}' builders: - - shell: 'echo "BRANCH_ID={branch-id}" > $WORKSPACE/variables.prop' - - inject: - properties-file: variables.prop + - maven-target: + maven-version: 'mvn33-new' + goals: '--version' + settings: 'csit-settings' + settings-type: cfp + global-settings: 'global-settings' + global-settings-type: cfp + - provide-maven-settings: + settings-file: 'csit-settings' + global-settings-file: 'global-settings' - shell: - !include-raw-escape: jjb/csit/include-raw-csit-vpp-functional-virl.sh + !include-raw-escape: include-raw-csit-docs.sh publishers: - - archive-artifacts: - artifacts: 'csit/archive/*.*' - latest-only: false - - - robot-report: - output-path: 'csit/archive' + - archive: + artifacts: 'resources/tools/doc_gen/csit.docs.tar.gz' + allow-empty: 'true' + fingerprint: false + only-if-success: true + default-excludes: false - fdio-infra-shiplogs: maven-version: 'mvn33-new' - job-template: - name: 'csit-docs-verify-{stream}' + name: 'csit-docs-merge-{stream_timed}' project-type: freestyle - node: 'ubuntu1604-basebuild-4c-4g' + node: '{docs-executor}' concurrent: true build-discarder: @@ -545,17 +555,33 @@ scm: - gerrit-trigger-scm: credentials-id: 'jenkins-gerrit-credentials' - refspec: '$GERRIT_REFSPEC' - choosing-strategy: 'gerrit' + refspec: '' + choosing-strategy: 'default' wrappers: - fdio-infra-wrappers-non-activity-timeout: build-timeout: '{build-timeout}' triggers: - - gerrit-trigger-patch-submitted: - name: '{project}' - branch: '{branch}' + - reverse: + jobs: 'csit-vpp-verify-{stream_timed}-ubuntu1604-weekly' + result: 'success' + - gerrit: + server-name: 'Primary' + trigger-on: + - comment-added-contains-event: + comment-contains-value: 'run-docs' + projects: + - project-compare-type: 'ANT' + project-pattern: '{project}' + branches: + - branch-compare-type: 'ANT' + branch-pattern: '**/{branch}' + skip-vote: + successful: true + failed: true + unstable: true + notbuilt: true builders: - maven-target: @@ -583,11 +609,11 @@ maven-version: 'mvn33-new' - job-template: - name: 'csit-docs-merge-{stream_timed}' + name: 'csit-report-merge-{stream}' project-type: freestyle - node: 'ubuntu1604-basebuild-4c-4g' - concurrent: true + node: 'ubuntu1604-basebuild-8c-32g' + concurrent: false build-discarder: daysToKeep: '{build-days-to-keep}' @@ -606,7 +632,7 @@ scm: - gerrit-trigger-scm: credentials-id: 'jenkins-gerrit-credentials' - refspec: '' + refspec: '$GERRIT_REFSPEC' choosing-strategy: 'default' wrappers: @@ -614,14 +640,11 @@ build-timeout: '{build-timeout}' triggers: - - reverse: - jobs: 'csit-vpp-verify-{stream_timed}-ubuntu1604-weekly' - result: 'success' - gerrit: server-name: 'Primary' trigger-on: - comment-added-contains-event: - comment-contains-value: 'run-docs' + comment-contains-value: 'run-report' projects: - project-compare-type: 'ANT' project-pattern: '{project}' @@ -646,11 +669,11 @@ settings-file: 'csit-settings' global-settings-file: 'global-settings' - shell: - !include-raw-escape: include-raw-csit-docs.sh + !include-raw-escape: include-raw-csit-report.sh publishers: - archive: - artifacts: 'resources/tools/doc_gen/csit.docs.tar.gz' + artifacts: 'resources/tools/presentation/csit.report.tar.gz' allow-empty: 'true' fingerprint: false only-if-success: true @@ -660,7 +683,7 @@ maven-version: 'mvn33-new' - job-template: - name: 'csit-report-merge-{stream}' + name: 'csit-report-merge-1901_1' project-type: freestyle node: 'ubuntu1604-basebuild-8c-32g' @@ -676,7 +699,7 @@ - project-parameter: project: '{project}' - gerrit-parameter: - branch: '{branch}' + branch: 'rls1901_1' - maven-exec: maven-version: 'mvn33-new' @@ -701,7 +724,7 @@ project-pattern: '{project}' branches: - branch-compare-type: 'ANT' - branch-pattern: '**/{branch}' + branch-pattern: '**/rls1901_1' skip-vote: successful: true failed: true @@ -789,15 +812,12 @@ recipients: 'tifrank@cisco.com, csit-report+int+616+181919729795594561@lists.fd.io' reply-to: '' content-type: 'text' - subject: 'FD.io CSIT Trending Alert: Build # $BUILD_NUMBER' + subject: 'Failed tests as of $BUILD_TIMESTAMP' # yamllint disable-line rule:line-length - attachments: '**/build-root/docs/deploy-site/src/site/resources/trending/_static/vpp/failed-tests*.tar.gz' body: | - FD.io CSIT Trending Alert - failed tests - - $PROJECT_NAME - Build # $BUILD_NUMBER - $BUILD_STATUS + Following tests failed in the last trending job runs, listed per testbed type. - See attachment for the list of the failed tests. + $FILE,path="**/build-root/docs/deploy-site/src/site/resources/trending/_static/vpp/trending-failed-tests.txt" always: true failure: false @@ -826,7 +846,7 @@ project-type: freestyle - node: 'ubuntu1604-basebuild-4c-4g' + node: '{perf-executor}' concurrent: false build-discarder: @@ -889,7 +909,7 @@ project-type: freestyle - node: 'ubuntu1604-basebuild-4c-4g' + node: '{perf-executor}' concurrent: false build-discarder: @@ -952,7 +972,7 @@ project-type: freestyle - node: 'ubuntu1604-basebuild-4c-4g' + node: '{perf-executor}' concurrent: false build-discarder: @@ -1016,7 +1036,7 @@ project-type: freestyle - node: 'ubuntu1804-basebuild-4c-4g' + node: '{perf-executor}' concurrent: true build-discarder: @@ -1036,7 +1056,7 @@ build-timeout: '{build-timeout}' triggers: - - timed: '0 16 * * 1,3,5' + - timed: '0 16 * * *' builders: - shell: 'echo "BRANCH_ID={branch-id}" > $WORKSPACE/variables.prop' @@ -1084,7 +1104,7 @@ project-type: freestyle - node: 'ubuntu1604-basebuild-4c-4g' + node: '{perf-executor}' concurrent: true build-discarder: @@ -1104,7 +1124,7 @@ build-timeout: '{build-timeout}' triggers: - - timed: '0 16 * * 1,3,5' + - timed: '0 2,14 * * *' builders: - shell: 'echo "BRANCH_ID={branch-id}" > $WORKSPACE/variables.prop' @@ -1152,7 +1172,7 @@ project-type: freestyle - node: 'ubuntu1604-basebuild-4c-4g' + node: '{perf-executor}' concurrent: true build-discarder: @@ -1172,7 +1192,7 @@ build-timeout: '{build-timeout}' triggers: - - timed: '0 16 * * 1,3,5' + - timed: '0 2,14 * * *' builders: - shell: 'echo "BRANCH_ID={branch-id}" > $WORKSPACE/variables.prop' @@ -1220,7 +1240,7 @@ project-type: freestyle - node: 'ubuntu1604-basebuild-4c-4g' + node: '{perf-executor}' concurrent: true build-discarder: @@ -1240,7 +1260,7 @@ build-timeout: '{build-timeout}' triggers: - - timed: '0 16 * * 1,3,5' + - timed: '0 2,14 * * *' builders: - shell: 'echo "BRANCH_ID={branch-id}" > $WORKSPACE/variables.prop' @@ -1288,7 +1308,7 @@ project-type: freestyle - node: 'ubuntu1604-basebuild-4c-4g' + node: '{perf-executor}' concurrent: true build-discarder: @@ -1356,7 +1376,7 @@ project-type: freestyle - node: 'ubuntu1604-basebuild-4c-4g' + node: '{perf-executor}' concurrent: false build-discarder: @@ -1424,7 +1444,7 @@ project-type: freestyle - node: 'ubuntu1604-basebuild-4c-4g' + node: '{perf-executor}' concurrent: false build-discarder: @@ -1492,7 +1512,7 @@ project-type: freestyle - node: 'ubuntu1604-basebuild-4c-4g' + node: '{perf-executor}' concurrent: false build-discarder: @@ -1582,7 +1602,7 @@ project-type: freestyle - node: 'ubuntu1604-basebuild-8c-32g' + node: '{perf-executor}' concurrent: true build-discarder: @@ -1854,11 +1874,3 @@ - fdio-infra-shiplogs: maven-version: 'mvn33-new' - -- parameter: - name: test-type-parameter - parameters: - - string: - name: TYPE - default: '{type}' - description: "Test TYPE parameter if not given by trigger"