7 files changed, 14 insertions, 11 deletions
diff --git a/jjb/dcae/script-dmaapbc-merge.sh b/jjb/dcae/script-dmaapbc-merge.sh
index a80190f10..dd350917e 100755
--- a/jjb/dcae/script-dmaapbc-merge.sh
+++ b/jjb/dcae/script-dmaapbc-merge.sh
@@ -8,13 +8,13 @@
 # !!! make sure the yaml file include docker-login as a builder before calling
 # this script
 
-IMAGE="dcae_dmaapbc"
-TAG="1.0.0"
+IMAGE='dcae_dmaapbc'
+TAG='1.0.0'
 LFQI="${IMAGE}:${TAG}"
 BUILD_PATH="${WORKSPACE}"
 
 # build a docker image
-docker build --rm -f ${WORKSPACE}/Dockerfile -t ${LFQI} ${BUILD_PATH}
+docker build --rm -f "${WORKSPACE}"/Dockerfile -t "${LFQI}" "${BUILD_PATH}"
 
 
 #
@@ -23,7 +23,7 @@ docker build --rm -f ${WORKSPACE}/Dockerfile -t ${LFQI} ${BUILD_PATH}
 # io registry  DOCKER_REPOSITORIES="nexus3.openecomp.org:10001 \
 # release registry                   nexus3.openecomp.org:10002 \
 # snapshot registry                   nexus3.openecomp.org:10003"
-REPO="nexus3.openecomp.org:10002"
+REPO='nexus3.openecomp.org:10003'
 RFQI="${REPO}/${LFQI}"
 docker tag ${LFQI} ${RFQI}
 docker push ${RFQI}
diff --git a/jjb/policy/include-raw-docker.sh b/jjb/policy/include-raw-docker.sh
index 642d8c23b..735b59d98 100644
--- a/jjb/policy/include-raw-docker.sh
+++ b/jjb/policy/include-raw-docker.sh
@@ -2,12 +2,15 @@
 #
 echo '============== STARTING SCRIPT TO BUILD DOCKER IMAGES ================='
 
+
+DOCKER_REPOSITORY=nexus3.openecomp.org:10003
+
 for image in policy-os policy-nexus policy-db policy-base policy-drools policy-pe ; do
     mkdir -p target/$image
     cp $image/* target/$image
-    docker build --quiet --tag ${DOCKER_REPOSITORY}/policy/$image target/$image
+    docker build --quiet --tag ${DOCKER_REPOSITORY}/policy:$image target/$image
 done
 
 for image in policy-nexus policy-db policy-drools policy-pe; do
-    docker push ${DOCKER_REPOSITORY}/policy/$image
+    docker push ${DOCKER_REPOSITORY}/policy:$image
 done
diff --git a/jjb/sdnc/sdnc-adaptors.yaml b/jjb/sdnc/sdnc-adaptors.yaml
index b7af34fda..1d82461a2 100644
--- a/jjb/sdnc/sdnc-adaptors.yaml
+++ b/jjb/sdnc/sdnc-adaptors.yaml
@@ -11,7 +11,7 @@
     stream:
       - 'master':
           branch: 'master'
-    mvn-settings: 'mso-settings'
+    mvn-settings: 'sdnc-adaptors-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
diff --git a/jjb/sdnc/sdnc-core.yaml b/jjb/sdnc/sdnc-core.yaml
index c172e6917..dead3f667 100644
--- a/jjb/sdnc/sdnc-core.yaml
+++ b/jjb/sdnc/sdnc-core.yaml
@@ -11,7 +11,7 @@
     stream:
       - 'master':
           branch: 'master'
-    mvn-settings: 'mso-settings'
+    mvn-settings: 'sdnc-core-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
diff --git a/jjb/sdnc/sdnc-northbound.yaml b/jjb/sdnc/sdnc-northbound.yaml
index 0c1812b2c..5fd5d38f7 100644
--- a/jjb/sdnc/sdnc-northbound.yaml
+++ b/jjb/sdnc/sdnc-northbound.yaml
@@ -11,7 +11,7 @@
     stream:
       - 'master':
           branch: 'master'
-    mvn-settings: 'mso-settings'
+    mvn-settings: 'sdnc-northbound-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
diff --git a/jjb/sdnc/sdnc-oam.yaml b/jjb/sdnc/sdnc-oam.yaml
index 0b1c1fa41..e41de42de 100644
--- a/jjb/sdnc/sdnc-oam.yaml
+++ b/jjb/sdnc/sdnc-oam.yaml
@@ -15,7 +15,7 @@
     stream:
       - 'master':
           branch: 'master'
-    mvn-settings: 'mso-settings'
+    mvn-settings: 'sdnc-oam-settings'
     files: '**'
     archive-artifacts: ''
     build-node: ubuntu1604-basebuild-4c-4g
diff --git a/jjb/sdnc/sdnc-plugins.yaml b/jjb/sdnc/sdnc-plugins.yaml
index b8b4f4fd6..44c764a7b 100644
--- a/jjb/sdnc/sdnc-plugins.yaml
+++ b/jjb/sdnc/sdnc-plugins.yaml
@@ -11,7 +11,7 @@
     stream:
       - 'master':
           branch: 'master'
-    mvn-settings: 'mso-settings'
+    mvn-settings: 'sdnc-plugins-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