From f380a65ac9ba5858508ea0cb757b272258a536bd Mon Sep 17 00:00:00 2001 From: Vratko Polak Date: Thu, 9 Jan 2020 12:53:41 +0100 Subject: [PATCH] Move VPP and CSIT macros to global + Add copyright notice. Change-Id: Ib5de5738a031ce94bbaf145a7cd1e58e882470f4 Signed-off-by: Vratko Polak --- jjb/csit/csit-macros.yaml | 62 ---------------- jjb/global-macros.yaml | 177 ++++++++++++++++++++++++++++++++++++++++++++++ jjb/vpp/vpp-macros.yaml | 102 -------------------------- jjb/vpp/vpp.yaml | 4 +- 4 files changed, 179 insertions(+), 166 deletions(-) delete mode 100644 jjb/csit/csit-macros.yaml delete mode 100644 jjb/vpp/vpp-macros.yaml diff --git a/jjb/csit/csit-macros.yaml b/jjb/csit/csit-macros.yaml deleted file mode 100644 index 037e62568..000000000 --- a/jjb/csit/csit-macros.yaml +++ /dev/null @@ -1,62 +0,0 @@ -# Copyright (c) 2020 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: -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - ---- -- 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/global-macros.yaml b/jjb/global-macros.yaml index 3a9d90621..c4ee66cb4 100644 --- a/jjb/global-macros.yaml +++ b/jjb/global-macros.yaml @@ -1,3 +1,16 @@ +# Copyright (c) 2020 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: +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + --- # Global macros @@ -403,6 +416,170 @@ gerrit-build-unstable-codereview-value: 0 gerrit-build-notbuilt-codereview-value: 0 +- trigger: + # Comes from VPP, some verify jobs wait for checkstyle to pass. + # This macro is to be used for such verify jobs which are voting. + name: gerrit-trigger-checkstyle + triggers: + - gerrit: + server-name: 'Primary' + trigger-on: + - comment-added-contains-event: + comment-contains-value: 'checkstyle_success' + projects: + - project-compare-type: 'ANT' + project-pattern: '{name}' + branches: + - branch-compare-type: 'ANT' + branch-pattern: '**/{branch}' + +- trigger: + # Comes from VPP, some verify jobs wait for checkstyle to pass. + # This macro is to be used for such verify jobs which are non-voting. + name: gerrit-trigger-checkstyle-nonvoting + triggers: + - gerrit: + server-name: 'Primary' + trigger-on: + - comment-added-contains-event: + comment-contains-value: 'checkstyle_success' + projects: + - project-compare-type: 'ANT' + project-pattern: '{name}' + branches: + - branch-compare-type: 'ANT' + branch-pattern: '**/{branch}' + skip-vote: + successful: true + failed: true + unstable: true + notbuilt: true + override-votes: true + gerrit-build-successful-verified-value: 1 + gerrit-build-failed-verified-value: 1 + gerrit-build-unstable-verified-value: 1 + gerrit-build-notbuilt-verified-value: 1 + +- trigger: + # Comes from VPP, for jobs that do performance testing using CSIT code. + name: gerrit-trigger-csit-perftest + triggers: + - gerrit: + server-name: 'Primary' + trigger-on: + - comment-added-contains-event: + comment-contains-value: 'perftest-{node-arch}' + projects: + - project-compare-type: 'ANT' + project-pattern: '{name}' + branches: + - branch-compare-type: 'ANT' + branch-pattern: '**/{branch}' + skip-vote: + successful: true + failed: true + unstable: true + notbuilt: true + +- trigger: + # Comes from VPP, for automated jobs running "device" tests with CSIT code. + # The job acts as an automatic verify job for VPP contributions. + name: gerrit-trigger-vpp-csit-devicetest-full + triggers: + - gerrit: + server-name: 'Primary' + trigger-on: + - comment-added-contains-event: + comment-contains-value: 'checkstyle_success' + - comment-added-contains-event: + comment-contains-value: 'devicetest' + projects: + - project-compare-type: 'ANT' + project-pattern: '{name}' + branches: + - branch-compare-type: 'ANT' + branch-pattern: '**/{branch}' + skip-vote: + successful: '{skip-vote}' + failed: '{skip-vote}' + unstable: '{skip-vote}' + notbuilt: '{skip-vote}' + +- trigger: + # Comes from VPP, for manual jobs running "device" tests with CSIT code. + # The job acts as a manual (optional) verify job for VPP contributions. + name: gerrit-trigger-vpp-csit-devicetest-manual + triggers: + - gerrit: + server-name: 'Primary' + trigger-on: + - comment-added-contains-event: + comment-contains-value: 'devicetest' + projects: + - project-compare-type: 'ANT' + project-pattern: '{name}' + branches: + - branch-compare-type: 'ANT' + branch-pattern: '**/{branch}' + skip-vote: + successful: '{skip-vote}' + failed: '{skip-vote}' + unstable: '{skip-vote}' + notbuilt: '{skip-vote}' + +- trigger: + # Comes from CSIT, for automatic jobs running "device" tests with VPP builds. + # The job acts as an automatic verify job for CSIT contributions. + 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: + # Comes from CSIT, for manual jobs running "device" tests with VPP builds. + # The job acts as a manual (optional) verify job for CSIT contributions. + 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}' + # Publishers - publisher: name: archive-artifacts diff --git a/jjb/vpp/vpp-macros.yaml b/jjb/vpp/vpp-macros.yaml deleted file mode 100644 index eb491fa5a..000000000 --- a/jjb/vpp/vpp-macros.yaml +++ /dev/null @@ -1,102 +0,0 @@ ---- -- trigger: - name: gerrit-trigger-checkstyle - triggers: - - gerrit: - server-name: 'Primary' - trigger-on: - - comment-added-contains-event: - comment-contains-value: 'checkstyle_success' - projects: - - project-compare-type: 'ANT' - project-pattern: '{name}' - branches: - - branch-compare-type: 'ANT' - branch-pattern: '**/{branch}' - -- trigger: - name: gerrit-trigger-checkstyle-nonvoting - triggers: - - gerrit: - server-name: 'Primary' - trigger-on: - - comment-added-contains-event: - comment-contains-value: 'checkstyle_success' - projects: - - project-compare-type: 'ANT' - project-pattern: '{name}' - branches: - - branch-compare-type: 'ANT' - branch-pattern: '**/{branch}' - skip-vote: - successful: true - failed: true - unstable: true - notbuilt: true - override-votes: true - gerrit-build-successful-verified-value: 1 - gerrit-build-failed-verified-value: 1 - gerrit-build-unstable-verified-value: 1 - gerrit-build-notbuilt-verified-value: 1 - -- trigger: - name: gerrit-trigger-csit-perftest - triggers: - - gerrit: - server-name: 'Primary' - trigger-on: - - comment-added-contains-event: - comment-contains-value: 'perftest-{node-arch}' - projects: - - project-compare-type: 'ANT' - project-pattern: '{name}' - branches: - - branch-compare-type: 'ANT' - branch-pattern: '**/{branch}' - skip-vote: - successful: true - failed: true - unstable: true - notbuilt: true - -- trigger: - name: gerrit-trigger-csit-devicetest-full - triggers: - - gerrit: - server-name: 'Primary' - trigger-on: - - comment-added-contains-event: - comment-contains-value: 'checkstyle_success' - - comment-added-contains-event: - comment-contains-value: 'devicetest' - projects: - - project-compare-type: 'ANT' - project-pattern: '{name}' - 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-devicetest-manual - triggers: - - gerrit: - server-name: 'Primary' - trigger-on: - - comment-added-contains-event: - comment-contains-value: 'devicetest' - projects: - - project-compare-type: 'ANT' - project-pattern: '{name}' - branches: - - branch-compare-type: 'ANT' - branch-pattern: '**/{branch}' - skip-vote: - successful: '{skip-vote}' - failed: '{skip-vote}' - unstable: '{skip-vote}' - notbuilt: '{skip-vote}' diff --git a/jjb/vpp/vpp.yaml b/jjb/vpp/vpp.yaml index 163d655e8..5f9d7c8a2 100644 --- a/jjb/vpp/vpp.yaml +++ b/jjb/vpp/vpp.yaml @@ -73,7 +73,7 @@ device-executor: 'vpp-csit-device' executor: '{os}-us' skip-vote: 'true' - trigger: 'gerrit-trigger-csit-devicetest-full' + trigger: 'gerrit-trigger-vpp-csit-devicetest-full' stream: - master: branch: 'master' @@ -88,7 +88,7 @@ - 1n-skx - 1n-tx2: device-executor: 'vpp-csit-arm-ubuntu18' - trigger: 'gerrit-trigger-csit-devicetest-manual' + trigger: 'gerrit-trigger-vpp-csit-devicetest-manual' node-arch: - 2n-clx - 2n-skx -- 2.16.6