changing dcaegen2-collectors to not overlap with dcaegen2-collectors-datafile

Change-Id: I8556d0491423d69a3a78e8bf4454147f1c6a6e06
Signed-off-by: afenner <andrew.fenner@est.tech>

diff --git a/jjb/onap/dcaegen2-collectors/dcaegen2-collectors-datafile-rebase-jobs.yaml b/jjb/onap/dcaegen2-collectors/dcaegen2-collectors-datafile-rebase-jobs.yaml
deleted file mode 100644 (file)
index d2c32c2..0000000
--- a/jjb/onap/dcaegen2-collectors/dcaegen2-collectors-datafile-rebase-jobs.yaml
+++ /dev/null
@@ -1,21 +0,0 @@
----
-# this job gets triggered when a change is merged to
-# dcaegen2/collectors/datafile project on ONAP Gerrit.
-- project:
-
-    name: datafile-rebase
-
-    project: dcaegen2/collectors/datafile
-
-    project-name: dcaegen2-collectors-datafile
-
-    stream:
-      - master:
-          branch: '{stream}'
-      - casablanca:
-          branch: '{stream}'
-      - dublin:
-          branch: '{stream}'
-
-    jobs:
-      - 'onap-{project-name}-{stream}-rebase'

diff --git a/jjb/onap/dcaegen2-collectors/dcaegen2-collectors-datafile-verify-jobs.yaml b/jjb/onap/dcaegen2-collectors/dcaegen2-collectors-datafile-verify-jobs.yaml
deleted file mode 100644 (file)
index 8cd7266..0000000
--- a/jjb/onap/dcaegen2-collectors/dcaegen2-collectors-datafile-verify-jobs.yaml
+++ /dev/null
@@ -1,23 +0,0 @@
----
-# this job gets triggered when a change is proposed to
-# dcaegen2/collectors/datafile project on Nordix Gerrit.
-- project:
-
-    name: datafile-verify
-
-    project: dcaegen2/collectors/datafile
-
-    project-name: dcaegen2-collectors-datafile
-
-    stream:
-      - nordix-dev:
-          branch: '{stream}'
-      - master:
-          branch: '{stream}'
-      - casablanca:
-          branch: '{stream}'
-      - dublin:
-          branch: '{stream}'
-
-    jobs:
-      - 'onap-{project-name}-{stream}-verify-java'

diff --git a/jjb/onap/dcaegen2-collectors/dcaegen2-collectors-datafile-push-upstream-jobs.yaml b/jjb/onap/dcaegen2-collectors/dcaegen2-collectors-push-upstream-jobs.yaml
similarity index 88%
rename from jjb/onap/dcaegen2-collectors/dcaegen2-collectors-datafile-push-upstream-jobs.yaml
rename to jjb/onap/dcaegen2-collectors/dcaegen2-collectors-push-upstream-jobs.yaml
index eff3bcd9471fa585357f982ecc894edb9bc99b7b..a76ac998758d15848593e3fd076713debb74a42a 100644 (file)
--- a/jjb/onap/dcaegen2-collectors/dcaegen2-collectors-datafile-push-upstream-jobs.yaml
+++ b/jjb/onap/dcaegen2-collectors/dcaegen2-collectors-push-upstream-jobs.yaml
@@ -19,9 +19,9 @@
 #
 # this job gets triggered when push-upstream is commented on a change on Nordix Gerrit.
 - project:
-    name: dcaegen2-collectors-datafile-push-upstream
-    project: dcaegen2/collectors/datafile
-    project-name: dcaegen2-collectors-datafile
+    name: dcaegen2-collectors-push-upstream
+    project: dcaegen2/collectors
+    project-name: dcaegen2-collectors
     stream:
       - master:
           branch: '{stream}'

diff --git a/jjb/onap/dcaegen2-collectors/dcaegen2-collectors-rebase-jobs.yaml b/jjb/onap/dcaegen2-collectors/dcaegen2-collectors-rebase-jobs.yaml
new file mode 100644 (file)
index 0000000..e00bb3f
--- /dev/null
+++ b/jjb/onap/dcaegen2-collectors/dcaegen2-collectors-rebase-jobs.yaml
@@ -0,0 +1,38 @@
+---
+# ============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=========================================================
+# this job gets triggered when a change is merged to
+# dcaegen2/collectors/datafile project on ONAP Gerrit.
+- project:
+
+    name: dcaegen2-collectors-rebase
+
+    project: dcaegen2/collectors
+
+    project-name: dcaegen2-collectors
+
+    stream:
+      - master:
+          branch: '{stream}'
+      - casablanca:
+          branch: '{stream}'
+      - dublin:
+          branch: '{stream}'
+
+    jobs:
+      - 'onap-{project-name}-{stream}-rebase'

diff --git a/jjb/onap/dcaegen2-collectors/dcaegen2-collectors-verify-jobs.yaml b/jjb/onap/dcaegen2-collectors/dcaegen2-collectors-verify-jobs.yaml
new file mode 100644 (file)
index 0000000..0f222c3
--- /dev/null
+++ b/jjb/onap/dcaegen2-collectors/dcaegen2-collectors-verify-jobs.yaml
@@ -0,0 +1,40 @@
+---
+# ============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=========================================================
+# this job gets triggered when a change is proposed to
+# dcaegen2/collectors project on Nordix Gerrit.
+- project:
+
+    name: dcaegen2-collectors-verify
+
+    project: dcaegen2/collectors
+
+    project-name: dcaegen2-collectors
+
+    stream:
+      - nordix-dev:
+          branch: '{stream}'
+      - master:
+          branch: '{stream}'
+      - casablanca:
+          branch: '{stream}'
+      - dublin:
+          branch: '{stream}'
+
+    jobs:
+      - 'onap-{project-name}-{stream}-verify-java'