ONAP: Remove remaining jobs for old onap repositories

Change-Id: I42a5bd7fe7e9f99295d617e2b0923412b4be97fe
diff --git a/jjb/appc/appc-push-upstream-jobs.yaml b/jjb/appc/appc-push-upstream-jobs.yaml
deleted file mode 100644
index 45b1436..0000000
--- a/jjb/appc/appc-push-upstream-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 push-upstream is commented on a change on Nordix Gerrit.
-- project:
-    name: appc-push-upstream
-    project: appc
-    project-name: appc
-
-    stream:
-      - master:
-          branch: '{stream}'
-#      - casablanca:
-#          branch: '{stream}'
-
-    jobs:
-      - '{project-name}-{stream}-push-upstream'
diff --git a/jjb/appc/appc-rebase-jobs.yaml b/jjb/appc/appc-rebase-jobs.yaml
deleted file mode 100644
index 707a46d..0000000
--- a/jjb/appc/appc-rebase-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 merged to
-# appc project on ONAP Gerrit.
-
-- project:
-    name: appc-rebase
-    project: appc
-    project-name: appc
-    stream:
-      - master:
-          branch: '{stream}'
-#      - casablanca:
-#          branch: '{stream}'
-    jobs:
-      - '{project-name}-{stream}-rebase'
diff --git a/jjb/appc/appc-verify-jobs.yaml b/jjb/appc/appc-verify-jobs.yaml
deleted file mode 100644
index 8175e26..0000000
--- a/jjb/appc/appc-verify-jobs.yaml
+++ /dev/null
@@ -1,35 +0,0 @@
----
-#
-# ============LICENSE_START=======================================================
-#  Copyright (C) 2018-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
-# appc project on Nordix Gerrit.
-
-- project:
-    name: appc-verify
-    project: appc
-    project-name: appc
-
-    stream:
-      - 'master':
-          branch: '{stream}'
-
-    jobs:
-      - '{project-name}-{stream}-verify-java'
-
diff --git a/jjb/ci-management/ci-management-push-upstream-jobs.yaml b/jjb/ci-management/ci-management-push-upstream-jobs.yaml
deleted file mode 100644
index 90e6160..0000000
--- a/jjb/ci-management/ci-management-push-upstream-jobs.yaml
+++ /dev/null
@@ -1,31 +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 push-upstream is commented on a change on Nordix Gerrit.
-- project:
-    name: ci-management-push-upstream
-    project: ci-management
-    project-name: ci-management
-
-    stream:
-      - master:
-          branch: '{stream}'
-
-    jobs:
-      - '{project-name}-{stream}-push-upstream'
diff --git a/jjb/ci-management/ci-management-rebase-jobs.yaml b/jjb/ci-management/ci-management-rebase-jobs.yaml
deleted file mode 100644
index 7e2eb62..0000000
--- a/jjb/ci-management/ci-management-rebase-jobs.yaml
+++ /dev/null
@@ -1,31 +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 merged to
-# oom project on ONAP Gerrit.
-
-- project:
-    name: ci-management-rebase
-    project: ci-management
-    project-name: ci-management
-    stream:
-      - master:
-          branch: '{stream}'
-    jobs:
-      - '{project-name}-{stream}-rebase'
diff --git a/jjb/dcaegen2/dcaegen2-push-upstream-jobs.yaml b/jjb/dcaegen2/dcaegen2-push-upstream-jobs.yaml
deleted file mode 100644
index f4f4516..0000000
--- a/jjb/dcaegen2/dcaegen2-push-upstream-jobs.yaml
+++ /dev/null
@@ -1,32 +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 push-upstream is commented on a change on Nordix Gerrit.
-- project:
-    name: dcaegen2-push-upstream
-    project: dcaegen2
-    project-name: dcaegen2
-    stream:
-      - master:
-          branch: '{stream}'
-      - casablanca:
-          branch: '{stream}'
-
-    jobs:
-      - '{project-name}-{stream}-push-upstream'
diff --git a/jjb/dcaegen2/dcaegen2-rebase-jobs.yaml b/jjb/dcaegen2/dcaegen2-rebase-jobs.yaml
deleted file mode 100644
index d020a85..0000000
--- a/jjb/dcaegen2/dcaegen2-rebase-jobs.yaml
+++ /dev/null
@@ -1,19 +0,0 @@
----
-# this job gets triggered when a change is merged for
-# the project its configured for
-- project:
-
-    name: dcaegen2-rebase
-
-    project: dcaegen2
-
-    project-name: dcaegen2
-
-    stream:
-      - master:
-          branch: '{stream}'
-      - casablanca:
-          branch: '{stream}'
-
-    jobs:
-      - '{project-name}-{stream}-rebase'
diff --git a/jjb/dcaegen2/dcaegen2-services-pm-mapper-push-upstream-jobs.yaml b/jjb/dcaegen2/dcaegen2-services-pm-mapper-push-upstream-jobs.yaml
deleted file mode 100644
index faf07c3..0000000
--- a/jjb/dcaegen2/dcaegen2-services-pm-mapper-push-upstream-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 push-upstream is commented on a change on Nordix Gerrit.
-- project:
-    name: dcaegen2-services-pm-mapper-push-upstream
-    project: dcaegen2/services/pm-mapper
-    project-name: dcaegen2-services-pm-mapper
-
-    stream:
-      - master:
-          branch: '{stream}'
-      - dublin:
-          branch: '{stream}'
-
-    jobs:
-      - '{project-name}-{stream}-push-upstream'
diff --git a/jjb/dcaegen2/dcaegen2-services-pm-mapper-rebase-jobs.yaml b/jjb/dcaegen2/dcaegen2-services-pm-mapper-rebase-jobs.yaml
deleted file mode 100644
index 5a0cddf..0000000
--- a/jjb/dcaegen2/dcaegen2-services-pm-mapper-rebase-jobs.yaml
+++ /dev/null
@@ -1,34 +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 merged to
-# dcaegen2/services/pm-mapper project on ONAP Gerrit.
-- project:
-    name: pm-mapper-rebase
-    project: dcaegen2/services/pm-mapper
-    project-name: dcaegen2-services-pm-mapper
-
-    stream:
-      - master:
-          branch: '{stream}'
-      - dublin:
-          branch: '{stream}'
-
-    jobs:
-      - '{project-name}-{stream}-rebase'
diff --git a/jjb/dcaegen2/dcaegen2-services-pm-mapper-verify-jobs.yaml b/jjb/dcaegen2/dcaegen2-services-pm-mapper-verify-jobs.yaml
deleted file mode 100644
index 1355637..0000000
--- a/jjb/dcaegen2/dcaegen2-services-pm-mapper-verify-jobs.yaml
+++ /dev/null
@@ -1,34 +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
-# dcaegen2/services/pm-mapper project on Nordix Gerrit.
-- project:
-    name: pm-mapper-verify
-    project: dcaegen2/services/pm-mapper
-    project-name: dcaegen2-services-pm-mapper
-
-    stream:
-      - master:
-          branch: '{stream}'
-      - dublin:
-          branch: '{stream}'
-
-    jobs:
-      - '{project-name}-{stream}-verify-java'
diff --git a/jjb/dcaegen2/dcaegen2-verify-jobs.yaml b/jjb/dcaegen2/dcaegen2-verify-jobs.yaml
deleted file mode 100644
index 397cbb5..0000000
--- a/jjb/dcaegen2/dcaegen2-verify-jobs.yaml
+++ /dev/null
@@ -1,37 +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 for
-# the project its configured for
-- project:
-
-    name: dcaegen2-verify
-
-    project: dcaegen2
-
-    project-name: dcaegen2
-
-    stream:
-      - master:
-          branch: '{stream}'
-      - casablanca:
-          branch: '{stream}'
-
-    jobs:
-      - '{project-name}-{stream}-verify-java'
diff --git a/jjb/dmaap/dmaap-datarouter-push-upstream-jobs.yaml b/jjb/dmaap/dmaap-datarouter-push-upstream-jobs.yaml
deleted file mode 100644
index 2542a9f..0000000
--- a/jjb/dmaap/dmaap-datarouter-push-upstream-jobs.yaml
+++ /dev/null
@@ -1,34 +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 push-upstream is commented on a change on Nordix Gerrit.
-- project:
-    name: dmaap-datarouter-push-upstream
-    project: dmaap/datarouter
-    project-name: dmaap-datarouter
-    stream:
-      - master:
-          branch: '{stream}'
-      - casablanca:
-          branch: '{stream}'
-      - dublin:
-          branch: '{stream}'
-
-    jobs:
-      - '{project-name}-{stream}-push-upstream'
diff --git a/jjb/dmaap/dmaap-datarouter-rebase-jobs.yaml b/jjb/dmaap/dmaap-datarouter-rebase-jobs.yaml
deleted file mode 100644
index 26e9b62..0000000
--- a/jjb/dmaap/dmaap-datarouter-rebase-jobs.yaml
+++ /dev/null
@@ -1,35 +0,0 @@
----
-# ============LICENSE_START=======================================================
-#  Copyright (C) 2018 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
-# dmaap/datarouter project on ONAP Gerrit.
-- project:
-    name: dmaap-datarouter-rebase
-    project: dmaap/datarouter
-    project-name: dmaap-datarouter
-    stream:
-      - master:
-          branch: '{stream}'
-      - casablanca:
-          branch: '{stream}'
-      - dublin:
-          branch: '{stream}'
-
-    jobs:
-      - '{project-name}-{stream}-rebase'
diff --git a/jjb/dmaap/dmaap-datarouter-verify-jobs.yaml b/jjb/dmaap/dmaap-datarouter-verify-jobs.yaml
deleted file mode 100644
index 8760dd9..0000000
--- a/jjb/dmaap/dmaap-datarouter-verify-jobs.yaml
+++ /dev/null
@@ -1,35 +0,0 @@
----
-# ============LICENSE_START=======================================================
-#  Copyright (C) 2018-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
-# dmaap/datarouter project on Nordix Gerrit.
-- project:
-    name: dmaap-datarouter-verify
-    project: dmaap/datarouter
-    project-name: dmaap-datarouter
-    stream:
-      - master:
-          branch: '{stream}'
-      - casablanca:
-          branch: '{stream}'
-      - dublin:
-          branch: '{stream}'
-
-    jobs:
-      - '{project-name}-{stream}-verify-java'
diff --git a/jjb/integration/integration-csit-push-upstream-jobs.yaml b/jjb/integration/integration-csit-push-upstream-jobs.yaml
deleted file mode 100644
index 80738e3..0000000
--- a/jjb/integration/integration-csit-push-upstream-jobs.yaml
+++ /dev/null
@@ -1,34 +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 push-upstream is commented on a change on Nordix Gerrit.
-- project:
-    name: integration-csit-push-upstream
-    project: integration/csit
-    project-name: integration-csit
-    stream:
-      - master:
-          branch: '{stream}'
-      - casablanca:
-          branch: '{stream}'
-      - dublin:
-          branch: '{stream}'
-
-    jobs:
-      - '{project-name}-{stream}-push-upstream'
diff --git a/jjb/integration/integration-csit-rebase-jobs.yaml b/jjb/integration/integration-csit-rebase-jobs.yaml
deleted file mode 100644
index fd53b30..0000000
--- a/jjb/integration/integration-csit-rebase-jobs.yaml
+++ /dev/null
@@ -1,36 +0,0 @@
----
-# ============LICENSE_START=======================================================
-#  Copyright (C) 2018 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/csit project on ONAP Gerrit.
-
-- project:
-    name: integration-csit-rebase
-    project: integration/csit
-    project-name: integration-csit
-    stream:
-      - master:
-          branch: '{stream}'
-      - casablanca:
-          branch: '{stream}'
-      - dublin:
-          branch: '{stream}'
-
-    jobs:
-      - '{project-name}-{stream}-rebase'
\ No newline at end of file
diff --git a/jjb/integration/integration-push-upstream-jobs.yaml b/jjb/integration/integration-push-upstream-jobs.yaml
deleted file mode 100644
index 5edaaa7..0000000
--- a/jjb/integration/integration-push-upstream-jobs.yaml
+++ /dev/null
@@ -1,32 +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 push-upstream is commented on a change on Nordix Gerrit.
-- project:
-    name: integration-push-upstream
-    project: integration
-    project-name: integration
-    stream:
-      - master:
-          branch: '{stream}'
-      - casablanca:
-          branch: '{stream}'
-
-    jobs:
-      - '{project-name}-{stream}-push-upstream'
diff --git a/jjb/integration/integration-rebase-jobs.yaml b/jjb/integration/integration-rebase-jobs.yaml
deleted file mode 100644
index 78cbb3a..0000000
--- a/jjb/integration/integration-rebase-jobs.yaml
+++ /dev/null
@@ -1,34 +0,0 @@
----
-# ============LICENSE_START=======================================================
-#  Copyright (C) 2018 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 project on ONAP Gerrit.
-
-- project:
-    name: integration-rebase
-    project: integration
-    project-name: integration
-    stream:
-      - master:
-          branch: '{stream}'
-      - casablanca:
-          branch: '{stream}'
-
-    jobs:
-      - '{project-name}-{stream}-rebase'
\ No newline at end of file
diff --git a/jjb/onap/appc/appc-push-upstream-jobs.yaml b/jjb/onap/appc/appc-push-upstream-jobs.yaml
index b38e2e8..7831c0d 100644
--- a/jjb/onap/appc/appc-push-upstream-jobs.yaml
+++ b/jjb/onap/appc/appc-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: temp-appc-push-upstream
+    name: appc-push-upstream
     project: appc
