12 files changed, 141 insertions, 7 deletions
diff --git a/jjb/aaf/aaf-authz-docker.yaml b/jjb/aaf/aaf-authz-docker.yaml
new file mode 100644
index 000000000..35d9fe876
--- /dev/null
+++ b/jjb/aaf/aaf-authz-docker.yaml
@@ -0,0 +1,34 @@
+---
+
+- project:
+    name: aaf-authz-docker
+    project-name: 'aaf-authz-docker'
+    jobs:
+      - '{project-name}-{stream}-clm'
+      - '{project-name}-{stream}-verify-java-checkstyle'
+      - '{project-name}-{stream}-merge-properties-java':
+         mvn_properties:
+            - docker.pull.registry=nexus3.onap.org:10001
+            - docker.push.registry=nexus3.onap.org:10003
+      - '{project-name}-{stream}-release-java-daily-checkstyle':
+         mvn_properties:
+          - skipDockerBuild=true
+          - skipDockerTag=true
+          - skipDockerPush=true
+      - '{project-name}-{stream}-docker-java-properties-daily':
+         docker-pom: 'pom.xml'
+         mvn-profile: 'docker'
+         maven-properties: |
+          skip.docker.build=false
+          skip.docker.tag=false
+          skip.docker.push=false
+          aaf-authz-docker.registry=$
+
+    project: 'aaf/authz'
+    stream:
+      - 'master':
+          branch: 'master'
+    mvn-settings: 'aaf-authz-settings'
+    files: '**'
+    archive-artifacts: ''
+    build-node: ubuntu1604-docker-8c-8g
diff --git a/jjb/dcaegen2/apod-analytics.yaml b/jjb/dcaegen2/apod-analytics.yaml
index ee00ef6b1..33f216bae 100644
--- a/jjb/dcaegen2/apod-analytics.yaml
+++ b/jjb/dcaegen2/apod-analytics.yaml
@@ -7,8 +7,6 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'release-1.0.0':
-          branch: 'release-1.0.0'
 
     # apply to all jobs
     project: 'dcaegen2/analytics/tca'
diff --git a/jjb/dmaap/dmaap-datarouter-docker.yaml b/jjb/dmaap/dmaap-datarouter-docker.yaml
new file mode 100644
index 000000000..873affde8
--- /dev/null
+++ b/jjb/dmaap/dmaap-datarouter-docker.yaml
@@ -0,0 +1,34 @@
+---
+
+- project:
+    name: dmaap-datarouter-docker
+    project-name: 'dmaap-datarouter-docker'
+    jobs:
+      - '{project-name}-{stream}-clm'
+      - '{project-name}-{stream}-verify-java-checkstyle'
+      - '{project-name}-{stream}-merge-properties-java':
+         mvn_properties:
+            - docker.pull.registry=nexus3.onap.org:10001
+            - docker.push.registry=nexus3.onap.org:10003
+      - '{project-name}-{stream}-release-java-daily-checkstyle':
+         mvn_properties:
+          - skipDockerBuild=true
+          - skipDockerTag=true
+          - skipDockerPush=true
+      - '{project-name}-{stream}-docker-java-properties-daily':
+         docker-pom: 'pom.xml'
+         mvn-profile: 'docker'
+         maven-properties: |
+          skip.docker.build=false
+          skip.docker.tag=false
+          skip.docker.push=false
+          dmaap-datarouter-docker.registry=$
+
+    project: 'dmaap/datarouter'
+    stream:
+      - 'master':
+          branch: 'master'
+    mvn-settings: 'dmaap-datarouter-settings'
+    files: '**'
+    archive-artifacts: ''
+    build-node: ubuntu1604-docker-8c-8g
diff --git a/jjb/msb/msb-csit.yaml b/jjb/msb/msb-csit.yaml
index f5a283a32..9dada47b6 100644
--- a/jjb/msb/msb-csit.yaml
+++ b/jjb/msb/msb-csit.yaml
@@ -16,5 +16,8 @@
       - 'tcp-service':
           trigger_jobs:
             - 'msb-discovery-master-docker-java-version-shell-daily'
