Merge "Make rebar3 executable"

diff --git a/jjb/aai/aai-aai-config.yaml b/jjb/aai/aai-aai-config.yaml
deleted file mode 100644 (file)
index 52cf5f3..0000000
--- a/jjb/aai/aai-aai-config.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
----
-- project:
-    name: aai-aai-config
-    project-name: 'aai-aai-config'
-    jobs:
-      - gerrit-maven-clm
-    project: 'aai/aai-config'
-    stream:
-      - 'master':
-          branch: 'master'
-    mvn-settings: 'aai-aai-config-settings'
-    files: '**'
-    archive-artifacts: ''
-    build-node: ubuntu1604-builder-4c-4g

diff --git a/jjb/aai/aai-aai-data.yaml b/jjb/aai/aai-aai-data.yaml
deleted file mode 100644 (file)
index e012c05..0000000
--- a/jjb/aai/aai-aai-data.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
----
-- project:
-    name: aai-aai-data
-    project-name: 'aai-aai-data'
-    jobs:
-      - gerrit-maven-clm
-    project: 'aai/aai-data'
-    stream:
-      - 'master':
-          branch: 'master'
-    mvn-settings: 'aai-aai-data-settings'
-    files: '**'
-    archive-artifacts: ''
-    build-node: ubuntu1604-builder-4c-4g

diff --git a/jjb/aai/aai-eis.yaml b/jjb/aai/aai-eis.yaml
deleted file mode 100644 (file)
index 66f20e5..0000000
--- a/jjb/aai/aai-eis.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
----
-- project:
-    name: aai-eis
-    project-name: 'aai-eis'
-    jobs:
-      - gerrit-maven-clm
-    project: 'aai/eis'
-    stream:
-      - 'master':
-          branch: 'master'
-    mvn-settings: 'aai-eis-settings'
-    files: '**'
-    archive-artifacts: ''
-    build-node: ubuntu1604-builder-4c-4g

diff --git a/jjb/aai/aai-gap.yaml b/jjb/aai/aai-gap.yaml
deleted file mode 100644 (file)
index 4854bd0..0000000
--- a/jjb/aai/aai-gap.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
----
-- project:
-    name: aai-gap
-    project-name: 'aai-gap'
-    jobs:
-      - gerrit-maven-clm
-    project: 'aai/gap'
-    stream:
-      - 'master':
-          branch: 'master'
-    mvn-settings: 'aai-gap-settings'
-    files: '**'
-    archive-artifacts: ''
-    build-node: ubuntu1604-builder-4c-4g

diff --git a/jjb/aai/aai-graphgraph.yaml b/jjb/aai/aai-graphgraph.yaml
deleted file mode 100644 (file)
index 5e5ef52..0000000
--- a/jjb/aai/aai-graphgraph.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
----
-- project:
-    name: aai-graphgraph
-    project-name: 'aai-graphgraph'
-    jobs:
-      - gerrit-maven-clm
-    project: 'aai/graphgraph'
-    stream:
-      - 'master':
-          branch: 'master'
-    mvn-settings: 'aai-graphgraph-settings'
-    files: '**'
-    archive-artifacts: ''
-    build-node: ubuntu1604-builder-4c-4g

diff --git a/jjb/aai/aai-tabular-data-service.yaml b/jjb/aai/aai-tabular-data-service.yaml
deleted file mode 100644 (file)
index d673f83..0000000
--- a/jjb/aai/aai-tabular-data-service.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
----
-- project:
-    name: aai-tabular-data-service
-    project-name: 'aai-tabular-data-service'
-    jobs:
-      - gerrit-maven-clm
-    project: 'aai/tabular-data-service'
-    stream:
-      - 'master':
-          branch: 'master'
-    mvn-settings: 'aai-tabular-data-service-settings'
-    files: '**'
-    archive-artifacts: ''
-    build-node: ubuntu1604-builder-4c-4g

diff --git a/jjb/aai/aai-test-config.yaml b/jjb/aai/aai-test-config.yaml
deleted file mode 100644 (file)
index 19cf2b4..0000000
--- a/jjb/aai/aai-test-config.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
----
-- project:
-    name: aai-test-config
-    project-name: 'aai-test-config'
-    jobs:
-      - gerrit-maven-clm
-    project: 'aai/test-config'
-    stream:
-      - 'master':
-          branch: 'master'
-    mvn-settings: 'aai-test-config-settings'
-    files: '**'
-    archive-artifacts: ''
-    build-node: ubuntu1604-builder-4c-4g

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

diff --git a/jjb/appc/appc-csit.yaml b/jjb/appc/appc-csit.yaml
index e0dfbfe..52a53a8 100644 (file)
--- a/jjb/appc/appc-csit.yaml
+++ b/jjb/appc/appc-csit.yaml
@@ -8,8 +8,6 @@
     stream:
       - 'master':
           branch: master
-      - 'beijing':
-          branch: 'beijing'
     functionality:
       - 'healthcheck':
           trigger_jobs:

diff --git a/jjb/dcaegen2/dcaegen2-collectors-hv-ves.yaml b/jjb/dcaegen2/dcaegen2-collectors-hv-ves.yaml
index 601fd2b..c6929bb 100644 (file)
--- a/jjb/dcaegen2/dcaegen2-collectors-hv-ves.yaml
+++ b/jjb/dcaegen2/dcaegen2-collectors-hv-ves.yaml
@@ -37,4 +37,5 @@
     branch: 'master'
     mvn-settings: 'dcaegen2-collectors-hv-ves-settings'
     mvn-goals: 'clean install'
+    mvn-params: '-DskipDocker'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'

diff --git a/jjb/multicloud/multicloud-openstack-pike-csit.yaml b/jjb/multicloud/multicloud-openstack-pike-csit.yaml
index cdf098c..2a1d887 100644 (file)
--- a/jjb/multicloud/multicloud-openstack-pike-csit.yaml
+++ b/jjb/multicloud/multicloud-openstack-pike-csit.yaml
@@ -10,8 +10,5 @@
       - 'functionality1':
           trigger_jobs:
             - 'multicloud-openstack-master-docker-java-version-shell-daily'
-      - 'hpa-discovery':
-          trigger_jobs:
-            - 'multicloud-openstack-master-docker-java-version-shell-daily'
     robot-options: ''
     branch: 'master'