6 files changed, 100 insertions, 6 deletions
diff --git a/jjb/aai/aai-aai-service.yaml b/jjb/aai/aai-aai-service.yaml
index e4ca295a7..89aeedbe7 100644
--- a/jjb/aai/aai-aai-service.yaml
+++ b/jjb/aai/aai-aai-service.yaml
@@ -6,9 +6,9 @@
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
       - '{project-name}-{stream}-release-java-daily'
-      - '{project-name}-{stream}-docker-java-daily':
-          docker-pom: 'ajsc-aai/pom.xml'
-          mvn-profile: 'docker'
+      - '{project-name}-{stream}-aai-docker-java-daily':
+          pom: 'ajsc-aai/pom.xml'
+          mvn-goals: '-P docker'
 
     project: 'aai/aai-service'
     stream:
diff --git a/jjb/aai/aai-model-loader.yaml b/jjb/aai/aai-model-loader.yaml
index a6c0b76fd..293c47137 100644
--- a/jjb/aai/aai-model-loader.yaml
+++ b/jjb/aai/aai-model-loader.yaml
@@ -6,9 +6,9 @@
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
       - '{project-name}-{stream}-release-java-daily'
-      - '{project-name}-{stream}-docker-java-daily':
-          docker-pom: 'pom.xml'
-          mvn-profile: 'docker'
+      - '{project-name}-{stream}-aai-docker-java-daily':
+          pom: 'pom.xml'
+          mvn-goals: '-P docker'
     project: 'aai/model-loader'
     stream:
       - 'master':
diff --git a/jjb/global-templates-java.yaml b/jjb/global-templates-java.yaml
index a84a7d08c..7b173e9ba 100644
--- a/jjb/global-templates-java.yaml
+++ b/jjb/global-templates-java.yaml
@@ -644,3 +644,68 @@
           global-settings-type: cfp
 
       - shell: '{script}'
+
+- job-template:
+    name: '{project-name}-{stream}-aai-docker-java-daily'
+    project-type: freestyle
+    node: 'ubuntu1604-docker-8c-8g'
+
+    properties:
+      - ecomp-infra-properties:
+          build-days-to-keep: '{build-days-to-keep}'
+
+    parameters:
+      - ecomp-infra-parameters:
+          project: '{project}'
+          branch: '{branch}'
+          refspec: 'refs/heads/{branch}'
+          artifacts: '{archive-artifacts}'
+
+    scm:
+      - gerrit-trigger-scm:
+          refspec: ''
+          choosing-strategy: 'default'
+
+    wrappers:
+      - ecomp-infra-wrappers:
+          build-timeout: '{build-timeout}'
+
+    triggers:
+      # 12 AM UTC
+      - timed: 'H 12 * * *'
+      - gerrit-trigger-release-manually:
+          server: '{server-name}'
+          project: '{project}'
+          branch: '{branch}'
+
+    builders:
+
+      - provide-maven-settings:
+          global-settings-file: 'global-settings'
+          settings-file: '{mvn-settings}'
+
+      - docker-login
+
+      - maven-target:
+          maven-version: 'mvn33'
+          pom: 'pom.xml'
+          goals: 'clean install -DskipTests'
+          settings: '{mvn-settings}'
+          settings-type: cfp
+          global-settings: 'global-settings'
+          global-settings-type: cfp
+
+      - maven-target:
+          maven-version: 'mvn33'
+          pom: '{pom}'
+          goals: '{mvn-goals}'
+          settings: '{mvn-settings}'
+          settings-type: cfp
+          global-settings: 'global-settings'
+          global-settings-type: cfp
+          properties:
+            - maven.test.skip=true
+            - docker.pull.registry=nexus3.openecomp.org:10001
+            - docker.push.registry=nexus3.openecomp.org:10003
+
+      - shell: !include-raw: include-docker-push.sh
diff --git a/jjb/include-docker-push.sh b/jjb/include-docker-push.sh
new file mode 100644
index 000000000..1017d549c
--- /dev/null
+++ b/jjb/include-docker-push.sh
@@ -0,0 +1,10 @@
+#!/bin/bash
+
+DOCKER_REPOSITORY="nexus3.openecomp.org:10003"
+SEARCH="aai-service";
+
+if [[ $PROJECT =~ $SEARCH ]] ; then
+    docker push $DOCKER_REPOSITORY/ecomp/ajsc-aai:latest;
+else
+    docker push $DOCKER_REPOSITORY/ecomp/model-loader:latest;
+fi
diff --git a/jjb/policy/include-raw-docker-verify.sh b/jjb/policy/include-raw-docker-verify.sh
new file mode 100644
index 000000000..d1943ba7c
--- /dev/null
+++ b/jjb/policy/include-raw-docker-verify.sh
@@ -0,0 +1,12 @@
+#!/bin/bash
+#
+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
+    echo "Building $image"
+    mkdir -p target/$image
+    cp $image/* target/$image
+done
diff --git a/jjb/policy/policy-docker.yaml b/jjb/policy/policy-docker.yaml
index 71879f16c..4489304ef 100644
--- a/jjb/policy/policy-docker.yaml
+++ b/jjb/policy/policy-docker.yaml
@@ -3,6 +3,13 @@
     name: policy-docker
     project-name: 'policy-docker-policy'
     jobs:
+      - '{project-name}-{stream}-verify-script':
+           script:
+            !include-raw-escape: 'include-raw-docker-verify.sh'
+      - '{project-name}-{stream}-merge-scm-mvn-script':
+           mvn-goals: '--version'
+           script:
+            !include-raw-escape: 'include-raw-docker-verify.sh'
       - '{project-name}-{stream}-docker-java-shell-daily':
           docker-pom: 'pom.xml'
           mvn-goals: 'prepare-package'