-    project-name: temp-appc
+    project-name: appc
 
     stream:
       - master:
diff --git a/jjb/onap/appc/appc-rebase-jobs.yaml b/jjb/onap/appc/appc-rebase-jobs.yaml
index c308b5e..1fb3de3 100644
--- a/jjb/onap/appc/appc-rebase-jobs.yaml
+++ b/jjb/onap/appc/appc-rebase-jobs.yaml
@@ -21,9 +21,9 @@
 # appc project on ONAP Gerrit.
 
 - project:
-    name: temp-appc-rebase
+    name: appc-rebase
     project: appc
-    project-name: temp-appc
+    project-name: appc
     stream:
       - master:
           branch: '{stream}'
diff --git a/jjb/onap/appc/appc-verify-jobs.yaml b/jjb/onap/appc/appc-verify-jobs.yaml
index 8c151fe..f3df7dd 100644
--- a/jjb/onap/appc/appc-verify-jobs.yaml
+++ b/jjb/onap/appc/appc-verify-jobs.yaml
@@ -22,9 +22,9 @@
 # appc project on Nordix Gerrit.
 
 - project:
-    name: temp-appc-verify
+    name: appc-verify
     project: appc
-    project-name: temp-appc
+    project-name: appc
 
     stream:
       - master:
diff --git a/jjb/onap/dcaegen2-services-pm-mapper/dcaegen2-services-pm-mapper-push-upstream-jobs.yaml b/jjb/onap/dcaegen2-services-pm-mapper/dcaegen2-services-pm-mapper-push-upstream-jobs.yaml
index 1059c02..227a935 100644
--- a/jjb/onap/dcaegen2-services-pm-mapper/dcaegen2-services-pm-mapper-push-upstream-jobs.yaml
+++ b/jjb/onap/dcaegen2-services-pm-mapper/dcaegen2-services-pm-mapper-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: temp-dcaegen2-services-pm-mapper-push-upstream
+    name: dcaegen2-services-pm-mapper-push-upstream
     project: dcaegen2/services/pm-mapper
