Merge "Remove debug"

diff --git a/jjb/dmaap/dmaap-messagerouter-docker.yaml b/jjb/dmaap/dmaap-messagerouter-docker.yaml
index 26327ae..0b1cfb3 100644 (file)
--- a/jjb/dmaap/dmaap-messagerouter-docker.yaml
+++ b/jjb/dmaap/dmaap-messagerouter-docker.yaml
@@ -5,9 +5,8 @@
     project-name: 'dmaap-messagerouter-docker'
     jobs:
       - gerrit-maven-clm:
-      - '{project-name}-{stream}-verify-java'
-      - '{project-name}-{stream}-merge-java'
-      - '{project-name}-{stream}-release-version-java-daily'
+      - '{project-name}-{stream}-docker-version-java-daily':
+          mvn-params: '-Dmaven.test.skip=true'
       - '{project-name}-{stream}-docker-java-daily':
           mvn-params: '-Dmaven.test.skip=true'
     project: 'dmaap/messagerouter/messageservice'

diff --git a/jjb/doc/doc-templates-rtd.yaml b/jjb/doc/doc-templates-rtd.yaml
index 884c370..13b2583 100644 (file)
--- a/jjb/doc/doc-templates-rtd.yaml
+++ b/jjb/doc/doc-templates-rtd.yaml
@@ -42,6 +42,7 @@
           wipe-workspace: true
           submodule:
             recursive: '{submodule-recursive}'
+            timeout: '12'
 
     wrappers:
       - infra-wrappers:
@@ -76,6 +77,8 @@
           pip freeze
           cd $WORKSPACE/{path}
           tox
+          mkdir -p "$WORKSPACE/archives"
+          mv  docs/_build/html "$WORKSPACE/archives/"
 
     publishers:
       - infra-shiplogs:

diff --git a/jjb/doc/doc.yaml b/jjb/doc/doc.yaml
index 03a9e18..018f74a 100644 (file)
--- a/jjb/doc/doc.yaml
+++ b/jjb/doc/doc.yaml
@@ -18,3 +18,5 @@
           branch: 'master'
       - amsterdam:
           branch: 'amsterdam'
+      - beijing:
+          branch: 'beijing'

diff --git a/jjb/integration/integration.yaml b/jjb/integration/integration.yaml
index fad9ebd..f76f892 100644 (file)
--- a/jjb/integration/integration.yaml
+++ b/jjb/integration/integration.yaml
@@ -15,7 +15,6 @@
     stream:
       - 'master':
           branch: 'master'
-    stream:
       - 'beijing':
           branch: 'beijing'
     mvn-settings: 'integration-settings'

diff --git a/jjb/music/music-prom.yaml b/jjb/music/music-prom.yaml
new file mode 100644 (file)
index 0000000..9b88d13
--- /dev/null
+++ b/jjb/music/music-prom.yaml
@@ -0,0 +1,35 @@
+---
+- project:
+    name: music-prom
+    project-name: 'music-prom'
+    jobs:
+      - gerrit-maven-clm
+      - '{project-name}-{stream}-verify-java'
+      - '{project-name}-{stream}-merge-java'
+      - '{project-name}-{stream}-release-version-java-daily'
+      - '{project-name}-{stream}-docker-version-java-daily':
+          docker-pom: 'pom.xml'
+          mvn-profile: docker
+          mvn-params: '-Dmaven.test.skip=true'
+    project: 'music/prom'
+    stream:
+      - 'master':
+          branch: 'master'
+    mvn-settings: 'music-prom-settings'
+    files: '**'
+    archive-artifacts: ''
+    build-node: ubuntu1604-builder-4c-4g
+
+- project:
+    name: music-prom-sonar
+    jobs:
+      - gerrit-maven-sonar
+    cron: 'H 11 * * *'
+    build-node: ubuntu1604-builder-4c-4g
+    project: 'music/prom'
+    project-name: 'music-prom'
+    branch: 'master'
+    mvn-settings: 'music-prom-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+

diff --git a/jjb/optf/optf-osdf-csit.yaml b/jjb/optf/optf-osdf-csit.yaml
deleted file mode 100644 (file)
index 9c1a558..0000000
--- a/jjb/optf/optf-osdf-csit.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
----
-- project:
-     name: optf-osdf-csit
-     jobs:
-       - '{project-name}-{stream}-verify-csit-{functionality}'
-       - '{project-name}-{stream}-csit-{functionality}'
-     project-name: 'optf-osdf'
-     stream: 'master'
-     functionality:
-       - 'osdf':
-           trigger_jobs:
-             - 'optf-osdf-master-osdf-docker-java-version-shell-daily'
-     robot-options: ''
-     branch: 'master'

diff --git a/jjb/policy/policy-api.yaml b/jjb/policy/policy-api.yaml
new file mode 100644 (file)
index 0000000..0d1482f
--- /dev/null
+++ b/jjb/policy/policy-api.yaml
@@ -0,0 +1,29 @@
+---
+- project:
+    name: policy-api
+    project-name: 'policy-api'
+    jobs:
+      - gerrit-maven-clm
+      - '{project-name}-{stream}-verify-java'
+      - '{project-name}-{stream}-merge-java'
+
+    project: 'policy/api'
+    stream:
+      - 'master':
+          branch: 'master'
+    mvn-settings: 'policy-api-settings'
+    files: '**'
+    archive-artifacts: ''
+    build-node: ubuntu1604-builder-4c-4g
+- project:
+    name: policy-api-sonar
+    jobs:
+      - gerrit-maven-sonar
+    cron: 'H 11 * * *'
+    build-node: ubuntu1604-builder-4c-4g
+    project: 'policy/api'
+    project-name: 'policy-api'
+    branch: 'master'
+    mvn-settings: 'policy-api-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'

diff --git a/jjb/policy/policy-distribution.yaml b/jjb/policy/policy-distribution.yaml
new file mode 100644 (file)
index 0000000..d7f853e
--- /dev/null
+++ b/jjb/policy/policy-distribution.yaml
@@ -0,0 +1,29 @@
+---
+- project:
+    name: policy-distribution
+    project-name: 'policy-distribution'
+    jobs:
+      - gerrit-maven-clm
+      - '{project-name}-{stream}-verify-java'
+      - '{project-name}-{stream}-merge-java'
+
+    project: 'policy/distribution'
+    stream:
+      - 'master':
+          branch: 'master'
+    mvn-settings: 'policy-distribution-settings'
+    files: '**'
+    archive-artifacts: ''
+    build-node: ubuntu1604-builder-4c-4g
+- project:
+    name: policy-distribution-sonar
+    jobs:
+      - gerrit-maven-sonar
+    cron: 'H 11 * * *'
+    build-node: ubuntu1604-builder-4c-4g
+    project: 'policy/distribution'
+    project-name: 'policy-distribution'
+    branch: 'master'
+    mvn-settings: 'policy-distribution-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'

diff --git a/jjb/policy/policy-gui.yaml b/jjb/policy/policy-gui.yaml
new file mode 100644 (file)
index 0000000..63c4596
--- /dev/null
+++ b/jjb/policy/policy-gui.yaml
@@ -0,0 +1,29 @@
+---
+- project:
+    name: policy-gui
+    project-name: 'policy-gui'
+    jobs:
+      - gerrit-maven-clm
+      - '{project-name}-{stream}-verify-java'
+      - '{project-name}-{stream}-merge-java'
+
+    project: 'policy/gui'
+    stream:
+      - 'master':
+          branch: 'master'
+    mvn-settings: 'policy-gui-settings'
+    files: '**'
+    archive-artifacts: ''
+    build-node: ubuntu1604-builder-4c-4g
+- project:
+    name: policy-gui-sonar
+    jobs:
+      - gerrit-maven-sonar
+    cron: 'H 11 * * *'
+    build-node: ubuntu1604-builder-4c-4g
+    project: 'policy/gui'
+    project-name: 'policy-gui'
+    branch: 'master'
+    mvn-settings: 'policy-gui-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'

diff --git a/jjb/policy/policy-pap.yaml b/jjb/policy/policy-pap.yaml
new file mode 100644 (file)
index 0000000..0602e18
--- /dev/null
+++ b/jjb/policy/policy-pap.yaml
@@ -0,0 +1,29 @@
+---
+- project:
+    name: policy-pap
+    project-name: 'policy-pap'
+    jobs:
+      - gerrit-maven-clm
+      - '{project-name}-{stream}-verify-java'
+      - '{project-name}-{stream}-merge-java'
+
+    project: 'policy/pap'
+    stream:
+      - 'master':
+          branch: 'master'
+    mvn-settings: 'policy-pap-settings'
+    files: '**'
+    archive-artifacts: ''
+    build-node: ubuntu1604-builder-4c-4g
+- project:
+    name: policy-pap-sonar
+    jobs:
+      - gerrit-maven-sonar
+    cron: 'H 11 * * *'
+    build-node: ubuntu1604-builder-4c-4g
+    project: 'policy/pap'
+    project-name: 'policy-pap'
+    branch: 'master'
+    mvn-settings: 'policy-pap-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'

diff --git a/jjb/policy/policy-pdp.yaml b/jjb/policy/policy-pdp.yaml
new file mode 100644 (file)
index 0000000..c0f1f40
--- /dev/null
+++ b/jjb/policy/policy-pdp.yaml
@@ -0,0 +1,29 @@
+---
+- project:
+    name: policy-pdp
+    project-name: 'policy-pdp'
+    jobs:
+      - gerrit-maven-clm
+      - '{project-name}-{stream}-verify-java'
+      - '{project-name}-{stream}-merge-java'
+
+    project: 'policy/pdp'
+    stream:
+      - 'master':
+          branch: 'master'
+    mvn-settings: 'policy-pdp-settings'
+    files: '**'
+    archive-artifacts: ''
+    build-node: ubuntu1604-builder-4c-4g
+- project:
+    name: policy-pdp-sonar
+    jobs:
+      - gerrit-maven-sonar
+    cron: 'H 11 * * *'
+    build-node: ubuntu1604-builder-4c-4g
+    project: 'policy/pdp'
+    project-name: 'policy-pdp'
+    branch: 'master'
+    mvn-settings: 'policy-pdp-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'

diff --git a/jjb/portal-sdk/portal-sdk.yaml b/jjb/portal-sdk/portal-sdk.yaml
index 65e2011..25be786 100644 (file)
--- a/jjb/portal-sdk/portal-sdk.yaml
+++ b/jjb/portal-sdk/portal-sdk.yaml
@@ -26,6 +26,8 @@
           branch: 'release-2.2.0'
       - 'release-2.3.0':
           branch: 'release-2.3.0'
+      - 'release-2.4.0':
+          branch: 'release-2.4.0'
     mvn-settings: 'portal-sdk-settings'
     files: '**'
     archive-artifacts: ''

diff --git a/jjb/sdc/sdc-onap-ui.yaml b/jjb/sdc/sdc-onap-ui.yaml
new file mode 100644 (file)
index 0000000..32c6bf5
--- /dev/null
+++ b/jjb/sdc/sdc-onap-ui.yaml
@@ -0,0 +1,29 @@
+---
+
+- project:
+    name: sdc-onap-ui
+    project-name: 'sdc-onap-ui'
+    jobs:
+      - gerrit-maven-clm:
+      - '{project-name}-{stream}-verify-java'
+      - '{project-name}-{stream}-merge-java'
+    project: 'sdc/onap-ui'
+    stream:
+      - 'master':
+          branch: 'master'
+    mvn-settings: 'sdc-onap-ui-settings'
+    files: '**'
+    archive-artifacts: ''
+    build-timeout: 60
+- project:
+    name: sdc-onap-ui-sonar
+    jobs:
+      - gerrit-maven-sonar
+    cron: 'H 11 * * *'
+    build-node: ubuntu1604-builder-4c-4g
+    project: 'sdc/onap-ui'
+    project-name: 'sdc-onap-ui'
+    branch: 'master'
+    mvn-settings: 'sdc-onap-ui-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
\ No newline at end of file