8 files changed, 109 insertions, 20 deletions
diff --git a/jjb/include-docker-login.sh b/jjb/include-docker-login.sh
index 89b25163a..3b677b46d 100644
--- a/jjb/include-docker-login.sh
+++ b/jjb/include-docker-login.sh
@@ -6,7 +6,21 @@ DOCKER_REPOSITORIES="nexus3.openecomp.org:10001 \
 
 for DOCKER_REPOSITORY in $DOCKER_REPOSITORIES;
 do
-    USER=$(xpath -q -e "//servers/server[id='$DOCKER_REPOSITORY']/username/text()" "$SETTINGS_FILE")
-    PASS=$(xpath -q -e "//servers/server[id='$DOCKER_REPOSITORY']/password/text()" "$SETTINGS_FILE")
-    docker login $DOCKER_REPOSITORY -u $USER -p $PASS
+    echo $DOCKER_REPOSITORY
+    USER=$(xpath -e "//servers/server[id='$DOCKER_REPOSITORY']/username/text()" "$SETTINGS_FILE")
+    PASS=$(xpath -e "//servers/server[id='$DOCKER_REPOSITORY']/password/text()" "$SETTINGS_FILE")
+
+    if [ -z "$USER" ];
+    then
+        echo "Error: no user provided"
+    fi
+
+    if [ -z "$PASS" ];
+    then
+        echo "Error: no password provided"
+    fi
+
+    [ -z "$PASS" ] && PASS_PROVIDED="<empty>" || PASS_PROVIDED="<password>"
+    echo docker login $DOCKER_REPOSITORY -u "$USER" -p "$PASS_PROVIDED"
+    docker login $DOCKER_REPOSITORY -u "$USER" -p "$PASS"
 done
diff --git a/jjb/ncomp/ncomp-maven.yaml b/jjb/ncomp/ncomp-maven.yaml
new file mode 100644
index 000000000..9a1d2ad62
--- /dev/null
+++ b/jjb/ncomp/ncomp-maven.yaml
@@ -0,0 +1,21 @@
+---
+- project:
+    name: ncomp-maven
+    project-name: 'ncomp-maven'
+    jobs:
+      - '{project-name}-{stream}-verify-java'
+      - '{project-name}-{stream}-merge-java'
+      - '{project-name}-{stream}-release-java-daily'
+
+    project: 'ncomp/maven'
+    stream:
+      - 'master':
+          branch: 'master'
+    mvn-settings: 'ncomp-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: ''
diff --git a/jjb/sdc/sdc_distribution_client.yaml b/jjb/policy/policy-common.yaml
index 3425ddd0c..ac5d92186 100644
--- a/jjb/sdc/sdc_distribution_client.yaml
+++ b/jjb/policy/policy-common.yaml
@@ -1,16 +1,16 @@
 ---
-
 - project:
-    name: sdc_distribution_client
-    project-name: 'sdc_distribution_client'
+    name: policy-common
+    project-name: 'policy-common'
     jobs:
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
+      - '{project-name}-{stream}-release-java-daily'
 
-    project: 'sdc_distribution_client'
+    project: 'policy/common'
     stream:
       - 'master':
           branch: 'master'
-    mvn-settings: 'sdc_distribution_client-settings'
+    mvn-settings: 'policy-common-settings'
     files: '**'
     archive-artifacts: ''
