diff --git a/jjb/ci-management/ci-management-macros.yaml b/jjb/ci-management/ci-management-macros.yaml
deleted file mode 100644
index e79cf8a..0000000
--- a/jjb/ci-management/ci-management-macros.yaml
+++ /dev/null
@@ -1,22 +0,0 @@
----
-# vim: sw=2 ts=2 sts=2 et :
-- builder:
-    name: packer-validate
-    builders:
-      - config-file-provider:
-          files:
-            - file-id: 'packer-cloud-env'
-              variable: 'CLOUDENV'
-      - shell: !include-raw: raw-include-packer-validate.sh
-
-- builder:
-    name: packer-build
-    builders:
-      - shell: |
-          cd packer
-          export PACKER_LOG="yes"
-          export PACKER_LOG_PATH="packer-build.log"
-          packer.io build -color=false \
-            -var-file=$CLOUDENV \
-            -var-file=vars/{platform}.json \
-            templates/{template}.json
diff --git a/jjb/ci-management/ci-management.yaml b/jjb/ci-management/ci-management.yaml
index 141731b..c1dea93 100644
--- a/jjb/ci-management/ci-management.yaml
+++ b/jjb/ci-management/ci-management.yaml
@@ -3,8 +3,6 @@
     name: ci-management-jobs
     jobs:
       - '{project-name}-ci-jobs'
-      - '{project}-verify-packer'
-      - '{project}-merge-packer-{platforms}-{templates}'
 
     project: 'ci-management'
     project-name: 'ci-management'
@@ -12,15 +10,25 @@
     branch: 'master'
     build-timeout: '60'
     build-node: 'centos7-basebuild-2c-1g'
+
+- project:
+    name: packer-jobs
+    # packer jobs templates are defined in global-jjb
+    jobs:
+      - '{project-name}-packer-jobs'
+    project: 'ci-management'
+    project-name: 'ci-management'
+    branch: master
+    archive-artifacts: '**/*.log'
+    build-node: 'centos7-basebuild-2c-1g'
     platforms:
       - centos
       - ubuntu-16.04
-
     templates:
       - basebuild
       - docker
+      - memcached
       - redis
-
     exclude:
       # only build the docker image on ubuntu at present
       - platforms: centos
@@ -130,87 +138,3 @@
     publishers:
       - infra-shiplogs:
           maven-version: '{maven-version}'