-    project-name: temp-dcaegen2-services-pm-mapper
+    project-name: dcaegen2-services-pm-mapper
 
     stream:
       - master:
diff --git a/jjb/onap/dcaegen2-services-pm-mapper/dcaegen2-services-pm-mapper-rebase-jobs.yaml b/jjb/onap/dcaegen2-services-pm-mapper/dcaegen2-services-pm-mapper-rebase-jobs.yaml
index f71c9ec..0d3f14d 100644
--- a/jjb/onap/dcaegen2-services-pm-mapper/dcaegen2-services-pm-mapper-rebase-jobs.yaml
+++ b/jjb/onap/dcaegen2-services-pm-mapper/dcaegen2-services-pm-mapper-rebase-jobs.yaml
@@ -20,9 +20,9 @@
 # this job gets triggered when a change is merged to
 # dcaegen2/services/pm-mapper project on ONAP Gerrit.
 - project:
-    name: temp-dcaegen2-services-pm-mapper-rebase
+    name: dcaegen2-services-pm-mapper-rebase
     project: dcaegen2/services/pm-mapper
-    project-name: temp-dcaegen2-services-pm-mapper
+    project-name: dcaegen2-services-pm-mapper
 
     stream:
       - master:
diff --git a/jjb/onap/dcaegen2-services-pm-mapper/dcaegen2-services-pm-mapper-verify-jobs.yaml b/jjb/onap/dcaegen2-services-pm-mapper/dcaegen2-services-pm-mapper-verify-jobs.yaml
index 443014f..07d36d3 100644
--- a/jjb/onap/dcaegen2-services-pm-mapper/dcaegen2-services-pm-mapper-verify-jobs.yaml
+++ b/jjb/onap/dcaegen2-services-pm-mapper/dcaegen2-services-pm-mapper-verify-jobs.yaml
@@ -20,9 +20,9 @@
 # this job gets triggered when a change is proposed to
 # dcaegen2/services/pm-mapper project on Nordix Gerrit.
 - project:
-    name: temp-dcaegen2-services-pm-mapper-verify
+    name: dcaegen2-services-pm-mapper-verify
     project: dcaegen2/services/pm-mapper
-    project-name: temp-dcaegen2-services-pm-mapper
+    project-name: dcaegen2-services-pm-mapper
 
     stream:
       - master:
diff --git a/jjb/onap/dcaegen2/dcaegen2-push-upstream-jobs.yaml b/jjb/onap/dcaegen2/dcaegen2-push-upstream-jobs.yaml
index 48d5d8a..f4ab2d5 100644
--- a/jjb/onap/dcaegen2/dcaegen2-push-upstream-jobs.yaml
+++ b/jjb/onap/dcaegen2/dcaegen2-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: temp-dcaegen2-push-upstream
+    name: dcaegen2-push-upstream
     project: dcaegen2
-    project-name: temp-dcaegen2
+    project-name: dcaegen2
     stream:
       - master:
           branch: '{stream}'
diff --git a/jjb/onap/dcaegen2/dcaegen2-rebase-jobs.yaml b/jjb/onap/dcaegen2/dcaegen2-rebase-jobs.yaml
index 3bd4813..a69eaae 100644
--- a/jjb/onap/dcaegen2/dcaegen2-rebase-jobs.yaml
+++ b/jjb/onap/dcaegen2/dcaegen2-rebase-jobs.yaml
@@ -20,9 +20,9 @@
 # this job gets triggered when a change is proposed for
 # the project its configured for dcaegen2
 - project:
-    name: temp-dcaegen2-rebase
+    name: dcaegen2-rebase
     project: dcaegen2
-    project-name: temp-dcaegen2
+    project-name: dcaegen2
 
     stream:
       - master:
diff --git a/jjb/onap/dcaegen2/dcaegen2-verify-jobs.yaml b/jjb/onap/dcaegen2/dcaegen2-verify-jobs.yaml
index 15c74b9..f01607a 100644
--- a/jjb/onap/dcaegen2/dcaegen2-verify-jobs.yaml
+++ b/jjb/onap/dcaegen2/dcaegen2-verify-jobs.yaml
@@ -20,9 +20,9 @@
 # this job gets triggered when a change is proposed for
 # the project its configured for dcaegen2
 - project:
-    name: temp-dcaegen2-verify
+    name: dcaegen2-verify
     project: dcaegen2
-    project-name: temp-dcaegen2
+    project-name: dcaegen2
 
     stream:
       - master:
diff --git a/jjb/onap/dmaap-datarouter/dmaap-datarouter-push-upstream-jobs.yaml b/jjb/onap/dmaap-datarouter/dmaap-datarouter-push-upstream-jobs.yaml
index 20c0fdb..c73aba3 100644
--- a/jjb/onap/dmaap-datarouter/dmaap-datarouter-push-upstream-jobs.yaml
+++ b/jjb/onap/dmaap-datarouter/dmaap-datarouter-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: temp-dmaap-datarouter-push-upstream
+    name: dmaap-datarouter-push-upstream
     project: dmaap/datarouter
-    project-name: temp-dmaap-datarouter
+    project-name: dmaap-datarouter
     stream:
       - master:
           branch: '{stream}'
diff --git a/jjb/onap/dmaap-datarouter/dmaap-datarouter-rebase-jobs.yaml b/jjb/onap/dmaap-datarouter/dmaap-datarouter-rebase-jobs.yaml
index 4f2234f..a0a7005 100644
--- a/jjb/onap/dmaap-datarouter/dmaap-datarouter-rebase-jobs.yaml
+++ b/jjb/onap/dmaap-datarouter/dmaap-datarouter-rebase-jobs.yaml
@@ -20,9 +20,9 @@
 # this job gets triggered when a change is merged to
 # dmaap/datarouter project on ONAP Gerrit.
 - project:
-    name: temp-dmaap-datarouter-rebase
+    name: dmaap-datarouter-rebase
     project: dmaap/datarouter
-    project-name: temp-dmaap-datarouter
+    project-name: dmaap-datarouter
     stream:
       - master:
           branch: '{stream}'
diff --git a/jjb/onap/dmaap-datarouter/dmaap-datarouter-verify-jobs.yaml b/jjb/onap/dmaap-datarouter/dmaap-datarouter-verify-jobs.yaml
index d26b57e..6ec2999 100644
--- a/jjb/onap/dmaap-datarouter/dmaap-datarouter-verify-jobs.yaml
+++ b/jjb/onap/dmaap-datarouter/dmaap-datarouter-verify-jobs.yaml
@@ -20,9 +20,9 @@
 # this job gets triggered when a change is proposed to
 # dmaap/datarouter project on Nordix Gerrit.
 - project:
-    name: temp-dmaap-datarouter-verify
+    name: dmaap-datarouter-verify
     project: dmaap/datarouter
-    project-name: temp-dmaap-datarouter
+    project-name: dmaap-datarouter
     stream:
       - master:
           branch: '{stream}'
diff --git a/jjb/onap/integration-csit/integration-csit-push-upstream-jobs.yaml b/jjb/onap/integration-csit/integration-csit-push-upstream-jobs.yaml
index b55dc0a..eb86c51 100644
--- a/jjb/onap/integration-csit/integration-csit-push-upstream-jobs.yaml
+++ b/jjb/onap/integration-csit/integration-csit-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: temp-integration-csit-push-upstream
+    name: integration-csit-push-upstream
     project: integration/csit
-    project-name: temp-integration-csit
+    project-name: integration-csit
     stream:
       - master:
           branch: '{stream}'
diff --git a/jjb/onap/integration-csit/integration-csit-rebase-jobs.yaml b/jjb/onap/integration-csit/integration-csit-rebase-jobs.yaml
index 9dfba7e..aab79c8 100644
--- a/jjb/onap/integration-csit/integration-csit-rebase-jobs.yaml
+++ b/jjb/onap/integration-csit/integration-csit-rebase-jobs.yaml
@@ -21,9 +21,9 @@
 # integration/csit project on ONAP Gerrit.
 
 - project:
-    name: temp-integration-csit-rebase
+    name: integration-csit-rebase
     project: integration/csit
-    project-name: temp-integration-csit
+    project-name: integration-csit
     stream:
       - master:
           branch: '{stream}'
diff --git a/jjb/onap/integration/integration-push-upstream-jobs.yaml b/jjb/onap/integration/integration-push-upstream-jobs.yaml
index 4a2b080..533ff56 100644
--- a/jjb/onap/integration/integration-push-upstream-jobs.yaml
+++ b/jjb/onap/integration/integration-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: temp-integration-push-upstream
+    name: integration-push-upstream
     project: integration
-    project-name: temp-integration
+    project-name: integration
     stream:
       - master:
           branch: '{stream}'
diff --git a/jjb/onap/integration/integration-rebase-jobs.yaml b/jjb/onap/integration/integration-rebase-jobs.yaml
index f77bee1..4f53d29 100644
--- a/jjb/onap/integration/integration-rebase-jobs.yaml
+++ b/jjb/onap/integration/integration-rebase-jobs.yaml
@@ -21,9 +21,9 @@
 # integration project on ONAP Gerrit.
 
 - project:
-    name: temp-integration-rebase
+    name: integration-rebase
     project: integration
-    project-name: temp-integration
+    project-name: integration
     stream:
       - master:
           branch: '{stream}'
diff --git a/jjb/onap/policy-apex-pdp/policy-apex-pdp-push-upstream-jobs.yaml b/jjb/onap/policy-apex-pdp/policy-apex-pdp-push-upstream-jobs.yaml
index 2e2a609..7da2279 100644
--- a/jjb/onap/policy-apex-pdp/policy-apex-pdp-push-upstream-jobs.yaml
+++ b/jjb/onap/policy-apex-pdp/policy-apex-pdp-push-upstream-jobs.yaml
@@ -20,9 +20,9 @@
 
 # this job gets triggered when push-upstream is commented on a change on Nordix Gerrit.
 - project:
-    name: temp-policy-apex-pdp-push-upstream
+    name: policy-apex-pdp-push-upstream
     project: policy/apex-pdp
-    project-name: temp-policy-apex-pdp
+    project-name: policy-apex-pdp
     stream:
       - master:
           branch: '{stream}'
diff --git a/jjb/onap/policy-apex-pdp/policy-apex-pdp-rebase-jobs.yaml b/jjb/onap/policy-apex-pdp/policy-apex-pdp-rebase-jobs.yaml
index 5b891f3..e1a7d55 100644
--- a/jjb/onap/policy-apex-pdp/policy-apex-pdp-rebase-jobs.yaml
+++ b/jjb/onap/policy-apex-pdp/policy-apex-pdp-rebase-jobs.yaml
@@ -21,9 +21,9 @@
 # this job gets triggered when a change is merged to
 # policy/apex-pdp project on ONAP Gerrit.
 - project:
-    name: temp-policy-apex-pdp-rebase
+    name: policy-apex-pdp-rebase
     project: policy/apex-pdp
-    project-name: temp-policy-apex-pdp
+    project-name: policy-apex-pdp
 
     stream:
       - master:
diff --git a/jjb/onap/policy-apex-pdp/policy-apex-pdp-verify-jobs.yaml b/jjb/onap/policy-apex-pdp/policy-apex-pdp-verify-jobs.yaml
index 51ce7ac..f003f6a 100644
--- a/jjb/onap/policy-apex-pdp/policy-apex-pdp-verify-jobs.yaml
+++ b/jjb/onap/policy-apex-pdp/policy-apex-pdp-verify-jobs.yaml
@@ -22,9 +22,9 @@
 # policy/apex-pdp project on Nordix Gerrit.
 
 - project:
-    name: temp-policy-apex-pdp-verify
+    name: policy-apex-pdp-verify
     project: policy/apex-pdp
-    project-name: temp-policy-apex-pdp
+    project-name: policy-apex-pdp
 
     stream:
       - master:
diff --git a/jjb/onap/policy-pap/policy-pap-push-upstream-jobs.yaml b/jjb/onap/policy-pap/policy-pap-push-upstream-jobs.yaml
index c7e23a2..7e59787 100644
--- a/jjb/onap/policy-pap/policy-pap-push-upstream-jobs.yaml
+++ b/jjb/onap/policy-pap/policy-pap-push-upstream-jobs.yaml
@@ -20,9 +20,9 @@
 
 # this job gets triggered when push-upstream is commented on a change on Nordix Gerrit.
 - project:
-    name: temp-policy-pap-push-upstream
+    name: policy-pap-push-upstream
     project: policy/pap
-    project-name: temp-policy-pap
+    project-name: policy-pap
     stream:
       - master:
           branch: '{stream}'
diff --git a/jjb/onap/policy-pap/policy-pap-rebase-jobs.yaml b/jjb/onap/policy-pap/policy-pap-rebase-jobs.yaml
index 6c46402..a28ab2c 100644
--- a/jjb/onap/policy-pap/policy-pap-rebase-jobs.yaml
+++ b/jjb/onap/policy-pap/policy-pap-rebase-jobs.yaml
@@ -21,9 +21,9 @@
 # this job gets triggered when a change is merged to
 # policy/pap project on ONAP Gerrit.
 - project:
-    name: temp-policy-pap-rebase
+    name: policy-pap-rebase
     project: policy/pap
-    project-name: temp-policy-pap
+    project-name: policy-pap
 
     stream:
       - master:
diff --git a/jjb/onap/policy-pap/policy-pap-verify-jobs.yaml b/jjb/onap/policy-pap/policy-pap-verify-jobs.yaml
index e02ad1d..7e93e07 100644
--- a/jjb/onap/policy-pap/policy-pap-verify-jobs.yaml
+++ b/jjb/onap/policy-pap/policy-pap-verify-jobs.yaml
@@ -22,9 +22,9 @@
 # policy/pap project on Nordix Gerrit.
 
 - project:
-    name: temp-policy-pap-verify
+    name: policy-pap-verify
     project: policy/pap
-    project-name: temp-policy-pap
+    project-name: policy-pap
 
     stream:
       - master:
diff --git a/jjb/onap/sdc/sdc-push-upstream-jobs.yaml b/jjb/onap/sdc/sdc-push-upstream-jobs.yaml
index 40c8978..6fda29f 100644
--- a/jjb/onap/sdc/sdc-push-upstream-jobs.yaml
+++ b/jjb/onap/sdc/sdc-push-upstream-jobs.yaml
@@ -20,9 +20,9 @@
 
 # this job gets triggered when push-upstream is commented on a change on Nordix Gerrit.
 - project:
-    name: temp-sdc-push-upstream
+    name: sdc-push-upstream
     project: sdc
-    project-name: temp-sdc
+    project-name: sdc
     stream:
       - master:
           branch: '{stream}'
diff --git a/jjb/onap/sdc/sdc-rebase-jobs.yaml b/jjb/onap/sdc/sdc-rebase-jobs.yaml
index 2b9c858..46c9a62 100644
--- a/jjb/onap/sdc/sdc-rebase-jobs.yaml
+++ b/jjb/onap/sdc/sdc-rebase-jobs.yaml
@@ -21,9 +21,9 @@
 # this job gets triggered when a change is merged to
 # sdc project on ONAP Gerrit.
 - project:
-    name: temp-sdc-rebase
+    name: sdc-rebase
     project: sdc
-    project-name: temp-sdc
+    project-name: sdc
 
     stream:
       - master:
diff --git a/jjb/onap/so-docker-config/so-docker-config-push-upstream-jobs.yaml b/jjb/onap/so-docker-config/so-docker-config-push-upstream-jobs.yaml
index fd22652..c3bfc12 100644
--- a/jjb/onap/so-docker-config/so-docker-config-push-upstream-jobs.yaml
+++ b/jjb/onap/so-docker-config/so-docker-config-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: temp-so-docker-config-push-upstream
+    name: so-docker-config-push-upstream
     project: so/docker-config
-    project-name: temp-so-docker-config
+    project-name: so-docker-config
 
     stream:
       - master:
diff --git a/jjb/onap/so-docker-config/so-docker-config-rebase-jobs.yaml b/jjb/onap/so-docker-config/so-docker-config-rebase-jobs.yaml
index a82dd0b..55b22a8 100644
--- a/jjb/onap/so-docker-config/so-docker-config-rebase-jobs.yaml
+++ b/jjb/onap/so-docker-config/so-docker-config-rebase-jobs.yaml
@@ -21,9 +21,9 @@
 # so/docker-config project on ONAP Gerrit.
 
 - project:
-    name: temp-so-docker-config-rebase
+    name: so-docker-config-rebase
     project: so/docker-config
-    project-name: temp-so-docker-config
+    project-name: so-docker-config
     stream:
       - master:
           branch: '{stream}'
diff --git a/jjb/onap/so/so-push-upstream-jobs.yaml b/jjb/onap/so/so-push-upstream-jobs.yaml
index 9242364..ffebb56 100644
--- a/jjb/onap/so/so-push-upstream-jobs.yaml
+++ b/jjb/onap/so/so-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: temp-so-push-upstream
+    name: so-push-upstream
     project: so
-    project-name: temp-so
+    project-name: so
 
     stream:
       - master:
diff --git a/jjb/onap/so/so-rebase-jobs.yaml b/jjb/onap/so/so-rebase-jobs.yaml
index ef6bf38..2d4601d 100644
--- a/jjb/onap/so/so-rebase-jobs.yaml
+++ b/jjb/onap/so/so-rebase-jobs.yaml
@@ -21,9 +21,9 @@
 # so project on ONAP Gerrit.
 
 - project:
-    name: temp-so-rebase
+    name: so-rebase
     project: so
-    project-name: temp-so
+    project-name: so
     stream:
       - master:
           branch: '{stream}'
