Merge "Initial coala delint (mso)"

diff --git a/jjb/aai/aai-aai-common.yaml b/jjb/aai/aai-aai-common.yaml
new file mode 100644 (file)
index 0000000..1b07db7
--- /dev/null
+++ b/jjb/aai/aai-aai-common.yaml
@@ -0,0 +1,23 @@
+---
+- project:
+    name: aai-aai-common
+    project-name: 'aai-aai-common'
+    jobs:
+      - '{project-name}-{stream}-verify-java'
+      - '{project-name}-{stream}-merge-java'
+      - '{project-name}-{stream}-release-version-java-daily'
+      - '{project-name}-docker-image-blessing'
+      - '{project-name}-{stream}-stage-site-java':
+          site-pom: 'pom.xml'
+          trigger-job: '{project-name}-{stream}-release-version-java-daily'
+
+    project: 'aai/aai-common'
+    stream:
+      - 'master':
+          branch: 'master'
+      - 'release-1.0.0':
+          branch: 'release-1.0.0'
+    mvn-settings: 'aai-aai-common-settings'
+    files: '**'
+    archive-artifacts: ''
+    build-node: ubuntu1604-basebuild-4c-4g

diff --git a/jjb/aai/aai-data-router.yaml b/jjb/aai/aai-data-router.yaml
new file mode 100644 (file)
index 0000000..5a67506
--- /dev/null
+++ b/jjb/aai/aai-data-router.yaml
@@ -0,0 +1,19 @@
+---
+- project:
+    name: aai-data-router
+    project-name: 'aai-data-router'
+    jobs:
+      - '{project-name}-{stream}-verify-java'
+      - '{project-name}-{stream}-merge-java'
+      - '{project-name}-{stream}-release-java-daily'
+      - '{project-name}-docker-image-blessing'
+      - '{project-name}-{stream}-aai-docker-java-daily':
+          pom: 'pom.xml'
+          mvn-goals: 'docker:build'
+    project: 'aai/data-router'
+    stream:
+      - 'master':
+          branch: 'master'
+    mvn-settings: 'aai-data-router-settings'
+    files: '**'
+    archive-artifacts: ''
\ No newline at end of file

diff --git a/jjb/aai/aai-resources.yaml b/jjb/aai/aai-resources.yaml
new file mode 100644 (file)
index 0000000..6b67a9e
--- /dev/null
+++ b/jjb/aai/aai-resources.yaml
@@ -0,0 +1,24 @@
+---
+- project:
+    name: aai-resources
+    project-name: 'aai-resources'
+    jobs:
+      - '{project-name}-{stream}-verify-java'
+      - '{project-name}-{stream}-merge-java'
+      - '{project-name}-{stream}-release-version-java-daily'
+      - '{project-name}-docker-image-blessing'
+      - '{project-name}-{stream}-stage-site-java':
+          site-pom: 'pom.xml'
+          trigger-job: '{project-name}-{stream}-release-version-java-daily'
+      - '{project-name}-{stream}-aai-docker-java-version-daily':
+          pom: 'aai-resources/pom.xml'
+          mvn-goals: 'docker:build docker:push'
+
+    project: 'aai/resources'
+    stream:
+      - 'master':
+          branch: 'master'
+    mvn-settings: 'aai-resources-settings'
+    files: '**'
+    archive-artifacts: ''
+    build-node: ubuntu1604-basebuild-4c-4g

diff --git a/jjb/aai/aai-rest-client.yaml b/jjb/aai/aai-rest-client.yaml
new file mode 100644 (file)
index 0000000..7294600
--- /dev/null
+++ b/jjb/aai/aai-rest-client.yaml
@@ -0,0 +1,15 @@
+---
+- project:
+    name: aai-rest-client
+    project-name: 'aai-rest-client'
+    jobs:
+      - '{project-name}-{stream}-verify-java'
+      - '{project-name}-{stream}-merge-java'
+      - '{project-name}-{stream}-release-version-java-daily'
+    project: 'aai/rest-client'
+    stream:
+      - 'master':
+          branch: 'master'
+    mvn-settings: 'aai-rest-client-settings'
+    files: '**'
+    archive-artifacts: ''

diff --git a/jjb/aai/aai-router-core-service.yaml b/jjb/aai/aai-router-core-service.yaml
new file mode 100644 (file)
index 0000000..097b800
--- /dev/null
+++ b/jjb/aai/aai-router-core-service.yaml
@@ -0,0 +1,15 @@
+---
+- project:
+    name: aai-router-core
+    project-name: 'aai-router-core'
+    jobs:
+      - '{project-name}-{stream}-verify-java'
+      - '{project-name}-{stream}-merge-java'
+      - '{project-name}-{stream}-release-version-java-daily'
+    project: 'aai/router-core'
+    stream:
+      - 'master':
+          branch: 'master'
+    mvn-settings: 'aai-router-core-settings'
+    files: '**'
+    archive-artifacts: ''

diff --git a/jjb/aai/aai-search-data-service.yaml b/jjb/aai/aai-search-data-service.yaml
new file mode 100644 (file)
index 0000000..54a63a3
--- /dev/null
+++ b/jjb/aai/aai-search-data-service.yaml
@@ -0,0 +1,19 @@
+---
+- project:
+    name: aai-search-data-service
+    project-name: 'aai-search-data-service'
+    jobs:
+      - '{project-name}-{stream}-verify-java'
+      - '{project-name}-{stream}-merge-java'
+      - '{project-name}-{stream}-release-java-daily'
+      - '{project-name}-docker-image-blessing'
+      - '{project-name}-{stream}-aai-docker-java-daily':
+          pom: 'pom.xml'
+          mvn-goals: 'docker:build'
+    project: 'aai/search-data-service'
+    stream:
+      - 'master':
+          branch: 'master'
+    mvn-settings: 'aai-search-data-service-settings'
+    files: '**'
+    archive-artifacts: ''
\ No newline at end of file

diff --git a/jjb/aai/aai-traversal.yaml b/jjb/aai/aai-traversal.yaml
new file mode 100644 (file)
index 0000000..146ddbd
--- /dev/null
+++ b/jjb/aai/aai-traversal.yaml
@@ -0,0 +1,24 @@
+---
+- project:
+    name: aai-traversal
+    project-name: 'aai-traversal'
+    jobs:
+      - '{project-name}-{stream}-verify-java'
+      - '{project-name}-{stream}-merge-java'
+      - '{project-name}-{stream}-release-version-java-daily'
+      - '{project-name}-docker-image-blessing'
+      - '{project-name}-{stream}-stage-site-java':
+          site-pom: 'pom.xml'
+          trigger-job: '{project-name}-{stream}-release-version-java-daily'
+      - '{project-name}-{stream}-aai-docker-java-version-daily':
+          pom: 'aai-traversal/pom.xml'
+          mvn-goals: 'docker:build docker:push'
+
+    project: 'aai/traversal'
+    stream:
+      - 'master':
+          branch: 'master'
+    mvn-settings: 'aai-traversal-settings'
+    files: '**'
+    archive-artifacts: ''
+    build-node: ubuntu1604-basebuild-4c-4g

diff --git a/jjb/dcae/apod-analytics.yaml b/jjb/dcae/apod-analytics.yaml
index ebfcf8e..234bd2d 100644 (file)
--- a/jjb/dcae/apod-analytics.yaml
+++ b/jjb/dcae/apod-analytics.yaml
@@ -26,7 +26,7 @@
       - '{project-name}-{stream}-daily-release-2scm-mvn-script':
           mvn-goals-versioning:
             'versions:set versions:update-child-modules versions:commit'
-          mvn-goals: 'clean deploy'
+          mvn-goals: 'clean deploy sonar:sonar -Dsonar.host.url=${{SONAR}}'
           maven-deploy-properties: |
               deployAtEnd=true
           script: |

diff --git a/jjb/dcae/collectors-ves.yaml b/jjb/dcae/collectors-ves.yaml
index e8ab1da..8351cf2 100644 (file)
--- a/jjb/dcae/collectors-ves.yaml
+++ b/jjb/dcae/collectors-ves.yaml
@@ -33,6 +33,7 @@
               deployAtEnd=true
           script: |
             bash ./docker-build.sh release
+      - '{project-name}-{stream}-release-version-java-daily'
       - '{project-name}-{stream}-stage-site-java':
           site-pom: 'pom.xml'
           trigger-job: '{project-name}-{stream}-daily-release-scm-mvn-script'

diff --git a/jjb/dcae/dmaapbc.yaml b/jjb/dcae/dmaapbc.yaml
index d057d02..52cc032 100644 (file)
--- a/jjb/dcae/dmaapbc.yaml
+++ b/jjb/dcae/dmaapbc.yaml
@@ -28,6 +28,7 @@
               deployAtEnd=true
           script: |
             bash ./script-dmaapbc-docker-build.sh release
+      - '{project-name}-{stream}-release-version-java-daily'
       - '{project-name}-{stream}-stage-site-java':
           site-pom: 'pom.xml'
           trigger-job: '{project-name}-{stream}-daily-release-scm-mvn-script'

diff --git a/jjb/global-templates-java.yaml b/jjb/global-templates-java.yaml
index 8bc3706..52e0c3a 100644 (file)
--- a/jjb/global-templates-java.yaml
+++ b/jjb/global-templates-java.yaml
@@ -1315,3 +1315,73 @@
     publishers:
       - infra-shiplogs:
           maven-version: '{maven-version}'
+
+- job-template:
+    name: '{project-name}-{stream}-aai-docker-java-version-daily'
+    project-type: freestyle
+    node: 'ubuntu1604-docker-8c-8g'
+
+    properties:
+      - infra-properties:
+          build-days-to-keep: '{build-days-to-keep}'
+
+    parameters:
+      - infra-parameters:
+          project: '{project}'
+          branch: '{branch}'
+          refspec: 'refs/heads/{branch}'
+          artifacts: '{archive-artifacts}'
+      - maven-exec:
+          maven-version: '{maven-version}'
+
+    scm:
+      - gerrit-trigger-scm:
+          refspec: ''
+          choosing-strategy: 'default'
+
+    wrappers:
+      - 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: '{maven-version}'
+          pom: 'pom.xml'
+          goals: 'clean install -DskipTests -B -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn'
+          settings: '{mvn-settings}'
+          settings-type: cfp
+          global-settings: 'global-settings'
+          global-settings-type: cfp
+
+      - maven-target:
+          maven-version: '{maven-version}'
+          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.onap.org:10001
+            - docker.push.registry=nexus3.onap.org:10003
+
+    publishers:
+      - infra-shiplogs:
+          maven-version: '{maven-version}'
+

diff --git a/jjb/include-docker-push.sh b/jjb/include-docker-push.sh
index 3e1b883..2360055 100644 (file)
--- a/jjb/include-docker-push.sh
+++ b/jjb/include-docker-push.sh
@@ -29,6 +29,9 @@ if [[ $PROJECT =~ $SEARCH ]] ; then
     if [ "$VERSION" == "1.0.0" ]; then
         docker tag $REPO_PATH:latest $REPO_PATH:1.0-STAGING-latest;
         docker push $REPO_PATH:1.0-STAGING-latest;
+    elif [ "$VERSION" == "1.1.0" ]; then
+        docker tag $REPO_PATH:latest $REPO_PATH:1.1-STAGING-latest;
+        docker push $REPO_PATH:1.1-STAGING-latest;
     else
         docker push $REPO_PATH:latest;
     fi

diff --git a/jjb/sdc/sdc-sdc-titan-cassandra.yaml b/jjb/sdc/sdc-sdc-titan-cassandra.yaml
new file mode 100644 (file)
index 0000000..c4dc069
--- /dev/null
+++ b/jjb/sdc/sdc-sdc-titan-cassandra.yaml
@@ -0,0 +1,21 @@
+---
+
+- project:
+    name: sdc-sdc-titan-cassandra
+    project-name: 'sdc-sdc-titan-cassandra'
+    jobs:
+      - '{project-name}-{stream}-verify-java'
+      - '{project-name}-{stream}-release-version-java-daily'
+      - '{project-name}-{stream}-merge-java'
+      - '{project-name}-{stream}-stage-site-java':
+          site-pom: 'pom.xml'
+          trigger-job: '{project-name}-{stream}-release-version-java-daily'
+
+    project: 'sdc/sdc-titan-cassandra'
+    stream:
+      - 'master':
+          branch: 'master'
+    mvn-settings: 'sdc-sdc-titan-cassandra-settings'
+    files: '**'
+    archive-artifacts: ''
+    build-timeout: 60

diff --git a/jjb/sdc/sdc.yaml b/jjb/sdc/sdc.yaml
index bce4185..e8af204 100644 (file)
--- a/jjb/sdc/sdc.yaml
+++ b/jjb/sdc/sdc.yaml
@@ -24,4 +24,3 @@
     files: '**'
     archive-artifacts: ''
     build-node: ubuntu1604-basebuild-8c-8g
-    build-timeout: 360