From: robert.tomczyk <robert.tomczyk@est.tech>
Date: Tue, 31 Aug 2021 09:07:16 +0000 (+0100)
Subject: ONAP: Consolidating ccsdk-sli repos
X-Git-Url: https://gerrit.nordix.org/gitweb?a=commitdiff_plain;ds=sidebyside;h=refs%2Fchanges%2F05%2F10105%2F1;p=infra%2Fcicd.git

ONAP: Consolidating ccsdk-sli repos

Change-Id: I1d06b9565763d7166a16d8f50c0de2b531d6b280
---

diff --git a/jjb/onap/ccsdk-sli-adaptors/ccsdk-sli-adaptors-push-upstream-jobs.yml b/jjb/onap/ccsdk-sli-adaptors/ccsdk-sli-adaptors-push-upstream-jobs.yml
deleted file mode 100644
index ca9c1674..00000000
--- a/jjb/onap/ccsdk-sli-adaptors/ccsdk-sli-adaptors-push-upstream-jobs.yml
+++ /dev/null
@@ -1,26 +0,0 @@
----
-# ============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: ccsdk-sli-adaptors-push-upstream
-    project: ccsdk/sli/adaptors
-    project-name: ccsdk-sli-adaptors
-
-    jobs:
-      - 'onap-{project-name}-push-upstream'
\ No newline at end of file
diff --git a/jjb/onap/ccsdk-sli-adaptors/ccsdk-sli-adaptors-rebase-jobs.yml b/jjb/onap/ccsdk-sli-adaptors/ccsdk-sli-adaptors-rebase-jobs.yml
deleted file mode 100644
index b755e2b5..00000000
--- a/jjb/onap/ccsdk-sli-adaptors/ccsdk-sli-adaptors-rebase-jobs.yml
+++ /dev/null
@@ -1,26 +0,0 @@
----
-# ============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: ccsdk-sli-adaptors-rebase
-    project: ccsdk/sli/adaptors
-    project-name: ccsdk-sli-adaptors
-
-    jobs:
-      - 'onap-{project-name}-rebase'
\ No newline at end of file
diff --git a/jjb/onap/ccsdk-sli-adaptors/ccsdk-sli-adaptors-verify-jobs.yaml b/jjb/onap/ccsdk-sli-adaptors/ccsdk-sli-adaptors-verify-jobs.yaml
deleted file mode 100644
index 8670ebf7..00000000
--- a/jjb/onap/ccsdk-sli-adaptors/ccsdk-sli-adaptors-verify-jobs.yaml
+++ /dev/null
@@ -1,33 +0,0 @@
----
-# ============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
-# ccsdk/sli/adaptors project on Nordix Gerrit.
-- project:
-    name: ccsdk-sli-adaptors-verify
-    project: ccsdk/sli/adaptors
-    project-name: ccsdk-sli-adaptors
-
-    stream:
-      - master:
-          branch: '{stream}'
-          jdk-version: java-8
-
-    jobs:
-      - 'onap-{project-name}-{stream}-verify-java'
diff --git a/jjb/onap/ccsdk-sli-core/ccsdk-sli-core-push-upstream-jobs.yml b/jjb/onap/ccsdk-sli-core/ccsdk-sli-core-push-upstream-jobs.yml
deleted file mode 100644
index 52bc83b0..00000000
--- a/jjb/onap/ccsdk-sli-core/ccsdk-sli-core-push-upstream-jobs.yml
+++ /dev/null
@@ -1,26 +0,0 @@
----
-# ============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: ccsdk-sli-core-push-upstream
-    project: ccsdk/sli/core
-    project-name: ccsdk-sli-core
-
-    jobs:
-      - 'onap-{project-name}-push-upstream'
\ No newline at end of file
diff --git a/jjb/onap/ccsdk-sli-northbound/ccsdk-sli-northbound-push-upstream-jobs.yml b/jjb/onap/ccsdk-sli-northbound/ccsdk-sli-northbound-push-upstream-jobs.yml
deleted file mode 100644
index 322e53f4..00000000
--- a/jjb/onap/ccsdk-sli-northbound/ccsdk-sli-northbound-push-upstream-jobs.yml
+++ /dev/null
@@ -1,26 +0,0 @@
----
-# ============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: ccsdk-sli-northbound-push-upstream
-    project: ccsdk/sli/northbound
-    project-name: ccsdk-sli-northbound
-
-    jobs:
-      - 'onap-{project-name}-push-upstream'
\ No newline at end of file
diff --git a/jjb/onap/ccsdk-sli-northbound/ccsdk-sli-northbound-rebase-jobs.yml b/jjb/onap/ccsdk-sli-northbound/ccsdk-sli-northbound-rebase-jobs.yml
deleted file mode 100644
index accf252f..00000000
--- a/jjb/onap/ccsdk-sli-northbound/ccsdk-sli-northbound-rebase-jobs.yml
+++ /dev/null
@@ -1,26 +0,0 @@
----
-# ============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: ccsdk-sli-northbound-rebase
-    project: ccsdk/sli/northbound
-    project-name: ccsdk-sli-northbound
-
-    jobs:
-      - 'onap-{project-name}-rebase'
\ No newline at end of file
diff --git a/jjb/onap/ccsdk-sli-northbound/ccsdk-sli-northbound-verify-jobs.yaml b/jjb/onap/ccsdk-sli-northbound/ccsdk-sli-northbound-verify-jobs.yaml
deleted file mode 100644
index d4343dba..00000000
--- a/jjb/onap/ccsdk-sli-northbound/ccsdk-sli-northbound-verify-jobs.yaml
+++ /dev/null
@@ -1,33 +0,0 @@
----
-# ============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
-# ccsdk/sli/northbound project on Nordix Gerrit.
-- project:
-    name: ccsdk-sli-northbound-verify
-    project: ccsdk/sli/northbound
-    project-name: ccsdk-sli-northbound
-
-    stream:
-      - master:
-          branch: '{stream}'
-          jdk-version: java-8
-
-    jobs:
-      - 'onap-{project-name}-{stream}-verify-java'
diff --git a/jjb/onap/ccsdk-sli-plugins/ccsdk-sli-plugins-push-upstream-jobs.yml b/jjb/onap/ccsdk-sli-plugins/ccsdk-sli-plugins-push-upstream-jobs.yml
deleted file mode 100644
index 86aa5174..00000000
--- a/jjb/onap/ccsdk-sli-plugins/ccsdk-sli-plugins-push-upstream-jobs.yml
+++ /dev/null
@@ -1,26 +0,0 @@
----
-# ============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: ccsdk-sli-plugins-push-upstream
-    project: ccsdk/sli/plugins
-    project-name: ccsdk-sli-plugins
-
-    jobs:
-      - 'onap-{project-name}-push-upstream'
\ No newline at end of file
diff --git a/jjb/onap/ccsdk-sli-plugins/ccsdk-sli-plugins-verify-jobs.yaml b/jjb/onap/ccsdk-sli-plugins/ccsdk-sli-plugins-verify-jobs.yaml
deleted file mode 100644
index a7fb05ad..00000000
--- a/jjb/onap/ccsdk-sli-plugins/ccsdk-sli-plugins-verify-jobs.yaml
+++ /dev/null
@@ -1,33 +0,0 @@
----
-# ============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
-# ccsdk/sli/plugins project on Nordix Gerrit.
-- project:
-    name: ccsdk-sli-plugins-verify
-    project: ccsdk/sli/plugins
-    project-name: ccsdk-sli-plugins
-
-    stream:
-      - master:
-          branch: '{stream}'
-          jdk-version: java-8
-
-    jobs:
-      - 'onap-{project-name}-{stream}-verify-java'
diff --git a/jjb/onap/ccsdk-sli-core/ccsdk-sli-core-rebase-jobs.yml b/jjb/onap/ccsdk-sli/ccsdk-sli-push-upstream-jobs.yml
similarity index 87%
rename from jjb/onap/ccsdk-sli-core/ccsdk-sli-core-rebase-jobs.yml
rename to jjb/onap/ccsdk-sli/ccsdk-sli-push-upstream-jobs.yml
index 970d2d47..1bcb3c99 100644
--- a/jjb/onap/ccsdk-sli-core/ccsdk-sli-core-rebase-jobs.yml
+++ b/jjb/onap/ccsdk-sli/ccsdk-sli-push-upstream-jobs.yml
@@ -18,9 +18,9 @@
 # ============LICENSE_END=========================================================
 #
 - project:
-    name: ccsdk-sli-core-rebase
-    project: ccsdk/sli/core
-    project-name: ccsdk-sli-core
+    name: ccsdk-sli-push-upstream
+    project: ccsdk/sli
+    project-name: ccsdk-sli
 
     jobs:
-      - 'onap-{project-name}-rebase'
\ No newline at end of file
+      - 'onap-{project-name}-push-upstream'
\ No newline at end of file
diff --git a/jjb/onap/ccsdk-sli-plugins/ccsdk-sli-plugins-rebase-jobs.yml b/jjb/onap/ccsdk-sli/ccsdk-sli-rebase-jobs.yml
similarity index 86%
rename from jjb/onap/ccsdk-sli-plugins/ccsdk-sli-plugins-rebase-jobs.yml
rename to jjb/onap/ccsdk-sli/ccsdk-sli-rebase-jobs.yml
index 5cb55e80..5d0fd951 100644
--- a/jjb/onap/ccsdk-sli-plugins/ccsdk-sli-plugins-rebase-jobs.yml
+++ b/jjb/onap/ccsdk-sli/ccsdk-sli-rebase-jobs.yml
@@ -18,9 +18,9 @@
 # ============LICENSE_END=========================================================
 #
 - project:
-    name: ccsdk-sli-plugins-rebase
-    project: ccsdk/sli/plugins
-    project-name: ccsdk-sli-plugins
+    name: ccsdk-sli-rebase
+    project: ccsdk/sli
+    project-name: ccsdk-sli
 
     jobs:
       - 'onap-{project-name}-rebase'
\ No newline at end of file
diff --git a/jjb/onap/ccsdk-sli-core/ccsdk-sli-core-verify-jobs.yaml b/jjb/onap/ccsdk-sli/ccsdk-sli-verify-jobs.yaml
similarity index 86%
rename from jjb/onap/ccsdk-sli-core/ccsdk-sli-core-verify-jobs.yaml
rename to jjb/onap/ccsdk-sli/ccsdk-sli-verify-jobs.yaml
index 5a515580..01e436d3 100644
--- a/jjb/onap/ccsdk-sli-core/ccsdk-sli-core-verify-jobs.yaml
+++ b/jjb/onap/ccsdk-sli/ccsdk-sli-verify-jobs.yaml
@@ -18,16 +18,16 @@
 # ============LICENSE_END=========================================================
 #
 # this job gets triggered when a change is proposed to
-# ccsdk/sli/core project on Nordix Gerrit.
+# ccsdk/sli project on Nordix Gerrit.
 - project:
-    name: ccsdk-sli-core-verify
-    project: ccsdk/sli/core
-    project-name: ccsdk-sli-core
+    name: ccsdk-sli-verify
+    project: ccsdk/sli
+    project-name: ccsdk-sli
 
     stream:
       - master:
           branch: '{stream}'
-          jdk-version: java-8
+          jdk-version: java-11
 
     jobs:
       - 'onap-{project-name}-{stream}-verify-java'