diff --git a/jjb/policy/policy-apex-pdp-push-upstream-jobs.yaml b/jjb/policy/policy-apex-pdp-push-upstream-jobs.yaml
deleted file mode 100644
index dfdbfa6..0000000
--- a/jjb/policy/policy-apex-pdp-push-upstream-jobs.yaml
+++ /dev/null
@@ -1,31 +0,0 @@
----
-# ============LICENSE_START=======================================================
-#  Copyright (C) 2018-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 push-upstream is commented on a change on Nordix Gerrit.
-- project:
-    name: policy-apex-pdp-push-upstream
-    project: policy/apex-pdp
-    project-name: policy-apex-pdp
-    stream:
-      - master:
-          branch: '{stream}'
-
-    jobs:
-      - '{project-name}-{stream}-push-upstream'
diff --git a/jjb/policy/policy-apex-pdp-rebase-jobs.yaml b/jjb/policy/policy-apex-pdp-rebase-jobs.yaml
deleted file mode 100644
index 2cbda19..0000000
--- a/jjb/policy/policy-apex-pdp-rebase-jobs.yaml
+++ /dev/null
@@ -1,35 +0,0 @@
----
-# ============LICENSE_START=======================================================
-#  Copyright (C) 2018-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
-# policy/apex-pdp project on ONAP Gerrit.
-- project:
-    name: policy-apex-pdp-rebase
-    project: policy/apex-pdp
-    project-name: policy-apex-pdp
-
-    stream:
-      - master:
-          branch: '{stream}'
-#      - casablanca:
-#          branch: '{stream}'
-
-    jobs:
-      - '{project-name}-{stream}-rebase'
diff --git a/jjb/policy/policy-apex-pdp-verify-jobs.yaml b/jjb/policy/policy-apex-pdp-verify-jobs.yaml
deleted file mode 100644
index 485e80c..0000000
--- a/jjb/policy/policy-apex-pdp-verify-jobs.yaml
+++ /dev/null
@@ -1,36 +0,0 @@
----
-#
-# ============LICENSE_START=======================================================
-#  Copyright (C) 2018-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
-# policy/apex-pdp project on Nordix Gerrit.
-
-- project:
-    name: policy-apex-pdp-verify
-    project: policy/apex-pdp
-    project-name: policy-apex-pdp
-
-    stream:
-      - 'master':
-          branch: '{stream}'
-      - 'casablanca':
-          branch: '{stream}'
-
-    jobs:
-      - '{project-name}-{stream}-verify-java'
diff --git a/jjb/policy/policy-pap-push-upstream-jobs.yaml b/jjb/policy/policy-pap-push-upstream-jobs.yaml
deleted file mode 100644
index 676f3ff..0000000
--- a/jjb/policy/policy-pap-push-upstream-jobs.yaml
+++ /dev/null
@@ -1,31 +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 push-upstream is commented on a change on Nordix Gerrit.
-- project:
-    name: policy-pap-push-upstream
-    project: policy/pap
-    project-name: policy-pap
-    stream:
-      - master:
-          branch: '{stream}'
-
-    jobs:
-      - '{project-name}-{stream}-push-upstream'
diff --git a/jjb/policy/policy-pap-rebase-jobs.yaml b/jjb/policy/policy-pap-rebase-jobs.yaml
deleted file mode 100644
index 60ba9ad..0000000
--- a/jjb/policy/policy-pap-rebase-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 merged to
-# policy/pap project on ONAP Gerrit.
-- project:
-    name: policy-pap-rebase
-    project: policy/pap
-    project-name: policy-pap
-
-    stream:
-      - master:
-          branch: '{stream}'
-
-    jobs:
-      - '{project-name}-{stream}-rebase'
diff --git a/jjb/policy/policy-pap-verify-jobs.yaml b/jjb/policy/policy-pap-verify-jobs.yaml
deleted file mode 100644
index f8b011e..0000000
--- a/jjb/policy/policy-pap-verify-jobs.yaml
+++ /dev/null
@@ -1,34 +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
-# policy/pap project on Nordix Gerrit.
-
-- project:
-    name: policy-pap-verify
-    project: policy/pap
-    project-name: policy-pap
-
-    stream:
-      - 'master':
-          branch: '{stream}'
-
-    jobs:
-      - '{project-name}-{stream}-verify-java'
diff --git a/jjb/sdc/sdc-push-upstream-jobs.yaml b/jjb/sdc/sdc-push-upstream-jobs.yaml
deleted file mode 100644
index 8402a1b..0000000
--- a/jjb/sdc/sdc-push-upstream-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 push-upstream is commented on a change on Nordix Gerrit.
-- project:
-    name: sdc-push-upstream
-    project: sdc
-    project-name: sdc
-    stream:
-      - master:
-          branch: '{stream}'
-      - dublin:
-          branch: '{stream}'
-
-    jobs:
-      - '{project-name}-{stream}-push-upstream'
diff --git a/jjb/sdc/sdc-rebase-jobs.yaml b/jjb/sdc/sdc-rebase-jobs.yaml
deleted file mode 100644
index d46c8bb..0000000
--- a/jjb/sdc/sdc-rebase-jobs.yaml
+++ /dev/null
@@ -1,35 +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 merged to
-# sdc project on ONAP Gerrit.
-- project:
-    name: sdc-rebase
-    project: sdc
-    project-name: sdc
-
-    stream:
-      - master:
-          branch: '{stream}'
-      - dublin:
-          branch: '{stream}'
-
-    jobs:
-      - '{project-name}-{stream}-rebase'
diff --git a/jjb/so/so-docker-config-push-upstream-jobs.yaml b/jjb/so/so-docker-config-push-upstream-jobs.yaml
deleted file mode 100644
index 44a591a..0000000
--- a/jjb/so/so-docker-config-push-upstream-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 push-upstream is commented on a change on Nordix Gerrit.
-- project:
-    name: so-docker-config-push-upstream
-    project: so/docker-config
-    project-name: so-docker-config
-
-    stream:
-      - master:
-          branch: '{stream}'
-      - dublin:
-          branch: '{stream}'
-
-    jobs:
-      - '{project-name}-{stream}-push-upstream'
diff --git a/jjb/so/so-docker-config-rebase-jobs.yaml b/jjb/so/so-docker-config-rebase-jobs.yaml
deleted file mode 100644
index e49fe18..0000000
--- a/jjb/so/so-docker-config-rebase-jobs.yaml
+++ /dev/null
@@ -1,34 +0,0 @@
----
-# ============LICENSE_START=======================================================
-#  Copyright (C) 2018 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
-# so/docker-config project on ONAP Gerrit.
-
-- project:
-    name: so-docker-config-rebase
-    project: so/docker-config
-    project-name: so-docker-config
-    stream:
-      - master:
-          branch: '{stream}'
-      - dublin:
-          branch: '{stream}'
-
-    jobs:
-      - '{project-name}-{stream}-rebase'
\ No newline at end of file
diff --git a/jjb/so/so-push-upstream-jobs.yaml b/jjb/so/so-push-upstream-jobs.yaml
deleted file mode 100644
index c212866..0000000
--- a/jjb/so/so-push-upstream-jobs.yaml
+++ /dev/null
@@ -1,35 +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 push-upstream is commented on a change on Nordix Gerrit.
-- project:
-    name: so-push-upstream
-    project: so
-    project-name: so
-
-    stream:
-      - master:
-          branch: '{stream}'
-      - casablanca:
-          branch: '{stream}'
-      - dublin:
-          branch: '{stream}'
-
-    jobs:
-      - '{project-name}-{stream}-push-upstream'
diff --git a/jjb/so/so-rebase-jobs.yaml b/jjb/so/so-rebase-jobs.yaml
deleted file mode 100644
index fb91557..0000000
--- a/jjb/so/so-rebase-jobs.yaml
+++ /dev/null
@@ -1,36 +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 merged to
-# so project on ONAP Gerrit.
-
-- project:
-    name: so-rebase
-    project: so
-    project-name: so
-    stream:
-      - master:
-          branch: '{stream}'
-      - casablanca:
-          branch: '{stream}'
-      - dublin:
-          branch: '{stream}'
-
-    jobs:
-      - '{project-name}-{stream}-rebase'