4 files changed, 49 insertions, 117 deletions
diff --git a/jjb/ccsdk/dashboard.yaml b/jjb/ccsdk/dashboard.yaml
new file mode 100644
index 000000000..e5ecc104e
--- /dev/null
+++ b/jjb/ccsdk/dashboard.yaml
@@ -0,0 +1,49 @@
+---
+- project:
+    name: ccsdk-dashboard
+    project-name: 'ccsdk-dashboard'
+    jobs:
+      - '{project-name}-{stream}-verify-java'
+      - '{project-name}-{stream}-merge-java'
+      - '{project-name}-{stream}-release-version-java-daily'
+
+    project: 'ccsdk/dashboard'
+    stream:
+      - 'master':
+          branch: 'master'
+    mvn-settings: 'ccsdk-dashboard-settings'
+    # due to a strange macro / variable translation problem this needs to be
+    # passed as a string block to properly get the properties correctly defined
+    # in the job
+    maven-deploy-properties: |
+      deployAtEnd=true
+    files: '**'
+    archive-artifacts: ''
+    build-node: centos7-redis-4c-4g
+
+- project:
+    name: ccsdk-dashboard-sonar
+    jobs:
+      - gerrit-maven-sonar
+    cron: '@daily'
+    build-node: centos7-redis-4c-4g
+    project: 'ccsdk/dashboard'
+    project-name: 'ccsdk-dashboard'
+    branch: 'master'
+    mvn-settings: 'ccsdk-dashboard-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+
+- project:
+    name: ccsdk-dashboard-clm
+    jobs:
+      - gerrit-maven-clm
+    nexus-iq-namespace: 'onap-'
+    project: 'ccsdk/dashboard'
+    project-name: 'ccsdk-dashboard'
+    stream:
+      - 'master':
+          branch: 'master'
+    mvn-settings: 'ccsdk-dashboard-settings'
+    build-node: centos7-redis-4c-4g
+
diff --git a/jjb/policy/policy-core.yaml b/jjb/policy/policy-core.yaml
deleted file mode 100644
index b9bf001e4..000000000
--- a/jjb/policy/policy-core.yaml
+++ /dev/null
@@ -1,39 +0,0 @@
----
-- project:
-    name: policy-core
-    project-name: 'policy-core'
-    jobs:
-      - '{project-name}-{stream}-verify-java'
-      - '{project-name}-{stream}-merge-java'
-
-    project: 'policy/core'
-    stream:
-      - 'master':
-          branch: 'master'
-    mvn-settings: 'policy-core-settings'
-    files: '**'
-    archive-artifacts: ''
-    build-node: ubuntu1604-builder-4c-4g
-
-- project:
-    name: policy-core-sonar
-    jobs:
-      - gerrit-maven-sonar
-    cron: '@daily'
-    build-node: ubuntu1604-builder-4c-4g
-    project: 'policy/core'
-    project-name: 'policy-core'
-    branch: 'master'
-    mvn-settings: 'policy-core-settings'
-    mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-
-- project:
-    name: policy-core-clm
-    jobs:
-      - gerrit-maven-clm
-    nexus-iq-namespace: 'onap-'
-    project: policy/core
-    project-name: 'policy-core'
-    branch: 'master'
-    mvn-settings: 'policy-core-settings'
diff --git a/jjb/policy/policy-gui.yaml b/jjb/policy/policy-gui.yaml
deleted file mode 100644
index dd621599a..000000000
--- a/jjb/policy/policy-gui.yaml
+++ /dev/null
@@ -1,39 +0,0 @@
----
-- project:
-    name: policy-gui
-    project-name: 'policy-gui'
-    jobs:
-      - '{project-name}-{stream}-verify-java'
-      - '{project-name}-{stream}-merge-java'
-
-    project: 'policy/gui'
-    stream:
-      - 'master':
-          branch: 'master'
-    mvn-settings: 'policy-gui-settings'
-    files: '**'
-    archive-artifacts: ''
-    build-node: ubuntu1604-builder-4c-4g
-
-- project:
-    name: policy-gui-sonar
-    jobs:
-      - gerrit-maven-sonar
-    cron: '@daily'
-    build-node: ubuntu1604-builder-4c-4g
-    project: 'policy/gui'
-    project-name: 'policy-gui'
-    branch: 'master'
-    mvn-settings: 'policy-gui-settings'
-    mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-
-- project:
-    name: policy-gui-clm
-    jobs:
-      - gerrit-maven-clm
-    nexus-iq-namespace: 'onap-'
-    project: policy/gui
-    project-name: 'policy-gui'
-    branch: 'master'
-    mvn-settings: 'policy-gui-settings'
diff --git a/jjb/policy/policy-pdp.yaml b/jjb/policy/policy-pdp.yaml
deleted file mode 100644
index fd93a3c3d..000000000
--- a/jjb/policy/policy-pdp.yaml
+++ /dev/null
@@ -1,39 +0,0 @@
----
-- project:
-    name: policy-pdp
-    project-name: 'policy-pdp'
-    jobs:
-      - '{project-name}-{stream}-verify-java'
-      - '{project-name}-{stream}-merge-java'
-
-    project: 'policy/pdp'
-    stream:
-      - 'master':
-          branch: 'master'
-    mvn-settings: 'policy-pdp-settings'
-    files: '**'
-    archive-artifacts: ''
-    build-node: ubuntu1604-builder-4c-4g
-
-- project:
-    name: policy-pdp-sonar
-    jobs:
-      - gerrit-maven-sonar
-    cron: '@daily'
-    build-node: ubuntu1604-builder-4c-4g
-    project: 'policy/pdp'
-    project-name: 'policy-pdp'
-    branch: 'master'
-    mvn-settings: 'policy-pdp-settings'
-    mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-
-- project:
-    name: policy-pdp-clm
-    jobs:
-      - gerrit-maven-clm
-    nexus-iq-namespace: 'onap-'
-    project: policy/pdp
-    project-name: 'policy-pdp'
-    branch: 'master'
-    mvn-settings: 'policy-pdp-settings'