From: Fatih Degirmenci Date: Tue, 21 May 2019 20:48:26 +0000 (+0000) Subject: Merge changes from topic 'add-odl-gerrit' X-Git-Url: https://gerrit.nordix.org/gitweb?a=commitdiff_plain;h=c5cd28c0499dda8e256edf802532ba7ae72cb6f5;hp=3df9f091047e718dcedfa1c980b466f3db7a6590;p=infra%2Fcicd.git Merge changes from topic 'add-odl-gerrit' * changes: Add change-merged trigger for ODL Gerrit Addd ODL Gerrit parameters to global jjb macros --- diff --git a/jjb/acumos/acumos-java-client/acumos-java-client-push-upstream-jobs.yml b/jjb/acumos/acumos-java-client/acumos-java-client-push-upstream-jobs.yml new file mode 100644 index 00000000..36b9c03d --- /dev/null +++ b/jjb/acumos/acumos-java-client/acumos-java-client-push-upstream-jobs.yml @@ -0,0 +1,29 @@ +--- +# ============LICENSE_START======================================================= +# Copyright (C) 2019 Nordix Foundation. +# ================================================================================ +# 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. +# +# SPDX-License-Identifier: Apache-2.0 +# ============LICENSE_END========================================================= + +- project: + name: acumos-java-client-push-upstream + project: acumos-java-client + project-name: acumos-java-client + stream: + - master: + branch: '{stream}' + + jobs: + - 'acumos-{project-name}-{stream}-push-upstream' diff --git a/jjb/acumos/acumos-java-client/acumos-java-client-rebase-jobs.yml b/jjb/acumos/acumos-java-client/acumos-java-client-rebase-jobs.yml new file mode 100644 index 00000000..a297e489 --- /dev/null +++ b/jjb/acumos/acumos-java-client/acumos-java-client-rebase-jobs.yml @@ -0,0 +1,29 @@ +--- +# ============LICENSE_START======================================================= +# Copyright (C) 2019 Nordix Foundation. +# ================================================================================ +# 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. +# +# SPDX-License-Identifier: Apache-2.0 +# ============LICENSE_END========================================================= +# +- project: + name: acumos-java-client-rebase + project: acumos-java-client + project-name: acumos-java-client + stream: + - master: + branch: '{stream}' + + jobs: + - 'acumos-{project-name}-{stream}-rebase' diff --git a/jjb/acumos/acumos-java-client/acumos-java-client-verify-jobs.yaml b/jjb/acumos/acumos-java-client/acumos-java-client-verify-jobs.yaml new file mode 100644 index 00000000..b2b23ced --- /dev/null +++ b/jjb/acumos/acumos-java-client/acumos-java-client-verify-jobs.yaml @@ -0,0 +1,29 @@ +--- +# ============LICENSE_START======================================================= +# Copyright (C) 2019 Nordix Foundation. +# ================================================================================ +# 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. +# +# SPDX-License-Identifier: Apache-2.0 +# ============LICENSE_END========================================================= + +- project: + name: acumos-java-client-verify + project: acumos-java-client + project-name: acumos-java-client + stream: + - master: + branch: '{stream}' + + jobs: + - 'acumos-{project-name}-{stream}-verify-java' diff --git a/jjb/acumos/global-templates-acumos-java.yaml b/jjb/acumos/global-templates-acumos-java.yaml index 80344fda..06408ed2 100644 --- a/jjb/acumos/global-templates-acumos-java.yaml +++ b/jjb/acumos/global-templates-acumos-java.yaml @@ -43,6 +43,11 @@ project: 'acumos/{project}' branch: '{branch}' files: '**' + skip-vote: + successful: false + failed: false + unstable: false + notbuilt: false wrappers: - build-timeout: diff --git a/jjb/cloud-infra/cloud-infra-verify-testfw.yaml b/jjb/cloud-infra/cloud-infra-verify-testfw.yaml index e169b69c..61e93f39 100644 --- a/jjb/cloud-infra/cloud-infra-verify-testfw.yaml +++ b/jjb/cloud-infra/cloud-infra-verify-testfw.yaml @@ -138,6 +138,11 @@ project: 'infra\/test' branch: '{branch}' files: '**' + skip-vote: + successful: false + failed: false + unstable: false + notbuilt: false builders: - multijob: diff --git a/jjb/global/global-templates-java.yaml b/jjb/global/global-templates-java.yaml index 53eab051..544c69ca 100644 --- a/jjb/global/global-templates-java.yaml +++ b/jjb/global/global-templates-java.yaml @@ -43,6 +43,11 @@ project: '{project}' branch: '{branch}' files: '**' + skip-vote: + successful: false + failed: false + unstable: false + notbuilt: false wrappers: - build-timeout: diff --git a/jjb/global/jjb-macros.yaml b/jjb/global/jjb-macros.yaml index 1a2f8d2b..204ef5c0 100644 --- a/jjb/global/jjb-macros.yaml +++ b/jjb/global/jjb-macros.yaml @@ -164,11 +164,6 @@ file-paths: - compare-type: 'ANT' pattern: '{files}' - skip-vote: - successful: false - failed: false - unstable: false - notbuilt: false - trigger: name: nordix-gerrit-trigger-change-merged diff --git a/jjb/infra/jjb-verify-jobs.yaml b/jjb/infra/jjb-verify-jobs.yaml index 2d2a3605..28eca152 100644 --- a/jjb/infra/jjb-verify-jobs.yaml +++ b/jjb/infra/jjb-verify-jobs.yaml @@ -43,6 +43,11 @@ project: '{project}' branch: '{branch}' files: 'jjb/**' + skip-vote: + successful: false + failed: false + unstable: false + notbuilt: false wrappers: - nordixinfra-jjb-creds-wrapper