X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=jjb%2Foptf%2Foptf-osdf.yaml;h=36b169786023a9a3d022a640d4f259b8be147482;hb=f98713682d6c0a94dc98233a31e5fcfe31d05678;hp=e31f9f751a93fd9aa80b1a744ba99ff2acc724f6;hpb=376c8270b80d094b537ef63e0f5449f5259c2542;p=ci-management.git

diff --git a/jjb/optf/optf-osdf.yaml b/jjb/optf/optf-osdf.yaml
index e31f9f751..36b169786 100644
--- a/jjb/optf/optf-osdf.yaml
+++ b/jjb/optf/optf-osdf.yaml
@@ -6,6 +6,8 @@
     stream:
       - 'master':
           branch: 'master'
+      - 'beijing':
+          branch: 'beijing'
     mvn-settings: 'optf-osdf-settings'
     subproject:
       - 'osdf':
@@ -17,23 +19,60 @@
       - '{project-name}-{stream}-{subproject}-verify-java'
       - '{project-name}-{stream}-{subproject}-merge-java'
       - '{project-name}-{stream}-{subproject}-release-version-java-daily'
+    files: '**'
+    archive-artifacts: ''
+    build-node: 'ubuntu1604-builder-4c-4g'
+
+- project:
+    name: optf-osdf-docker
+    project-name: 'optf-osdf'
+    project: 'optf/osdf'
+    stream:
+      - 'master':
+          branch: 'master'
+      - 'beijing':
+          branch: 'beijing'
+    mvn-settings: 'optf-osdf-settings'
+    subproject:
+      - 'osdf':
+          path: '.'
+          pattern: '**'
+          pom: 'pom.xml'
+    jobs:
       - '{project-name}-{stream}-{subproject}-docker-java-version-shell-daily':
           docker-pom: 'pom.xml'
           mvn-goals: 'install'
+          mvn-params: '-Dmaven.test.skip=true'
           script:
             !include-raw-escape: 'build-optf-osdf-docker-image.sh'
-    files: '**'
-    archive-artifacts: ''
-    build-node: 'ubuntu1604-basebuild-4c-4g'
+          build-node: queue-docker-4c-4g
+      - '{project-name}-{stream}-{subproject}-docker-java-shell-daily':
+          docker-pom: 'pom.xml'
+          mvn-goals: 'install'
+          mvn-params: '-Dmaven.test.skip=true'
+          script:
+            !include-raw-escape: 'build-optf-osdf-docker-image.sh'
+          build-node: queue-docker-4c-4g
+
 - project:
     name: optf-osdf-sonar
     jobs:
       - gerrit-maven-sonar
-    cron: 'H 11 * * *'
-    build-node: ubuntu1604-basebuild-4c-4g
+    cron: '@daily'
+    build-node: ubuntu1604-builder-4c-4g
     project: 'optf/osdf'
     project-name: 'optf-osdf'
     branch: 'master'
     mvn-settings: 'optf-osdf-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+
+- project:
+    name: optf-osdf-clm
+    jobs:
+      - gerrit-maven-clm
+    nexus-iq-namespace: 'onap-'
+    project: optf/osdf
+    project-name: 'optf-osdf'
+    branch: 'master'
+    mvn-settings: 'optf-osdf-settings'