+      - 'iag-redirect-discovery':
+          trigger_jobs:
+            - 'msb-discovery-master-docker-java-version-shell-daily'
     robot-options: ''
     branch: 'master'
diff --git a/jjb/multicloud/build-multicloud-openstack-docker-image.sh b/jjb/multicloud/build-multicloud-openstack-docker-image.sh
new file mode 100644
index 000000000..671f65f7c
--- /dev/null
+++ b/jjb/multicloud/build-multicloud-openstack-docker-image.sh
@@ -0,0 +1,12 @@
+#!/bin/bash
+#
+echo '============== CALLING SCRIPT TO BUILD DOCKER IMAGES ================='
+
+CURRENTDIR="$(pwd)"
+echo $CURRENTDIR
+
+chmod 755 ./openstack/newton/docker/*.*
+chmod 755 ./openstack/ocata/docker/*.*
+
+./openstack/newton/docker/build_image.sh
+./openstack/ocata/docker/build_image.sh
diff --git a/jjb/multicloud/build-multicloud-openstack-vmware-docker-image.sh b/jjb/multicloud/build-multicloud-openstack-vmware-docker-image.sh
new file mode 100644
index 000000000..e432e86f9
--- /dev/null
+++ b/jjb/multicloud/build-multicloud-openstack-vmware-docker-image.sh
@@ -0,0 +1,10 @@
+#!/bin/bash
+#
+echo '============== CALLING SCRIPT TO BUILD DOCKER IMAGES ================='
+
+CURRENTDIR="$(pwd)"
+echo $CURRENTDIR
+
+chmod 755 ./vio/docker/*.*
+
+./vio/docker/build_image.sh
diff --git a/jjb/multicloud/multicloud-openstack-vmware-java.yaml b/jjb/multicloud/multicloud-openstack-vmware-java.yaml
index d60aba345..f6927adba 100644
--- a/jjb/multicloud/multicloud-openstack-vmware-java.yaml
+++ b/jjb/multicloud/multicloud-openstack-vmware-java.yaml
@@ -14,6 +14,11 @@
     jobs:
       - '{project-name}-{stream}-{subproject}-verify-java'
       - '{project-name}-{stream}-{subproject}-merge-java'
+      - '{project-name}-{stream}-docker-java-version-shell-daily':
+          docker-pom: 'pom.xml'
+          mvn-goals: 'install'
+          script:
+            !include-raw-escape: 'build-multicloud-openstack-vmware-docker-image.sh'
     files: '**'
     archive-artifacts: ''
     build-node: ubuntu1604-basebuild-4c-4g
diff --git a/jjb/multicloud/multicloud-openstack.yaml b/jjb/multicloud/multicloud-openstack.yaml
index 1fa18a702..84404e3be 100644
--- a/jjb/multicloud/multicloud-openstack.yaml
+++ b/jjb/multicloud/multicloud-openstack.yaml
@@ -12,10 +12,19 @@
           path: 'newton'
           pattern: 'newton/**'
           pom: 'newton/pom.xml'
+      - 'ocata':
+          path: 'ocata'
+          pattern: 'ocata/**'
+          pom: 'ocata/pom.xml'
     jobs:
       - '{project-name}-{stream}-{subproject}-verify-python'
       - '{project-name}-{stream}-{subproject}-verify-java'
       - '{project-name}-{stream}-{subproject}-merge-java'
+      - '{project-name}-{stream}-docker-java-version-shell-daily':
+          docker-pom: 'pom.xml'
+          mvn-goals: 'install'
+          script:
+            !include-raw-escape: 'build-multicloud-openstack-docker-image.sh'
     files: '**'
     archive-artifacts: ''
     build-node: 'ubuntu1604-memcached-4c-4g'
diff --git a/jjb/vfc/build-gvnfm-driver-docker-image.sh b/jjb/vfc/build-gvnfm-driver-docker-image.sh
index 3560e41df..ac6b90781 100755
--- a/jjb/vfc/build-gvnfm-driver-docker-image.sh
+++ b/jjb/vfc/build-gvnfm-driver-docker-image.sh
@@ -6,6 +6,8 @@ CURRENTDIR="$(pwd)"
 echo $CURRENTDIR
 
 chmod 755 ./gvnfmadapter/docker/*.*
-
 ./gvnfmadapter/docker/build_image.sh
 
+chmod 755 ./juju/juju-vnfmadapter/Juju-vnfmadapterService/docker/*.*
+./juju/juju-vnfmadapter/Juju-vnfmadapterService/docker/build_image.sh
+
diff --git a/jjb/vfc/vfc-nfvo-driver-svnfm-huawei-csit.yaml b/jjb/vfc/vfc-nfvo-driver-ems-csit.yaml
index 23243c299..312528866 100644
--- a/jjb/vfc/vfc-nfvo-driver-svnfm-huawei-csit.yaml
+++ b/jjb/vfc/vfc-nfvo-driver-ems-csit.yaml
@@ -1,15 +1,14 @@
 ---
-
 - project:
-    name: vfc-nfvo-driver-svnfm-huawei-csit
+    name: vfc-nfvo-driver-ems-csit
     jobs:
       - '{project-name}-{stream}-verify-csit-{functionality}'
       - '{project-name}-{stream}-csit-{functionality}'
-    project-name: 'vfc-nfvo-driver-svnfm'
+    project-name: 'vfc-nfvo-driver-ems'
     stream: 'master'
     functionality:
       - 'sanity-check':
           trigger_jobs:
-            - 'vfc-nfvo-driver-svnfm-huawei-master-docker-version-java-daily'
+            - 'vfc-nfvo-driver-ems-master-docker-java-version-shell-daily'
     robot-options: ''
     branch: 'master'
 \ No newline at end of file
diff --git a/jjb/vfc/vfc-nfvo-driver-vnfm-gvnfm-csit.yaml b/jjb/vfc/vfc-nfvo-driver-vnfm-gvnfm-csit.yaml
new file mode 100644
index 000000000..3edde732b
--- /dev/null
+++ b/jjb/vfc/vfc-nfvo-driver-vnfm-gvnfm-csit.yaml
@@ -0,0 +1,14 @@
+---
+- project:
+    name: vfc-nfvo-driver-vnfm-gvnfm-csit
+    jobs:
+      - '{project-name}-{stream}-verify-csit-{functionality}'
+      - '{project-name}-{stream}-csit-{functionality}'
+    project-name: 'vfc-nfvo-driver-vnfm-gvnfm'
+    stream: 'master'
+    functionality:
+      - 'sanity-check':
+          trigger_jobs:
+            - 'vfc-nfvo-driver-vnfm-gvnfm-master-docker-java-version-shell-daily'
+    robot-options: ''
+    branch: 'master'
+\ No newline at end of file
diff --git a/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-csit.yaml b/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-csit.yaml
new file mode 100644
index 000000000..d97117683
--- /dev/null
+++ b/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-csit.yaml
@@ -0,0 +1,14 @@
+---
+- project:
+    name: vfc-nfvo-driver-vnfm-svnfm-csit
+    jobs:
+      - '{project-name}-{stream}-verify-csit-{functionality}'
+      - '{project-name}-{stream}-csit-{functionality}'
+    project-name: 'vfc-nfvo-driver-vnfm-svnfm'
+    stream: 'master'
+    functionality:
+      - 'sanity-check':
+          trigger_jobs:
+            - 'vfc-nfvo-driver-vnfm-svnfm-master-docker-java-version-shell-daily'
+    robot-options: ''
+    branch: 'master'
+\ No newline at end of file