Merge "Modify ONAP verify job to include k8s deployment"

diff --git a/jjb/onap/uds/uds-daily-build-package-promote.yaml b/jjb/onap/uds/uds-daily-build-package-promote.yaml
index 95f07687a6b483ccac65f82244859abfa7faf71f..abb60204177b68345114f8484f72141c736cb042 100644 (file)
--- a/jjb/onap/uds/uds-daily-build-package-promote.yaml
+++ b/jjb/onap/uds/uds-daily-build-package-promote.yaml
@@ -24,6 +24,8 @@
     branches: 20.2, master
     project_directories: sdc, sdc-customization
     project_versions:
+    mvn_params: '-DskipTests -Pdocker'
+    # mvn_params: '-DskipTests -Pdocker' # re-enable when unit tests pass
     mvn_settings_xml_version:
     docker_images: '
       uds/sdc-cassandra-init,
@@ -76,6 +78,7 @@
           project_versions: '{project_versions}'
       - git-parameters
       - maven-parameters:
+          mvn_params: '{mvn_params}'
           mvn_settings_xml_version: '{mvn_settings_xml_version}'
       - artifact_parameters:
           artifact_paths: '{artifact_paths}'
@@ -154,6 +157,24 @@
               property-file: $WORKSPACE/build.properties
     triggers:
       - timed: "@midnight"
+      - gerrit:
+          server-name: 'Nordix Gerrit'
+          trigger-on:
+            - change-merged-event
+            - comment-added-contains-event:
+                comment-contains-value: 'remerge'
+          projects:
+            - project-compare-type: 'PLAIN'
+              project-pattern: 'onap/sdc'
+              branches:
+                - branch-compare-type: 'PLAIN'
+                  branch-pattern: '20.2'
+            - project-compare-type: 'PLAIN'
+              project-pattern: 'local/onap/uds/sdc-customization'
+              branches:
+                - branch-compare-type: 'PLAIN'
+                  branch-pattern: 'master'
+
     wrappers:
       - openstack:
           single-use: True

diff --git a/jjb/onap/uds/uds-macros.yaml b/jjb/onap/uds/uds-macros.yaml
index 802643b7a51d63762fbfc831ec5e4e5e03f94a9c..186f6911340db2fb22d43f356d2d50bfe20dd119 100644 (file)
--- a/jjb/onap/uds/uds-macros.yaml
+++ b/jjb/onap/uds/uds-macros.yaml
@@ -70,7 +70,7 @@
           description: Path to mvn executable
       - string:
           name: MVN_PARAMS
-          default: -Pdocker
+          default: '{mvn_params}'
           description: Maven build parameters
       - string:
           name: MVN_SETTINGS_XML_VERSION

diff --git a/jjb/opendev/openstack-murano/openstack-murano-push-upstream-jobs.yml b/jjb/opendev/openstack-murano/openstack-murano-push-upstream-jobs.yml
new file mode 100644 (file)
index 0000000..6344b15
--- /dev/null
+++ b/jjb/opendev/openstack-murano/openstack-murano-push-upstream-jobs.yml
@@ -0,0 +1,26 @@
+---
+# ============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: openstack-murano-push-upstream
+    project: openstack/murano
+    project-name: openstack-murano
+
+    jobs:
+      - 'opendev-{project-name}-push-upstream'

diff --git a/jjb/opendev/openstack-murano/openstack-murano-rebase-jobs.yml b/jjb/opendev/openstack-murano/openstack-murano-rebase-jobs.yml
new file mode 100644 (file)
index 0000000..527dce3
--- /dev/null
+++ b/jjb/opendev/openstack-murano/openstack-murano-rebase-jobs.yml
@@ -0,0 +1,26 @@
+---
+# ============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: openstack-murano-rebase
+    project: openstack/murano
+    project-name: openstack-murano
+
+    jobs:
+      - 'opendev-{project-name}-rebase'