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 (file)
index 0000000..36b9c03
--- /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 (file)
index 0000000..a297e48
--- /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 (file)
index 0000000..b2b23ce
--- /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 80344fda92c493a12b59eed28742679c8c03ea63..06408ed2556fa3cd816b305ee6d3566b74db95d0 100644 (file)
--- 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 e169b69ca89e068a0a3c32d8b4dae49cf3c96ff8..61e93f3961a033c7da99ee7138979cb30ac909a1 100644 (file)
--- 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 53eab0512625370bab30e441750f819bc87c7b87..544c69ca36855f87838d202156f5dc482b973118 100644 (file)
--- 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 1a2f8d2b5a0f74c9fec2d05c2fdf6e41dd333fa2..204ef5c05a6e79c2892801df6d7427ec4150a1a2 100644 (file)
--- 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 2d2a3605c8ef152f4d96576755bde0faef1b3e67..28eca152613dbb2af26e92793c3019f4c69ad56a 100644 (file)
--- 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