-
-- job-template:
-    name: '{project}-verify-packer'
-    project-type: freestyle
-    node: '{build-node}'
-    concurrent: true
-
-    properties:
-      - infra-properties:
-          build-days-to-keep: 14
-
-    parameters:
-      - infra-parameters:
-          project: '{project}'
-          branch: 'master'
-          refspec: 'refs/heads/master'
-          artifacts: '{archive-artifacts}'
-
-    scm:
-      - gerrit-trigger-scm:
-          refspec: '$GERRIT_REFSPEC'
-          choosing-strategy: 'gerrit'
-          submodule-recursive: '{submodule-recursive}'
-
-    wrappers:
-      - infra-wrappers:
-          build-timeout: '{build-timeout}'
-
-    triggers:
-      - gerrit-trigger-patch-submitted:
-          server: '{server-name}'
-          project: '{project}'
-          branch: 'master'
-          files: 'packer/**'
-
-    builders:
-      - packer-validate
-
-    publishers:
-      - infra-shiplogs:
-          maven-version: '{maven-version}'
-- job-template:
-    name: '{project}-merge-packer-{platforms}-{templates}'
-    project-type: freestyle
-    node: '{build-node}'
-    concurrent: true
-
-    properties:
-      - infra-properties:
-          build-days-to-keep: 14
-
-    parameters:
-      - infra-parameters:
-          project: '{project}'
-          branch: 'master'
-          refspec: 'refs/heads/master'
-          artifacts: '{archive-artifacts}'
-
-    scm:
-      - gerrit-trigger-scm:
-          refspec: ''
-          choosing-strategy: 'default'
-          submodule-recursive: '{submodule-recursive}'
-
-    wrappers:
-      - infra-wrappers:
-          build-timeout: '{build-timeout}'
-
-    triggers:
-      - gerrit-trigger-patch-merged:
-          server: '{server-name}'
-          project: '{project}'
-          branch: 'master'
-          files: 'packer/**'
-
-    builders:
-      - packer-validate
-      - packer-build:
-          platform: '{platforms}'
-          template: '{templates}'
-
-    publishers:
-      - infra-shiplogs:
-          maven-version: '{maven-version}'
diff --git a/jjb/ci-management/raw-include-packer-validate.sh b/jjb/ci-management/raw-include-packer-validate.sh
deleted file mode 100644
index 01984dd..0000000
--- a/jjb/ci-management/raw-include-packer-validate.sh
+++ /dev/null
@@ -1,19 +0,0 @@
-cd packer
-varfiles="../packer/vars/*"
-templates="../packer/templates/*"
-provision="../packer/provision/*.sh"
-for v in $varfiles; do
-  [[ "${v##*/}" =~ ^(cloud-env.*)$ ]] && continue
-  for t in $templates; do
-  export PACKER_LOG="yes" && \
-  export PACKER_LOG_PATH="packer-validate-${v##*/}-${t##*/}.log" && \
-          packer.io validate -var-file=$CLOUDENV \
-          -var-file=$v $t
-  if [ $? -ne 0 ]; then
-      break
-  fi
-  done
-done
-for p in $provision; do
-  /bin/bash -n $p > provision-validate-${p##*/}.log 2>&1
-done
diff --git a/jjb/clamp/clamp-csit.yaml b/jjb/clamp/clamp-csit.yaml
new file mode 100644
index 0000000..9847abc
--- /dev/null
+++ b/jjb/clamp/clamp-csit.yaml
@@ -0,0 +1,15 @@
+---
+- project:
+    name: clamp-csit
+    jobs:
+      - '{project-name}-{stream}-verify-csit-{functionality}'
+      - '{project-name}-{stream}-csit-{functionality}'
+    project-name: 'clamp'
+    stream: 'master'
+    functionality:
+      - 'TCA':
+          trigger_jobs:
+      - 'UIs':
+          trigger_jobs:
+    robot-options: ''
+    branch: 'master'
diff --git a/jjb/cli/cli.yaml b/jjb/cli/cli.yaml
index d7685b9..896198f 100644
--- a/jjb/cli/cli.yaml
+++ b/jjb/cli/cli.yaml
@@ -11,13 +11,10 @@
       - '{project-name}-{stream}-stage-site-java':
           site-pom: 'pom.xml'
           trigger-job: '{project-name}-{stream}-release-version-java-daily'
-      - '{project-name}-{stream}-docker-version-java-daily':
-         docker-pom: 'pom.xml'
-         mvn-profile: 'docker'
-         maven-properties: |
-          skip.docker.build=false
-          skip.docker.tag=false
-          skip.docker.push=false
+      - '{project-name}-{stream}-aai-docker-java-daily':
+          pom: 'deployment/docker/pom.xml'
+          mvn-goals: 'docker:build'
+          docker-image-name: 'onap/cli'
 
     project: 'cli'
     stream:
diff --git a/jjb/dcaegen2/apod-analytics.yaml b/jjb/dcaegen2/apod-analytics.yaml
index d796790..ee00ef6 100644
--- a/jjb/dcaegen2/apod-analytics.yaml
+++ b/jjb/dcaegen2/apod-analytics.yaml
@@ -1,9 +1,9 @@
 ---
 - project:
-    name: dcaegen2-analytics
+    name: dcaegen2-analytics-tca
 
     # job template iterators
-    project-name: 'dcaegen2-analytics'
+    project-name: 'dcaegen2-analytics-tca'
     stream:
       - 'master':
           branch: 'master'
diff --git a/jjb/dcaegen2/dcaegen2-analytics.yaml b/jjb/dcaegen2/dcaegen2-analytics.yaml
new file mode 100644
index 0000000..64d98f1
--- /dev/null
+++ b/jjb/dcaegen2/dcaegen2-analytics.yaml
@@ -0,0 +1,21 @@
+---
+- project:
+    name: dcaegen2-analytics
+    project-name: 'dcaegen2-analytics'
+    jobs:
+      - '{project-name}-{stream}-verify-java'
+      - '{project-name}-{stream}-merge-java'
+      - '{project-name}-{stream}-release-version-java-daily'
+
+    project: 'dcaegen2/analytics'
+    stream:
+      - 'master':
+          branch: 'master'
+          mvn-settings: 'dcaegen2-analytics-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/dcaegen2/dcaegen2-collectors-snmptrap.yaml b/jjb/dcaegen2/dcaegen2-collectors-snmptrap.yaml
new file mode 100644
index 0000000..371b5e0
--- /dev/null
+++ b/jjb/dcaegen2/dcaegen2-collectors-snmptrap.yaml
@@ -0,0 +1,21 @@
+---
+- project:
+    name: dcaegen2-collectors-snmptrap
+    project-name: 'dcaegen2-collectors-snmptrap'
+    jobs:
+      - '{project-name}-{stream}-verify-java'
+      - '{project-name}-{stream}-merge-java'
+      - '{project-name}-{stream}-release-version-java-daily'
+
+    project: 'dcaegen2/collectors/snmptrap'
+    stream:
+      - 'master':
+          branch: 'master'
+          mvn-settings: 'dcaegen2-collectors-snmptrap-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/dcaegen2/dcaegen2-collectors-ves.yaml b/jjb/dcaegen2/dcaegen2-collectors-ves.yaml
new file mode 100644
index 0000000..74d9a24
--- /dev/null
+++ b/jjb/dcaegen2/dcaegen2-collectors-ves.yaml
@@ -0,0 +1,21 @@
+---
+- project:
+    name: dcaegen2-collectors-ves
+    project-name: 'dcaegen2-collectors-ves'
+    jobs:
+      - '{project-name}-{stream}-verify-java'
+      - '{project-name}-{stream}-merge-java'
+      - '{project-name}-{stream}-release-version-java-daily'
+
+    project: 'dcaegen2/collectors/ves'
+    stream:
+      - 'master':
+          branch: 'master'
+          mvn-settings: 'dcaegen2-collectors-ves-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/dcaegen2/dcaegen2-collectors.yaml b/jjb/dcaegen2/dcaegen2-collectors.yaml
new file mode 100644
index 0000000..cc9fb1f
--- /dev/null
+++ b/jjb/dcaegen2/dcaegen2-collectors.yaml
@@ -0,0 +1,21 @@
+---
+- project:
+    name: dcaegen2-collectors
+    project-name: 'dcaegen2-collectors'
+    jobs:
+      - '{project-name}-{stream}-verify-java'
+      - '{project-name}-{stream}-merge-java'
+      - '{project-name}-{stream}-release-version-java-daily'
+
+    project: 'dcaegen2/collectors'
+    stream:
+      - 'master':
+          branch: 'master'
+          mvn-settings: 'dcaegen2-collectors-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/dcaegen2/dcaegen2-deployments.yaml b/jjb/dcaegen2/dcaegen2-deployments.yaml
new file mode 100644
index 0000000..1291c4d
--- /dev/null
+++ b/jjb/dcaegen2/dcaegen2-deployments.yaml
@@ -0,0 +1,21 @@
+---
+- project:
+    name: dcaegen2-deployments
+    project-name: 'dcaegen2-deployments'
+    jobs:
+      - '{project-name}-{stream}-verify-java'
+      - '{project-name}-{stream}-merge-java'
+      - '{project-name}-{stream}-release-version-java-daily'
+
+    project: 'dcaegen2/deployments'
+    stream:
+      - 'master':
+          branch: 'master'
+          mvn-settings: 'dcaegen2-deployments-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/dcaegen2/dcaegen2-platform-blueprints.yaml b/jjb/dcaegen2/dcaegen2-platform-blueprints.yaml
new file mode 100644
index 0000000..6160930
--- /dev/null
+++ b/jjb/dcaegen2/dcaegen2-platform-blueprints.yaml
@@ -0,0 +1,21 @@
+---
+- project:
+    name: dcaegen2-platform-blueprints
+    project-name: 'dcaegen2-platform-blueprints'
+    jobs:
+      - '{project-name}-{stream}-verify-java'
+      - '{project-name}-{stream}-merge-java'
+      - '{project-name}-{stream}-release-version-java-daily'
+
+    project: 'dcaegen2/platform/blueprints'
+    stream:
+      - 'master':
+          branch: 'master'
+          mvn-settings: 'dcaegen2-platform-blueprints-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/dcaegen2/dcaegen2-platform-cdapbroker.yaml b/jjb/dcaegen2/dcaegen2-platform-cdapbroker.yaml
new file mode 100644
index 0000000..52e7ce3
--- /dev/null
+++ b/jjb/dcaegen2/dcaegen2-platform-cdapbroker.yaml
@@ -0,0 +1,21 @@
+---
+- project:
+    name: dcaegen2-platform-cdapbroker
+    project-name: 'dcaegen2-platform-cdapbroker'
+    jobs:
+      - '{project-name}-{stream}-verify-java'
+      - '{project-name}-{stream}-merge-java'
+      - '{project-name}-{stream}-release-version-java-daily'
+
+    project: 'dcaegen2/platform/cdapbroker'
+    stream:
+      - 'master':
+          branch: 'master'
+          mvn-settings: 'dcaegen2-platform-cdapbroker-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/dcaegen2/dcaegen2-platform-cli.yaml b/jjb/dcaegen2/dcaegen2-platform-cli.yaml
new file mode 100644
index 0000000..f200bb1
--- /dev/null
+++ b/jjb/dcaegen2/dcaegen2-platform-cli.yaml
@@ -0,0 +1,21 @@
+---
+- project:
+    name: dcaegen2-platform-cli
+    project-name: 'dcaegen2-platform-cli'
+    jobs:
+      - '{project-name}-{stream}-verify-java'
+      - '{project-name}-{stream}-merge-java'
+      - '{project-name}-{stream}-release-version-java-daily'
+
+    project: 'dcaegen2/platform/cli'
+    stream:
+      - 'master':
+          branch: 'master'
+          mvn-settings: 'dcaegen2-platform-cli-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/dcaegen2/dcaegen2-platform-deployment-handler.yaml b/jjb/dcaegen2/dcaegen2-platform-deployment-handler.yaml
new file mode 100644
index 0000000..bdc3c8b
--- /dev/null
+++ b/jjb/dcaegen2/dcaegen2-platform-deployment-handler.yaml
@@ -0,0 +1,21 @@
+---
+- project:
+    name: dcaegen2-platform-deployment-handler
+    project-name: 'dcaegen2-platform-deployment-handler'
+    jobs:
+      - '{project-name}-{stream}-verify-java'
+      - '{project-name}-{stream}-merge-java'
+      - '{project-name}-{stream}-release-version-java-daily'
+
+    project: 'dcaegen2/platform/deployment-handler'
+    stream:
+      - 'master':
+          branch: 'master'
+          mvn-settings: 'dcaegen2-platform-deployment-handler-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/dcaegen2/dcaegen2-platform-inventory-api.yaml b/jjb/dcaegen2/dcaegen2-platform-inventory-api.yaml
new file mode 100644
index 0000000..67f3fe3
--- /dev/null
+++ b/jjb/dcaegen2/dcaegen2-platform-inventory-api.yaml
@@ -0,0 +1,21 @@
+---
+- project:
+    name: dcaegen2-platform-inventory-api
+    project-name: 'dcaegen2-platform-inventory-api'
+    jobs:
+      - '{project-name}-{stream}-verify-java'
+      - '{project-name}-{stream}-merge-java'
+      - '{project-name}-{stream}-release-version-java-daily'
+
+    project: 'dcaegen2/platform/inventory-api'
+    stream:
+      - 'master':
+          branch: 'master'
+          mvn-settings: 'dcaegen2-platform-inventory-api-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/dcaegen2/dcaegen2-platform-plugins.yaml b/jjb/dcaegen2/dcaegen2-platform-plugins.yaml
new file mode 100644
index 0000000..9d29b83
--- /dev/null
+++ b/jjb/dcaegen2/dcaegen2-platform-plugins.yaml
@@ -0,0 +1,21 @@
+---
+- project:
+    name: dcaegen2-platform-plugins
+    project-name: 'dcaegen2-platform-plugins'
+    jobs:
+      - '{project-name}-{stream}-verify-java'
+      - '{project-name}-{stream}-merge-java'
+      - '{project-name}-{stream}-release-version-java-daily'
+
+    project: 'dcaegen2/platform/plugins'
+    stream:
+      - 'master':
+          branch: 'master'
+          mvn-settings: 'dcaegen2-platform-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 in the job
+          maven-deploy-properties: |
+            deployAtEnd=true
+          files: '**'
+          archive-artifacts: ''
diff --git a/jjb/dcaegen2/dcaegen2-platform-policy-handler.yaml b/jjb/dcaegen2/dcaegen2-platform-policy-handler.yaml
new file mode 100644
index 0000000..0104543
--- /dev/null
+++ b/jjb/dcaegen2/dcaegen2-platform-policy-handler.yaml
@@ -0,0 +1,21 @@
+---
+- project:
+    name: dcaegen2-platform-policy-handler
+    project-name: 'dcaegen2-platform-policy-handler'
+    jobs:
+      - '{project-name}-{stream}-verify-java'
+      - '{project-name}-{stream}-merge-java'
+      - '{project-name}-{stream}-release-version-java-daily'
+
+    project: 'dcaegen2/platform/policy-handler'
+    stream:
+      - 'master':
+          branch: 'master'
+          mvn-settings: 'dcaegen2-platform-policy-handler-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/dcaegen2/dcaegen2-platform-servicechange-handler.yaml b/jjb/dcaegen2/dcaegen2-platform-servicechange-handler.yaml
new file mode 100644
index 0000000..7aceae0
--- /dev/null
+++ b/jjb/dcaegen2/dcaegen2-platform-servicechange-handler.yaml
@@ -0,0 +1,21 @@
+---
+- project:
+    name: dcaegen2-platform-servicechange-handler
+    project-name: 'dcaegen2-platform-servicechange-handler'
+    jobs:
+      - '{project-name}-{stream}-verify-java'
+      - '{project-name}-{stream}-merge-java'
+      - '{project-name}-{stream}-release-version-java-daily'
+
+    project: 'dcaegen2/platform/servicechange-handler'
+    stream:
+      - 'master':
+          branch: 'master'
+          mvn-settings: 'dcaegen2-platform-servicechange-handler-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/dcaegen2/dcaegen2-platform.yaml b/jjb/dcaegen2/dcaegen2-platform.yaml
new file mode 100644
index 0000000..b1830e6
--- /dev/null
+++ b/jjb/dcaegen2/dcaegen2-platform.yaml
@@ -0,0 +1,21 @@
+---
+- project:
+    name: dcaegen2-platform
+    project-name: 'dcaegen2-platform'
+    jobs:
+      - '{project-name}-{stream}-verify-java'
+      - '{project-name}-{stream}-merge-java'
+      - '{project-name}-{stream}-release-version-java-daily'
+
+    project: 'dcaegen2/platform'
+    stream:
+      - 'master':
+          branch: 'master'
+          mvn-settings: 'dcaegen2-platform-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/dcaegen2/dcaegen2-utils.yaml b/jjb/dcaegen2/dcaegen2-utils.yaml
new file mode 100644
index 0000000..594978e
--- /dev/null
+++ b/jjb/dcaegen2/dcaegen2-utils.yaml
@@ -0,0 +1,21 @@
+---
+- project:
+    name: dcaegen2-utils
+    project-name: 'dcaegen2-utils'
+    jobs:
+      - '{project-name}-{stream}-verify-java'
+      - '{project-name}-{stream}-merge-java'
+      - '{project-name}-{stream}-release-version-java-daily'
+
+    project: 'dcaegen2/utils'
+    stream:
+      - 'master':
+          branch: 'master'
+          mvn-settings: 'dcaegen2-utils-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/dcaegen2/dcaegen2.yaml b/jjb/dcaegen2/dcaegen2.yaml
new file mode 100644
index 0000000..62d24bc
--- /dev/null
+++ b/jjb/dcaegen2/dcaegen2.yaml
@@ -0,0 +1,21 @@
+---
+- project:
+    name: dcaegen2
+    project-name: 'dcaegen2'
+    jobs:
+      - '{project-name}-{stream}-verify-java'
+      - '{project-name}-{stream}-merge-java'
+      - '{project-name}-{stream}-release-version-java-daily'
+
+    project: 'dcaegen2'
+    stream:
+      - 'master':
+          branch: 'master'
+          mvn-settings: 'dcaegen2-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/dmaap/dmaap-datarouter.yaml b/jjb/dmaap/dmaap-datarouter.yaml
index 4589c4f..6e8a846 100644
--- a/jjb/dmaap/dmaap-datarouter.yaml
+++ b/jjb/dmaap/dmaap-datarouter.yaml
@@ -2,22 +2,21 @@
 - project:
     name: dmaap-datarouter
     project-name: 'dmaap-datarouter'
+    jobs:
+      - '{project-name}-{stream}-clm'
+      - '{project-name}-{stream}-verify-java'
+      - '{project-name}-{stream}-merge-java'
+      - '{project-name}-{stream}-release-version-java-daily'
+      - '{project-name}-{stream}-stage-site-java':
+          site-pom: 'dmaap/datarouter/pom.xml'
+          trigger-job: '{project-name}-{stream}-release-version-java-daily'
+          mvn-goals: 'clean install'
     project: 'dmaap/datarouter'
     stream:
       - 'master':
           branch: 'master'
+      - 'release-1.0.0':
+          branch: 'release-1.0.0'
     mvn-settings: 'dmaap-datarouter-settings'
-    subproject:
-      - 'datarouter-prov':
-          pom: 'datarouter-prov/pom.xml'
-          pattern: 'datarouter-prov/**'
-          mvn-goals: 'clean install'
-      - 'datarouter-node':
-          pom: 'datarouter-node/pom.xml'
-          pattern: 'datarouter-node/**'
-          mvn-goals: 'clean install'
-    jobs:
-      - '{project-name}-{stream}-{subproject}-verify-java'
-      - '{project-name}-{stream}-{subproject}-merge-java'
     files: '**'
     archive-artifacts: ''
\ No newline at end of file
diff --git a/jjb/doc/doc-templates-rtd.yaml b/jjb/doc/doc-templates-rtd.yaml
index c1f6159..c6bec58 100644
--- a/jjb/doc/doc-templates-rtd.yaml
+++ b/jjb/doc/doc-templates-rtd.yaml
@@ -31,10 +31,17 @@
           maven-version: '{maven-version}'
 
     scm:
-      - gerrit-trigger-scm:
+      - git:
+          credentials-id: '{jenkins-ssh-credential}'
+          url: '$GIT_BASE'
           refspec: ''
-          choosing-strategy: 'gerrit'
-          submodule-recursive: '{submodule-recursive}'
+          choosing-strategy: 'default'
+          branches:
+            - 'refs/heads/{branch}'
+          skip-tag: true
+          wipe-workspace: true
+          submodule:
+            recursive: '{submodule-recursive}'
 
     wrappers:
       - infra-wrappers:
@@ -103,13 +110,19 @@
       - maven-exec:
           maven-version: '{maven-version}'
 
-
     scm:
-      - gerrit-trigger-scm:
+      - git:
+          credentials-id: '{jenkins-ssh-credential}'
+          url: '$GIT_BASE'
           refspec: ''
-          choosing-strategy: 'gerrit'
+          choosing-strategy: 'default'
+          branches:
+            - 'refs/heads/{branch}'
+          skip-tag: true
+          wipe-workspace: true
           submodule-recursive: '{submodule-recursive}'
 
+
     wrappers:
       - infra-wrappers:
           build-timeout: '{build-timeout}'
diff --git a/jjb/global-defaults.yaml b/jjb/global-defaults.yaml
index 2662ce4..f73f273 100644
--- a/jjb/global-defaults.yaml
+++ b/jjb/global-defaults.yaml
@@ -11,6 +11,9 @@
     build-artifact-days-to-keep: -1
     build-artifact-num-to-keep: 5
 
+    # lf-infra defaults
+    lftools-version: <1.0.0
+
     # default gerrit server definition
     server-name: 'Primary'
     gerrit-server-name: 'Primary'
diff --git a/jjb/global-jjb b/jjb/global-jjb
index 409ce61..0ee567b 160000
--- a/jjb/global-jjb
+++ b/jjb/global-jjb
@@ -1 +1 @@
-Subproject commit 409ce6156aa5e7b6c24eaac6dc414c0f013983b1
+Subproject commit 0ee567bb454432e6e4ca1bc6f45431b68e95bad3
diff --git a/jjb/global-macros.yaml b/jjb/global-macros.yaml
index 454d056..826b604 100644
--- a/jjb/global-macros.yaml
+++ b/jjb/global-macros.yaml
@@ -109,6 +109,16 @@
           # yamllint enable
           description: 'Maven selector to be used by shell scripts'
 
+- parameter:
+    name: docker-image-name
+    parameters:
+      - string:
+          name: DOCKER_IMAGE_NAME
+          # yamllint disable rule:line-length
+          default: '{docker-image-name}'
+          # yamllint enable
+          description: 'Docker image name, e.g. onap/appc'
+
 # PROPERTIES
 - property:
     name: infra-properties
diff --git a/jjb/global-templates-java.yaml b/jjb/global-templates-java.yaml
index 21a227b..23d74c6 100644
--- a/jjb/global-templates-java.yaml
+++ b/jjb/global-templates-java.yaml
@@ -1342,6 +1342,7 @@
     name: '{project-name}-{stream}-aai-docker-java-daily'
     project-type: freestyle
     node: 'ubuntu1604-docker-8c-8g'
+    docker-image-name: ''
 
     properties:
       - infra-properties:
@@ -1355,6 +1356,8 @@
           artifacts: '{archive-artifacts}'
       - maven-exec:
           maven-version: '{maven-version}'
+      - docker-image-name:
+          docker-image-name: '{docker-image-name}'
 
     scm:
       - gerrit-trigger-scm:
diff --git a/jjb/include-docker-push.sh b/jjb/include-docker-push.sh
old mode 100644
new mode 100755
index 57a0264..df42fa7
--- a/jjb/include-docker-push.sh
+++ b/jjb/include-docker-push.sh
@@ -20,40 +20,34 @@
 SNAPSHOT_TAG=${VERSION}-SNAPSHOT-${DATETIME_STAMP};
 STAGING_TAG=${VERSION}-STAGING-${DATETIME_STAMP};
 
-if [[ $PROJECT =~ $SEARCH ]] ; then
 
+# Set REPO_PATH variable
+
+if [ ! -z "$DOCKER_IMAGE_NAME" ]; then
+    REPO_PATH=$DOCKER_REPOSITORY/${DOCKER_IMAGE_NAME};
+
+    # tag image with nexus3 proxy prefix
+    docker tag ${DOCKER_IMAGE_NAME} $REPO_PATH
+elif [[ $PROJECT =~ $SEARCH ]] ; then
     REPO_PATH=$DOCKER_REPOSITORY/openecomp/ajsc-aai;
-
-    docker tag $REPO_PATH:latest $REPO_PATH:$STAGING_TAG;
-    docker tag $REPO_PATH:latest $REPO_PATH:$SNAPSHOT_TAG;
-
-    if [[ "$VERSION" =~ $RELEASE_VERSION_REGEX ]]; then
-        STRIPPED_RELEASE=$(echo $VERSION | cut -d"." -f1,2);
-        docker tag $REPO_PATH:latest $REPO_PATH:${STRIPPED_RELEASE}-STAGING-latest;
-        docker push $REPO_PATH:${STRIPPED_RELEASE}-STAGING-latest;
-    else
-        docker push $REPO_PATH:latest;
-    fi
-
-    docker push $REPO_PATH:$STAGING_TAG;
-    docker push $REPO_PATH:$SNAPSHOT_TAG;
 else
     # Cut the prefix aai/ in example aai/model-loader
     DOCKER_REPO_NAME=$(echo ${PROJECT} | cut -d"/" -f2-);
 
     REPO_PATH=$DOCKER_REPOSITORY/openecomp/${DOCKER_REPO_NAME};
-
-    docker tag $REPO_PATH:latest $REPO_PATH:$STAGING_TAG;
-    docker tag $REPO_PATH:latest $REPO_PATH:$SNAPSHOT_TAG;
-
-    if [[ "$VERSION" =~ $RELEASE_VERSION_REGEX ]]; then
-        STRIPPED_RELEASE=$(echo $VERSION | cut -d"." -f1,2);
-        docker tag $REPO_PATH:latest $REPO_PATH:${STRIPPED_RELEASE}-STAGING-latest;
-        docker push $REPO_PATH:${STRIPPED_RELEASE}-STAGING-latest;
-    else
-        docker push $REPO_PATH:latest;
-    fi
-
-    docker push $REPO_PATH:$SNAPSHOT_TAG;
-    docker push $REPO_PATH:$STAGING_TAG;
 fi
+
+
+docker tag $REPO_PATH:latest $REPO_PATH:$STAGING_TAG;
+docker tag $REPO_PATH:latest $REPO_PATH:$SNAPSHOT_TAG;
+
+if [[ "$VERSION" =~ $RELEASE_VERSION_REGEX ]]; then
+    STRIPPED_RELEASE=$(echo $VERSION | cut -d"." -f1,2);
+    docker tag $REPO_PATH:latest $REPO_PATH:${STRIPPED_RELEASE}-STAGING-latest;
+    docker push $REPO_PATH:${STRIPPED_RELEASE}-STAGING-latest;
+else
+    docker push $REPO_PATH:latest;
+fi
+
+docker push $REPO_PATH:$SNAPSHOT_TAG;
+docker push $REPO_PATH:$STAGING_TAG;
diff --git a/jjb/msb/msb-swagger-sdk.yaml b/jjb/msb/msb-swagger-sdk.yaml
new file mode 100644
index 0000000..3e88bf0
--- /dev/null
+++ b/jjb/msb/msb-swagger-sdk.yaml
@@ -0,0 +1,21 @@
+---
+- project:
+    name: msb-swagger-sdk
+    project-name: 'msb-swagger-sdk'
+    jobs:
+      - '{project-name}-{stream}-clm'
+      - '{project-name}-{stream}-verify-java'
+      - '{project-name}-{stream}-merge-java'
+      - '{project-name}-{stream}-release-version-java-daily'
+      - '{project-name}-{stream}-stage-site-java':
+          site-pom: 'pom.xml'
+          trigger-job: '{project-name}-{stream}-release-version-java-daily'
+
+    project: 'msb/swagger-sdk'
+    stream:
+      - 'master':
+          branch: 'master'
+    mvn-settings: 'msb-swagger-sdk-settings'
+    files: '**'
+    archive-artifacts: ''
+    build-node: ubuntu1604-basebuild-4c-4g
diff --git a/jjb/multicloud/multicloud-csit.yaml b/jjb/multicloud/multicloud-csit.yaml
new file mode 100644
index 0000000..44a69f5
--- /dev/null
+++ b/jjb/multicloud/multicloud-csit.yaml
@@ -0,0 +1,14 @@
+---
+- project:
+    name: multicloud-csit
+    jobs:
+      - '{project-name}-{stream}-verify-csit-{functionality}'
+      - '{project-name}-{stream}-csit-{functionality}'
+    project-name: 'multicloud-framework'
+    stream: 'master'
+    functionality:
+      - 'provision':
+          trigger_jobs:
+            - '{project-name}-{stream}-multivimbroker-merge-java'
+    robot-options: ''
+    branch: 'master'
diff --git a/jjb/multicloud/multicloud-openstack.yaml b/jjb/multicloud/multicloud-openstack.yaml
new file mode 100644
index 0000000..fa19112
--- /dev/null
+++ b/jjb/multicloud/multicloud-openstack.yaml
@@ -0,0 +1,20 @@
+---
+- project:
+    name: multicloud-openstack
+    project-name: 'multicloud-openstack'
+    project: 'multicloud/openstack'
+    stream:
+      - 'master':
+          branch: 'master'
+    mvn-settings: 'multicloud-openstack-settings'
+    subproject:
+      - 'newton':
+          path: 'newton'
+          pattern: 'newton/**'
+    jobs:
+      - '{project-name}-{stream}-{subproject}-verify-python'
+      - '{project-name}-{stream}-verify-java'
+      - '{project-name}-{stream}-merge-java'
+    files: '**'
+    archive-artifacts: ''
+    build-node: 'ubuntu1604-memcached-4c-4g'
diff --git a/jjb/policy/policy-engine.yaml b/jjb/policy/policy-engine.yaml
index e657192..8ee95e6 100644
--- a/jjb/policy/policy-engine.yaml
+++ b/jjb/policy/policy-engine.yaml
@@ -4,13 +4,10 @@
     project-name: 'policy-engine'
     jobs:
       - '{project-name}-{stream}-clm':
-          build-node: 'ubuntu1604-basebuild-4c-4g'
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
       - '{project-name}-{stream}-release-version-java-daily':
-          build-node: 'ubuntu1604-basebuild-4c-4g'
       - '{project-name}-{stream}-stage-site-java':
-          build-node: 'ubuntu1604-basebuild-4c-4g'
           site-pom: 'pom.xml'
           trigger-job: '{project-name}-{stream}-release-version-java-daily'
 
@@ -21,6 +18,7 @@
     mvn-settings: 'policy-engine-settings'
     files: '**'
     archive-artifacts: ''
+    build-node: 'ubuntu1604-basebuild-4c-4g'
 - project:
     name: policy-engine-release-1.0.0
     project-name: 'policy-engine'
diff --git a/jjb/portal/docker-build-deploy.sh b/jjb/portal/docker-build-deploy.sh
index dd114af..5e211fe 100644
--- a/jjb/portal/docker-build-deploy.sh
+++ b/jjb/portal/docker-build-deploy.sh
@@ -3,5 +3,5 @@
 ls -ltr
 cd deliveries
 ls -ltr
-chmod 755 *.*
-./run.sh
+chmod 755 *.sh
+./build_portalapps_dockers.sh
diff --git a/jjb/portal/docker-build-push.sh b/jjb/portal/docker-build-push.sh
index c3851dd..d05190c 100644
--- a/jjb/portal/docker-build-push.sh
+++ b/jjb/portal/docker-build-push.sh
@@ -3,5 +3,5 @@
 ls -ltr
 cd deliveries
 ls -ltr
-chmod 755 *.*
+chmod 755 *.sh
 ./os_docker_push.sh
diff --git a/jjb/portal/docker-build-release.sh b/jjb/portal/docker-build-release.sh
index 89a5fc1..0bbd2c8 100644
--- a/jjb/portal/docker-build-release.sh
+++ b/jjb/portal/docker-build-release.sh
@@ -3,5 +3,5 @@
 ls -ltr
 cd deliveries
 ls -ltr
-chmod 755 *.*
+chmod 755 *.sh
 ./os_docker_release.sh
diff --git a/jjb/portal/portal-sdk.yaml b/jjb/portal/portal-sdk.yaml
index 6839543..dc79848 100644
--- a/jjb/portal/portal-sdk.yaml
+++ b/jjb/portal/portal-sdk.yaml
@@ -19,6 +19,8 @@
     stream:
       - 'master':
           branch: 'master'
+      - 'release-1.3.0':
+          branch: 'release-1.3.0'
     mvn-settings: 'portal-sdk-settings'
     files: '**'
     archive-artifacts: ''
diff --git a/jjb/sdc/sdc-sdc-workflow-designer.yaml b/jjb/sdc/sdc-sdc-workflow-designer.yaml
new file mode 100644
index 0000000..a5830d7
--- /dev/null
+++ b/jjb/sdc/sdc-sdc-workflow-designer.yaml
@@ -0,0 +1,21 @@
+---
+- project:
+    name: sdc-sdc-workflow-designer
+    project-name: 'sdc-sdc-workflow-designer'
+    jobs:
+      - '{project-name}-{stream}-clm'
+      - '{project-name}-{stream}-verify-java'
+      - '{project-name}-{stream}-merge-java'
+      - '{project-name}-{stream}-release-version-java-daily'
+      - '{project-name}-{stream}-stage-site-java':
+          site-pom: 'pom.xml'
+          trigger-job: '{project-name}-{stream}-release-version-java-daily'
+
+    project: 'sdc/sdc-workflow-designer'
+    stream:
+      - 'master':
+          branch: 'master'
+    mvn-settings: 'sdc-sdc-workflow-designer-settings'
+    files: '**'
+    archive-artifacts: ''
+    build-node: ubuntu1604-basebuild-4c-4g
diff --git a/jjb/ui/ui-dmaapbc.yaml b/jjb/ui/ui-dmaapbc.yaml
index 022ee6b..c566178 100644
--- a/jjb/ui/ui-dmaapbc.yaml
+++ b/jjb/ui/ui-dmaapbc.yaml
@@ -18,6 +18,8 @@
           branch: 'master'
       - 'release-1.0.0':
           branch: 'release-1.0.0'
+      - 'release-1.1.0':
+          branch: 'release-1.1.0'
     mvn-settings: 'ui-dmaapbc-settings'
     files: '**'
     archive-artifacts: ''
diff --git a/jjb/vfc/vfc-gvnfm-vnflcm-python.yaml b/jjb/vfc/vfc-gvnfm-vnflcm-python.yaml
index c58f5bf..991848a 100644
--- a/jjb/vfc/vfc-gvnfm-vnflcm-python.yaml
+++ b/jjb/vfc/vfc-gvnfm-vnflcm-python.yaml
@@ -8,7 +8,7 @@
       - 'master':
           branch: 'master'
     mvn-settings: 'vfc-gvnfm-vnflcm-settings'
-    build-node: ubuntu1604-redis-4c-4g
+    build-node: centos7-redis-4c-4g
     subproject:
       - 'lcm':
           path: 'lcm'
diff --git a/jjb/vfc/vfc-nfvo-catalog.yaml b/jjb/vfc/vfc-nfvo-catalog.yaml
index 834d2a8..2856dd6 100644
--- a/jjb/vfc/vfc-nfvo-catalog.yaml
+++ b/jjb/vfc/vfc-nfvo-catalog.yaml
@@ -18,4 +18,4 @@
       - '{project-name}-{stream}-merge-java'
     files: '**'
     archive-artifacts: ''
-    build-node: ubuntu1604-redis-4c-4g
\ No newline at end of file
+    build-node: centos7-redis-4c-4g
\ No newline at end of file
diff --git a/jjb/vfc/vfc-nfvo-driver-ems-java.yaml b/jjb/vfc/vfc-nfvo-driver-ems-java.yaml
index 8c38d48..ef55187 100644
--- a/jjb/vfc/vfc-nfvo-driver-ems-java.yaml
+++ b/jjb/vfc/vfc-nfvo-driver-ems-java.yaml
@@ -10,11 +10,12 @@
     mvn-settings: 'vfc-nfvo-driver-ems-settings'
     subproject:
       - 'drv-ems-boco':
-          pom: 'ems/boco/pom.xml'
-          pattern: 'ems/boco/**'
+          pom: 'ems/pom.xml'
+          pattern: 'ems/**'
     jobs:
       - '{project-name}-{stream}-{subproject}-verify-java'
       - '{project-name}-{stream}-{subproject}-merge-java'
+      - '{project-name}-{stream}-{subproject}-release-java-daily'
     files: '**'
     archive-artifacts: ''
     build-node: ubuntu1604-basebuild-4c-4g
\ No newline at end of file
diff --git a/jjb/vfc/vfc-nfvo-lcm-python.yaml b/jjb/vfc/vfc-nfvo-lcm-python.yaml
index 8ce9eb1..8fc3b9e 100644
--- a/jjb/vfc/vfc-nfvo-lcm-python.yaml
+++ b/jjb/vfc/vfc-nfvo-lcm-python.yaml
@@ -8,7 +8,7 @@
       - 'master':
           branch: 'master'
     mvn-settings: 'vfc-nfvo-lcm-settings'
-    build-node: ubuntu1604-redis-4c-4g
+    build-node: centos7-redis-4c-4g
     subproject:
       - 'lcm':
           path: '.'
diff --git a/packer/provision/basebuild.sh b/packer/provision/basebuild.sh
index 008402f..5880fe6 100644
--- a/packer/provision/basebuild.sh
+++ b/packer/provision/basebuild.sh
@@ -13,7 +13,7 @@
     yum install -y openssl-devel mysql-devel gcc
 
     # Autorelease support packages
-    yum install -y python-tox xmlstarlet
+    yum install -y python-tox xmlstarlet xvfb
 
     # Additional libraries for Python ncclient
     yum install -y libxml2 libxslt libxslt-devel libffi libffi-devel
@@ -47,7 +47,7 @@
     apt-get install -y libssl-dev libmysqlclient-dev gcc
 
     # Autorelease support packages
-    apt-get install -y python-tox xmlstarlet
+    apt-get install -y python-tox xmlstarlet xvfb
 
     # Additional libraries for Python ncclient
     apt-get install -y wget unzip python-ncclient
diff --git a/packer/provision/memcached.sh b/packer/provision/memcached.sh
new file mode 100644
index 0000000..4f29237
--- /dev/null
+++ b/packer/provision/memcached.sh
@@ -0,0 +1,42 @@
+#!/bin/bash
+# This particular environment was created specifically for MultiCloud
+
+# vim: ts=4 sw=4 sts=4 et tw=72 :
+
+# force any errors to cause the script and job to end in failure
+set -xeu -o pipefail
+
+rh_systems() {
+    # memcached
+    yum install -y memcached
+    systemctl enable memcached
+}
+
+ubuntu_systems() {
+    # memcached
+    apt-get install memcached
+}
+
+all_systems() {
+    echo 'No common distribution configuration to perform'
+}
+
+echo "---> Detecting OS"
+ORIGIN=$(facter operatingsystem | tr '[:upper:]' '[:lower:]')
+
+case "${ORIGIN}" in
+    fedora|centos|redhat)
+        echo "---> RH type system detected"
+        rh_systems
+    ;;
+    ubuntu)
+        echo "---> Ubuntu system detected"
+        ubuntu_systems
+    ;;
+    *)
+        echo "---> Unknown operating system"
+    ;;
+esac
+
+# execute steps for all systems
+all_systems
diff --git a/packer/templates/memcached.json b/packer/templates/memcached.json
new file mode 100644
index 0000000..722785e
--- /dev/null
+++ b/packer/templates/memcached.json
@@ -0,0 +1,54 @@
+{
+  "variables": {
+    "stack_tenant": null,
+    "stack_user": null,
+    "stack_pass": null,
+    "stack_network": null,
+    "base_image": null,
+    "cloud_user": null,
+    "distro": null,
+    "cloud_user_data": null
+  },
+  "builders": [
+    {
+      "type": "openstack",
+      "identity_endpoint": "https://auth.vexxhost.net/v2.0/",
+      "tenant_name": "{{user `stack_tenant`}}",
+      "username": "{{user `stack_user`}}",
+      "password": "{{user `stack_pass`}}",
+      "region": "ca-ymq-1",
+      "ssh_username": "{{user `cloud_user`}}",
+      "image_name": "{{user `distro`}} - memcached - {{isotime \"20060102-1504\"}}",
+      "source_image_name": "{{user `base_image`}}",
+      "flavor": "v1-standard-1",
+      "availability_zone": "ca-ymq-2",
+      "networks": [
+        "{{user `stack_network`}}"
+      ],
+      "user_data_file": "{{user `cloud_user_data`}}"
+    }
+  ],
+  "provisioners": [
+    {
+      "type": "shell",
+      "inline": [
+        "mkdir -p /tmp/packer"
+      ]
+    },
+    {
+      "type": "file",
+      "source": "provision/basebuild/",
+      "destination": "/tmp/packer"
+    },
+    {
+      "type": "shell",
+      "scripts": [
+        "provision/baseline.sh",
+        "provision/basebuild.sh",
+        "provision/memcached.sh",
+        "provision/system_reseal.sh"
+      ],
+      "execute_command": "chmod +x {{ .Path }}; if [ \"$UID\" == \"0\" ]; then {{ .Vars }} '{{ .Path }}'; else {{ .Vars }} sudo -E '{{ .Path }}'; fi"
+    }
+  ]
+}