From a1e099f267c8d358dbd4bf3cb1088b93fbfc4323 Mon Sep 17 00:00:00 2001 From: "juraj.linkes" Date: Wed, 14 Aug 2019 15:48:24 +0200 Subject: Add 1n-tx2 vpp device jobs Add only manually triggered 1n-tx2 VPP Device jobs and add hourly executed jobs instead of per patch triggered jobs. Change-Id: I0cc51e1ce88e3f94c81925be74284812ad1dad55 Signed-off-by: juraj.linkes --- jjb/csit/csit-macros.yaml | 49 ++++++++++ jjb/csit/csit-vpp-device.yaml | 209 ++++++++++++++++++++++++++++++++++-------- 2 files changed, 222 insertions(+), 36 deletions(-) create mode 100644 jjb/csit/csit-macros.yaml (limited to 'jjb/csit') diff --git a/jjb/csit/csit-macros.yaml b/jjb/csit/csit-macros.yaml new file mode 100644 index 000000000..16e349bc7 --- /dev/null +++ b/jjb/csit/csit-macros.yaml @@ -0,0 +1,49 @@ +--- +- trigger: + name: gerrit-trigger-csit-vpp-devicetest-full + triggers: + - gerrit: + server-name: 'Primary' + trigger-on: + - patchset-created-event: + exclude-drafts: 'true' + exclude-trivial-rebase: 'false' + exclude-no-code-change: 'false' + - draft-published-event + - comment-added-contains-event: + comment-contains-value: 'recheck' + - comment-added-contains-event: + comment-contains-value: 'reverify' + - comment-added-contains-event: + comment-contains-value: 'csit-devicetest' + projects: + - project-compare-type: 'ANT' + project-pattern: '{project}' + branches: + - branch-compare-type: 'ANT' + branch-pattern: '**/{branch}' + skip-vote: + successful: '{skip-vote}' + failed: '{skip-vote}' + unstable: '{skip-vote}' + notbuilt: '{skip-vote}' + +- trigger: + name: gerrit-trigger-csit-vpp-devicetest-manual + triggers: + - gerrit: + server-name: 'Primary' + trigger-on: + - comment-added-contains-event: + comment-contains-value: 'csit-devicetest' + projects: + - project-compare-type: 'ANT' + project-pattern: '{project}' + branches: + - branch-compare-type: 'ANT' + branch-pattern: '**/{branch}' + skip-vote: + successful: '{skip-vote}' + failed: '{skip-vote}' + unstable: '{skip-vote}' + notbuilt: '{skip-vote}' \ No newline at end of file diff --git a/jjb/csit/csit-vpp-device.yaml b/jjb/csit/csit-vpp-device.yaml index 538136d10..f16dae549 100644 --- a/jjb/csit/csit-vpp-device.yaml +++ b/jjb/csit/csit-vpp-device.yaml @@ -19,19 +19,22 @@ - 'ubuntu1804' node-arch: - '1n-skx' -# Is there a good way to allow manual triggers for tx2? -# - '1n-tx2': -# executor: 'vpp-csit-arm-ubuntu18' -# skip-vote: 'true' + - '1n-tx2': + executor: 'vpp-csit-arm-ubuntu18' + skip-vote: 'true' + trigger: 'gerrit-trigger-csit-vpp-devicetest-manual' jobs: - 'csit-vpp-device-{stream}-{os}-{node-arch}' - 'csit-vpp-device-{stream_timed}-{os}-{node-arch}-semiweekly' - 'csit-vpp-device-{stream_timed}-{os}-{node-arch}-weekly' + - 'csit-vpp-device-master-ubuntu1804-1n-tx2-csit-verify-hourly' + - 'csit-vpp-device-master-ubuntu1804-1n-tx2-vpp-verify-hourly' project: 'csit' executor: 'vpp-csit-device' branch: 'master' branch-id: 'oper' + trigger: 'gerrit-trigger-csit-vpp-devicetest-full' stream_timed: - master: branch: 'master' @@ -52,13 +55,19 @@ - '1908': branch: 'rls1908' branch-id: 'oper-rls1908' -# exclude: -# - stream: '1901' -# os: 'ubuntu1804' -# node-arch: '1n-tx2' -# - stream: '1904' -# os: 'ubuntu1804' -# node-arch: '1n-tx2' + exclude: + - stream: '1901' + os: 'ubuntu1804' + node-arch: '1n-tx2' + - stream: '1904' + os: 'ubuntu1804' + node-arch: '1n-tx2' + - stream_timed: '1908' + os: 'ubuntu1804' + node-arch: '1n-tx2' + - stream_timed: 'master' + os: 'ubuntu1804' + node-arch: '1n-tx2' - job-template: name: 'csit-vpp-device-{stream}-{os}-{node-arch}' @@ -130,31 +139,10 @@ build-timeout: '{build-timeout}' triggers: - - gerrit: - server-name: 'Primary' - trigger-on: - - patchset-created-event: - exclude-drafts: 'true' - exclude-trivial-rebase: 'false' - exclude-no-code-change: 'false' - - draft-published-event - - comment-added-contains-event: - comment-contains-value: 'recheck' - - comment-added-contains-event: - comment-contains-value: 'reverify' - - comment-added-contains-event: - comment-contains-value: 'csit-devicetest' - projects: - - project-compare-type: 'ANT' - project-pattern: '{project}' - branches: - - branch-compare-type: 'ANT' - branch-pattern: '**/{branch}' - skip-vote: - successful: '{skip-vote}' - failed: '{skip-vote}' - unstable: '{skip-vote}' - notbuilt: '{skip-vote}' + - '{trigger}': + project: '{project}' + branch: '{branch}' + skip-vote: '{skip-vote}' builders: - shell: @@ -326,3 +314,152 @@ - '*.*' - fdio-infra-shiplogs: maven-version: 'mvn33-new' + +- job-template: + name: 'csit-vpp-device-master-ubuntu1804-1n-tx2-csit-verify-hourly' + description: | + + + project-type: freestyle + node: 'vpp-csit-arm-ubuntu18' + concurrent: false + archive-artifacts: 'archive/*.*' + latest-only: false + + build-discarder: + daysToKeep: '{build-days-to-keep}' + numToKeep: '{build-num-to-keep}' + artifactDaysToKeep: '{build-artifact-days-to-keep}' + artifactNumToKeep: '{build-artifact-num-to-keep}' + + parameters: + - project-parameter: + project: '{project}' + - gerrit-parameter: + branch: '{branch}' + - os-parameter: + os: 'ubuntu1804' + - string: + name: ARCHIVE_ARTIFACTS + default: '{archive-artifacts}' + description: Artifacts to archive to the logs server. + + scm: + - git-scm: + credentials-id: 'jenkins-gerrit-credentials' + branch: '{branch}' + + wrappers: + - fdio-infra-wrappers-non-activity-timeout: + build-timeout: '{build-timeout}' + + triggers: + - timed: '0 * * * *' + + builders: + - shell: + !include-raw-escape: jjb/csit/include-raw-csit-device-verify.sh + + publishers: + - robot: + output-path: archive + other-files: + - '*.*' + - fdio-infra-shiplogs: + maven-version: 'mvn33-new' + +- job-template: + name: 'csit-vpp-device-master-ubuntu1804-1n-tx2-vpp-verify-hourly' + description: | + + + project-type: freestyle + node: 'vpp-csit-arm-ubuntu18' + concurrent: false + archive-artifacts: 'csit/archive/*.*' + latest-only: false + + build-discarder: + daysToKeep: '{build-days-to-keep}' + numToKeep: '{build-num-to-keep}' + artifactDaysToKeep: '{build-artifact-days-to-keep}' + artifactNumToKeep: '{build-artifact-num-to-keep}' + + parameters: + - project-parameter: + project: '{project}' + - gerrit-parameter: + branch: '{branch}' + - os-parameter: + os: 'ubuntu1804' + - string: + name: ARCHIVE_ARTIFACTS + default: '{archive-artifacts}' + description: Artifacts to archive to the logs server. + + wrappers: + - fdio-infra-wrappers-non-activity-timeout: + build-timeout: '{build-timeout}' + + triggers: + - timed: '30 * * * *' + + builders: + - shell: 'echo "BRANCH_ID={branch-id}" > $WORKSPACE/variables.prop' + - inject: + properties-file: variables.prop + - shell: + !include-raw-escape: jjb/csit/include-raw-csit-device-semiweekly.sh + + publishers: + - robot: + output-path: 'csit/archive' + other-files: + - '*.*' + - fdio-infra-shiplogs: + maven-version: 'mvn33-new' -- cgit 1.2.3-korg