Merge "Meridio: New PR and periodic jobs"

diff --git a/jjb/metal3/job_bml_integration_tests.yml b/jjb/metal3/job_bml_integration_tests.yml
index 705458ea548a72f686525453e76d71e45a9148fa..8ca4dd5dc34387c17d866503b6929878c2c248bb 100644 (file)
--- a/jjb/metal3/job_bml_integration_tests.yml
+++ b/jjb/metal3/job_bml_integration_tests.yml
@@ -86,7 +86,7 @@
     - build-blocker:
         use-build-blocker: true
         blocking-jobs:
-            - ".*_bml_integration_tests_*"
+            - ".*_bml_integration_tests_centos"
         block-level: 'GLOBAL'
 
     triggers:

diff --git a/jjb/metal3/job_bml_main_integration_tests.yml b/jjb/metal3/job_bml_main_integration_tests.yml
index a2460871f9c41e6aa77d2f54cd1caef0c42e84c2..039d93ca1ae9c19a2b78cf20442f9ec9ebb6db3e 100644 (file)
--- a/jjb/metal3/job_bml_main_integration_tests.yml
+++ b/jjb/metal3/job_bml_main_integration_tests.yml
@@ -84,7 +84,7 @@
     - build-blocker:
         use-build-blocker: true
         blocking-jobs:
-            - ".*_bml_integration_tests_*"
+            - ".*_bml_integration_tests_centos"
         block-level: 'GLOBAL'
 
     triggers:

diff --git a/jjb/metal3/projects.yml b/jjb/metal3/projects.yml
index eb72e5c203cd70cce6d3d41a014dc44b6398dbae..e46fcc675b9e960d4747d36ee4609a17c8c28ef8 100644 (file)
--- a/jjb/metal3/projects.yml
+++ b/jjb/metal3/projects.yml
@@ -250,6 +250,8 @@
           ci_github_repo: '${{ghprbAuthorRepoGitUrl}}'
       - bmo:
           repo: baremetal-operator
+      - ipam:
+          repo: ip-address-manager
     image_os:
       - ubuntu
       - centos

diff --git a/jjb/onap/integration-docker-onap-java11/integration-docker-onap-java11-push-upstream-jobs.yaml b/jjb/onap/integration-docker-onap-java11/integration-docker-onap-java11-push-upstream-jobs.yaml
new file mode 100644 (file)
index 0000000..1d681b2
--- /dev/null
+++ b/jjb/onap/integration-docker-onap-java11/integration-docker-onap-java11-push-upstream-jobs.yaml
@@ -0,0 +1,27 @@
+---
+# ============LICENSE_START=======================================================
+#  Copyright (C) 2022 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=========================================================
+
+# this job gets triggered when push-upstream is commented on a change on Nordix Gerrit.
+- project:
+    name: integration-docker-onap-java11-push-upstream
+    project: integration/docker/onap-java11
+    project-name: integration-docker-onap-java11
+
+    jobs:
+      - 'onap-{project-name}-push-upstream'

diff --git a/jjb/onap/integration-docker-onap-java11/integration-docker-onap-java11-rebase-jobs.yaml b/jjb/onap/integration-docker-onap-java11/integration-docker-onap-java11-rebase-jobs.yaml
new file mode 100644 (file)
index 0000000..cce2632
--- /dev/null
+++ b/jjb/onap/integration-docker-onap-java11/integration-docker-onap-java11-rebase-jobs.yaml
@@ -0,0 +1,29 @@
+---
+# ============LICENSE_START=======================================================
+#  Copyright (C) 2022 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=========================================================
+#
+# this job gets triggered when a change is merged to
+# integration/docker/onap-java11 project on ONAP Gerrit.
+
+- project:
+    name: integration-docker-onap-java11-rebase
+    project: integration/docker/onap-java11
+    project-name: integration-docker-onap-java11
+
+    jobs:
+      - 'onap-{project-name}-rebase'