diff --git a/jjb/policy/policy-drools-applications.yaml b/jjb/policy/policy-drools-applications.yaml
new file mode 100644
index 000000000..4af3bf217
--- /dev/null
+++ b/jjb/policy/policy-drools-applications.yaml
@@ -0,0 +1,16 @@
+---
+- project:
+    name: policy-drools-applications
+    project-name: 'policy-drools-applications'
+    jobs:
+      - '{project-name}-{stream}-verify-java'
+      - '{project-name}-{stream}-merge-java'
+      - '{project-name}-{stream}-release-java-daily'
+
+    project: 'policy/drools-applications'
+    stream:
+      - 'master':
+          branch: 'master'
+    mvn-settings: 'policy-drools-applications-settings'
+    files: '**'
+    archive-artifacts: ''
diff --git a/jjb/policy/policy-drools-pdp.yaml b/jjb/policy/policy-drools-pdp.yaml
new file mode 100644
index 000000000..3ea404a34
--- /dev/null
+++ b/jjb/policy/policy-drools-pdp.yaml
@@ -0,0 +1,16 @@
+---
+- project:
+    name: policy-drools-pdp
+    project-name: 'policy-drools-pdp'
+    jobs:
+      - '{project-name}-{stream}-verify-java'
+      - '{project-name}-{stream}-merge-java'
+      - '{project-name}-{stream}-release-java-daily'
+
+    project: 'policy/drools-pdp'
+    stream:
+      - 'master':
+          branch: 'master'
+    mvn-settings: 'policy-drools-pdp-settings'
+    files: '**'
+    archive-artifacts: ''
diff --git a/jjb/policy/policy-engine.yaml b/jjb/policy/policy-engine.yaml
new file mode 100644
index 000000000..920e7f991
--- /dev/null
+++ b/jjb/policy/policy-engine.yaml
@@ -0,0 +1,16 @@
+---
+- project:
+    name: policy-engine
+    project-name: 'policy-engine'
+    jobs:
+      - '{project-name}-{stream}-verify-java'
+      - '{project-name}-{stream}-merge-java'
+      - '{project-name}-{stream}-release-java-daily'
+
+    project: 'policy/engine'
+    stream:
+      - 'master':
+          branch: 'master'
+    mvn-settings: 'policy-engine-settings'
+    files: '**'
+    archive-artifacts: ''
diff --git a/jjb/sdc/sdc-sdc-distribution-client.yaml b/jjb/sdc/sdc-sdc-distribution-client.yaml
new file mode 100644
index 000000000..0e7ce3657
--- /dev/null
+++ b/jjb/sdc/sdc-sdc-distribution-client.yaml
@@ -0,0 +1,16 @@
+---
+
+- project:
+    name: sdc-sdc-distribution-client
+    project-name: 'sdc-sdc-distribution-client'
+    jobs:
+      - '{project-name}-{stream}-verify-java'
+      - '{project-name}-{stream}-merge-java'
+
+    project: 'sdc/sdc-distribution-client'
+    stream:
+      - 'master':
+          branch: 'master'
+    mvn-settings: 'sdc-sdc-distribution-client-settings'
+    files: '**'
+    archive-artifacts: ''
diff --git a/jjb/ui/ui-dmaapbc.yaml b/jjb/ui/ui-dmaapbc.yaml
index 0863cc118..ab1529e0c 100644
--- a/jjb/ui/ui-dmaapbc.yaml
+++ b/jjb/ui/ui-dmaapbc.yaml
@@ -2,20 +2,10 @@
 - project:
     name: ui-dmaapbc
     project-name: 'ui-dmaapbc'
-    subproject:
-      - 'dcae_dmaapbc_client':
-          pom: 'dcae_dmaapbc_client/pom.xml'
-          pattern: 'dcae_dmaapbc_client/**'
-      - 'dcae_dmaapbc_model':
-          pom: 'dcae_dmaapbc_model/pom.xml'
-          pattern: 'dcae_dmaapbc_model/**'
-      - 'dcae_dmaapbc_webapp':
-          pom: 'dcae_dmaapbc_webapp/pom.xml'
-          pattern: 'dcae_dmaapbc_webapp/**'
 
     jobs:
-      - '{project-name}-{stream}-{subproject}-verify-java'
-      - '{project-name}-{stream}-{subproject}-merge-java'
+      - '{project-name}-{stream}-verify-java'
+      - '{project-name}-{stream}-merge-java'
 
     project: 'ui/dmaapbc'
     stream: