Merge "Added complete set of DCAE Controller JJB jobs."

11 files changed, 264 insertions, 0 deletions

diff --git a/.gitignore b/.gitignore
index 51ff612a5..16ebbe211 100644
--- a/.gitignore
+++ b/.gitignore
@@ -16,3 +16,6 @@ target/
 # IntelliJ
 .idea/
 *.iml
+
+# Eclipse
+.project
diff --git a/jjb/dcae/dcae-controller-analytics.yaml b/jjb/dcae/dcae-controller-analytics.yaml
new file mode 100644
index 000000000..dcfac4407
--- /dev/null
+++ b/jjb/dcae/dcae-controller-analytics.yaml
@@ -0,0 +1,21 @@
+---
+- project:
+    name: dcae-controller-analytics
+    project-name: 'dcae-controller-analytics'
+    jobs:
+      - '{project-name}-{stream}-verify-java'
+      - '{project-name}-{stream}-merge-java'
+      - '{project-name}-{stream}-release-java-daily'
+
+    project: 'dcae/controller/analytics'
+    stream:
+      - 'master':
+          branch: 'master'
+    mvn-settings: 'dcae-settings'
+    # due to a strange macro / variable translation problem this needs to be
+    # passed as a string block to properly get the properties correctly defined
+    # in the job
+    maven-deploy-properties: |
+      deployAtEnd=true
+    files: '**'
+    archive-artifacts: ''
diff --git a/jjb/dcae/dcae-controller.yaml b/jjb/dcae/dcae-controller.yaml
new file mode 100644
index 000000000..0e082ee71
--- /dev/null
+++ b/jjb/dcae/dcae-controller.yaml
@@ -0,0 +1,21 @@
+---
+- project:
+    name: dcae-controller
+    project-name: 'dcae-controller'
+    jobs:
+      - '{project-name}-{stream}-verify-java'
+      - '{project-name}-{stream}-merge-java'
+      - '{project-name}-{stream}-release-java-daily'
+
+    project: 'dcae/controller'
+    stream:
+      - 'master':
+          branch: 'master'
+    mvn-settings: 'dcae-settings'
+    # due to a strange macro / variable translation problem this needs to be
+    # passed as a string block to properly get the properties correctly defined
+    # in the job
+    maven-deploy-properties: |
+      deployAtEnd=true
+    files: '**'
+    archive-artifacts: ''
diff --git a/jjb/dcae/dcae-operation-utils.yaml b/jjb/dcae/dcae-operation-utils.yaml
new file mode 100644
index 000000000..182163ecb
--- /dev/null
+++ b/jjb/dcae/dcae-operation-utils.yaml
@@ -0,0 +1,25 @@
+---
+- project:
+    name: dcae-operation-utils
+    project-name: 'dcae-operation-utils'
+    subproject:
+      - 'utils':
+          pom: 'operation-utils/pom.xml'
+          pattern: 'operation-utils/**'
+    jobs:
+      - '{project-name}-{stream}-{subproject}-verify-java'
+      - '{project-name}-{stream}-{subproject}-merge-java'
+      - '{project-name}-{stream}-{subproject}-release-java-daily'
+
+    project: 'dcae/operation/utils'
+    stream:
+      - 'master':
+          branch: 'master'
+    mvn-settings: 'dcae-settings'
+    # due to a strange macro / variable translation problem this needs to be
+    # passed as a string block to properly get the properties correctly defined
+    # in the job
+    maven-deploy-properties: |
+      deployAtEnd=true
+    files: '**'
+    archive-artifacts: ''
diff --git a/jjb/global-templates-java.yaml b/jjb/global-templates-java.yaml
index af595b3b9..32770f276 100644
--- a/jjb/global-templates-java.yaml
+++ b/jjb/global-templates-java.yaml
@@ -184,6 +184,74 @@
           global-settings-type: cfp
 
 - job-template:
+    # Job template for Java daily release jobs with POM not at the root
+    #
+    # The purpose of this job template is to run "maven version && maven clean
+    # deploy" for projects using this template.
+    #
+    # Required Variables:
+    #     branch:    git branch (eg. stable/lithium or master)
+    #     pom:       name/location of the pom.xml file relative to the workspace
+
+
+    name: '{project-name}-{stream}-{subproject}-release-java-daily'
+
+    project-type: freestyle
+    node: '{build-node}'
+    maven-deploy-properties:
+    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:
+      # 11 AM UTC
+      - timed: 'H 11 * * *'
+
+    builders:
+      - provide-maven-settings:
+          global-settings-file: 'global-settings'
+          settings-file: '{mvn-settings}'
+
+      - inject:
+          properties-file: version.properties
+      - maven-target:
+          maven-version: 'mvn33'
+          pom: '{pom}'
+          goals: 'versions:set versions:update-child-modules versions:commit'
+          properties:
+            - 'newVersion=${{release_version}}'
+          settings: '{mvn-settings}'
+          settings-type: cfp
+          global-settings: 'global-settings'
+          global-settings-type: cfp
+
+      - maven-target:
+          maven-version: 'mvn33'
+          goals: 'clean deploy sonar:sonar -Dsonar.host.url=https://sonar.openecomp.org'
+          properties:
+            - '{maven-deploy-properties}'
+          settings: '{mvn-settings}'
+          settings-type: cfp
+          global-settings: 'global-settings'
+          global-settings-type: cfp
+
+- job-template:
     # Job template for Java merge jobs
     #
     # The purpose of this job template is to run "maven clean deploy" for
diff --git a/jjb/ncomp/ncomp-cdap.yaml b/jjb/ncomp/ncomp-cdap.yaml
new file mode 100644
index 000000000..ec56af821
--- /dev/null
+++ b/jjb/ncomp/ncomp-cdap.yaml
@@ -0,0 +1,21 @@
+---
+- project:
+    name: ncomp-cdap
+    project-name: 'ncomp-cdap'
+    jobs:
+      - '{project-name}-{stream}-verify-java'
+      - '{project-name}-{stream}-merge-java'
+      - '{project-name}-{stream}-release-java-daily'
+
+    project: 'ncomp/cdap'
+    stream:
+      - 'master':
+          branch: 'master'
+    mvn-settings: 'ncomp-settings'
+    # due to a strange macro / variable translation problem this needs to be
+    # passed as a string block to properly get the properties correctly defined
+    # in the job
+    maven-deploy-properties: |
+      deployAtEnd=true
+    files: '**'
+    archive-artifacts: ''
diff --git a/jjb/ncomp/ncomp-core.yaml b/jjb/ncomp/ncomp-core.yaml
new file mode 100644
index 000000000..894972818
--- /dev/null
+++ b/jjb/ncomp/ncomp-core.yaml
@@ -0,0 +1,21 @@
+---
+- project:
+    name: ncomp-core
+    project-name: 'ncomp-core'
+    jobs:
+      - '{project-name}-{stream}-verify-java'
+      - '{project-name}-{stream}-merge-java'
+      - '{project-name}-{stream}-release-java-daily'
+
+    project: 'ncomp/core'
+    stream:
+      - 'master':
+          branch: 'master'
+    mvn-settings: 'ncomp-settings'
+    # due to a strange macro / variable translation problem this needs to be
+    # passed as a string block to properly get the properties correctly defined
+    # in the job
+    maven-deploy-properties: |
+      deployAtEnd=true
+    files: '**'
+    archive-artifacts: ''
diff --git a/jjb/ncomp/ncomp-docker.yaml b/jjb/ncomp/ncomp-docker.yaml
new file mode 100644
index 000000000..ba0c12b3a
--- /dev/null
+++ b/jjb/ncomp/ncomp-docker.yaml
@@ -0,0 +1,21 @@
+---
+- project:
+    name: ncomp-docker
+    project-name: 'ncomp-docker'
+    jobs:
+      - '{project-name}-{stream}-verify-java'
+      - '{project-name}-{stream}-merge-java'
+      - '{project-name}-{stream}-release-java-daily'
+
+    project: 'ncomp/docker'
+    stream:
+      - 'master':
+          branch: 'master'
+    mvn-settings: 'ncomp-settings'
+    # due to a strange macro / variable translation problem this needs to be
+    # passed as a string block to properly get the properties correctly defined
+    # in the job
+    maven-deploy-properties: |
+      deployAtEnd=true
+    files: '**'
+    archive-artifacts: ''
diff --git a/jjb/ncomp/ncomp-openstack.yaml b/jjb/ncomp/ncomp-openstack.yaml
new file mode 100644
index 000000000..eb9272f9d
--- /dev/null
+++ b/jjb/ncomp/ncomp-openstack.yaml
@@ -0,0 +1,21 @@
+---
+- project:
+    name: ncomp-openstack
+    project-name: 'ncomp-openstack'
+    jobs:
+      - '{project-name}-{stream}-verify-java'
+      - '{project-name}-{stream}-merge-java'
+      - '{project-name}-{stream}-release-java-daily'
+
+    project: 'ncomp/openstack'
+    stream:
+      - 'master':
+          branch: 'master'
+    mvn-settings: 'ncomp-settings'
+    # due to a strange macro / variable translation problem this needs to be
+    # passed as a string block to properly get the properties correctly defined
+    # in the job
+    maven-deploy-properties: |
+      deployAtEnd=true
+    files: '**'
+    archive-artifacts: ''
diff --git a/jjb/ncomp/ncomp-sirius-manager.yaml b/jjb/ncomp/ncomp-sirius-manager.yaml
new file mode 100644
index 000000000..86cf77152
--- /dev/null
+++ b/jjb/ncomp/ncomp-sirius-manager.yaml
@@ -0,0 +1,21 @@
+---
+- project:
+    name: ncomp-sirius-manager
+    project-name: 'ncomp-sirius-manager'
+    jobs:
+      - '{project-name}-{stream}-verify-java'
+      - '{project-name}-{stream}-merge-java'
+      - '{project-name}-{stream}-release-java-daily'
+
+    project: 'ncomp/sirius/manager'
+    stream:
+      - 'master':
+          branch: 'master'
+    mvn-settings: 'ncomp-settings'
+    # due to a strange macro / variable translation problem this needs to be
+    # passed as a string block to properly get the properties correctly defined
+    # in the job
+    maven-deploy-properties: |
+      deployAtEnd=true
+    files: '**'
+    archive-artifacts: ''
diff --git a/jjb/ncomp/ncomp-utils.yaml b/jjb/ncomp/ncomp-utils.yaml
new file mode 100644
index 000000000..d2c2b3fce
--- /dev/null
+++ b/jjb/ncomp/ncomp-utils.yaml
@@ -0,0 +1,21 @@
+---
+- project:
+    name: ncomp-utils
+    project-name: 'ncomp-utils'
+    jobs:
+      - '{project-name}-{stream}-verify-java'
+      - '{project-name}-{stream}-merge-java'
+      - '{project-name}-{stream}-release-java-daily'
+
+    project: 'ncomp/utils'
+    stream:
+      - 'master':
+          branch: 'master'
+    mvn-settings: 'ncomp-settings'
+    # due to a strange macro / variable translation problem this needs to be
+    # passed as a string block to properly get the properties correctly defined
+    # in the job
+    maven-deploy-properties: |
+      deployAtEnd=true
+    files: '**'
+    archive-artifacts: ''