Merge "Update docker nodes"

diff --git a/jjb/aaf/build-sshsm-docker-images.sh b/jjb/aaf/build-sshsm-docker-images.sh
index b70c13d..7ed0719 100755 (executable)
--- a/jjb/aaf/build-sshsm-docker-images.sh
+++ b/jjb/aaf/build-sshsm-docker-images.sh
@@ -8,4 +8,4 @@ echo $CURRENTDIR
 echo 'Building AAF/sshsm base containers'
 cd bin/base
 chmod 755 build_base_images.sh
-sh build_base_images.sh
+./build_base_images.sh

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 ce036f1..2a1d887 100644 (file)
--- a/jjb/multicloud/multicloud-openstack-pike-csit.yaml
+++ b/jjb/multicloud/multicloud-openstack-pike-csit.yaml
@@ -4,14 +4,11 @@
     jobs:
       - '{project-name}-{stream}-verify-csit-{functionality}'
       - '{project-name}-{stream}-csit-{functionality}'
-    project-name: 'multicloud-openstack-pike'
+    project-name: 'multicloud-pike'
     stream: 'master'
     functionality:
       - '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'

diff --git a/jjb/sdc/sdc-csit.yaml b/jjb/sdc/sdc-csit.yaml
index 0e20414..db3db4c 100644 (file)
--- a/jjb/sdc/sdc-csit.yaml
+++ b/jjb/sdc/sdc-csit.yaml
@@ -8,8 +8,6 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'beijing':
-          branch: 'beijing'
     functionality:
       - 'sanity':
           trigger_jobs:
@@ -23,4 +21,4 @@
     robot-options: ''
     branch: 'master'
     html-dir: 'archives'
-    html-files: 'SDC_CI_Extent_Report.html'
\ No newline at end of file
+    html-files: 'SDC_CI_Extent_Report.html'

diff --git a/jjb/sdc/sdc-dcae-d-ci.yaml b/jjb/sdc/sdc-dcae-d-ci.yaml
index 6494da9..292bf85 100644 (file)
--- a/jjb/sdc/sdc-dcae-d-ci.yaml
+++ b/jjb/sdc/sdc-dcae-d-ci.yaml
@@ -30,6 +30,6 @@
     project-name: 'sdc-dcae-d-ci'
     branch: 'master'
     mvn-settings: 'sdc-dcae-d-ci-settings'
-    mvn-params: '-Dsonar.branch=${branch}'
+    mvn-params: '-Dsonar.branch={branch}'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m'

diff --git a/jjb/sdc/sdc-dcae-d-dt-be-main.yaml b/jjb/sdc/sdc-dcae-d-dt-be-main.yaml
index 47a2eed..ae44b01 100644 (file)
--- a/jjb/sdc/sdc-dcae-d-dt-be-main.yaml
+++ b/jjb/sdc/sdc-dcae-d-dt-be-main.yaml
@@ -30,6 +30,6 @@
     project-name: 'sdc-dcae-d-dt-be-main'
     branch: 'master'
     mvn-settings: 'sdc-dcae-d-dt-be-main-settings'
-    mvn-params: '-Dsonar.branch=${branch}'
+    mvn-params: '-Dsonar.branch={branch}'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m'

diff --git a/jjb/sdc/sdc-dcae-d-dt-be-property.yaml b/jjb/sdc/sdc-dcae-d-dt-be-property.yaml
index f1b7c7f..60eebbc 100644 (file)
--- a/jjb/sdc/sdc-dcae-d-dt-be-property.yaml
+++ b/jjb/sdc/sdc-dcae-d-dt-be-property.yaml
@@ -26,6 +26,6 @@
     project-name: 'sdc-dcae-d-dt-be-property'
     branch: 'master'
     mvn-settings: 'sdc-dcae-d-dt-be-property-settings'
-    mvn-params: '-Dsonar.branch=${branch}'
+    mvn-params: '-Dsonar.branch={branch}'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m'

diff --git a/jjb/sdc/sdc-dcae-d-dt.yaml b/jjb/sdc/sdc-dcae-d-dt.yaml
index 9e5a39c..3913fc2 100644 (file)
--- a/jjb/sdc/sdc-dcae-d-dt.yaml
+++ b/jjb/sdc/sdc-dcae-d-dt.yaml
@@ -31,6 +31,6 @@
     project-name: 'sdc-dcae-d-dt'
     branch: 'master'
     mvn-settings: 'sdc-dcae-d-dt-settings'
-    mvn-params: '-Dsonar.branch=${branch}'
+    mvn-params: '-Dsonar.branch={branch}'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m'

diff --git a/jjb/sdc/sdc-dcae-d-fe.yaml b/jjb/sdc/sdc-dcae-d-fe.yaml
index 3504852..4142e85 100644 (file)
--- a/jjb/sdc/sdc-dcae-d-fe.yaml
+++ b/jjb/sdc/sdc-dcae-d-fe.yaml
@@ -31,6 +31,6 @@
     project-name: 'sdc-dcae-d-fe'
     branch: 'master'
     mvn-settings: 'sdc-dcae-d-fe-settings'
-    mvn-params: '-Dsonar.branch=${branch}'
+    mvn-params: '-Dsonar.branch={branch}'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m'

diff --git a/jjb/sdc/sdc-dcae-d-tosca-lab.yaml b/jjb/sdc/sdc-dcae-d-tosca-lab.yaml
index 8866c29..fce057b 100644 (file)
--- a/jjb/sdc/sdc-dcae-d-tosca-lab.yaml
+++ b/jjb/sdc/sdc-dcae-d-tosca-lab.yaml
@@ -25,6 +25,6 @@
     project-name: 'sdc-dcae-d-tosca-lab'
     branch: 'master'
     mvn-settings: 'sdc-dcae-d-tosca-lab-settings'
-    mvn-params: '-Dsonar.branch=${branch}'
+    mvn-params: '-Dsonar.branch={branch}'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m'

diff --git a/jjb/sdc/sdc-jtosca.yaml b/jjb/sdc/sdc-jtosca.yaml
index 6296e2b..01890a0 100644 (file)
--- a/jjb/sdc/sdc-jtosca.yaml
+++ b/jjb/sdc/sdc-jtosca.yaml
@@ -12,12 +12,11 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'beijing':
-          branch: 'beijing'
     mvn-settings: 'sdc-jtosca-settings'
     files: '**'
     archive-artifacts: ''
     build-timeout: 60
+    maven-version: 'mvn35'
 
 - project:
     name: sdc-jtosca-sonar
@@ -29,6 +28,6 @@
     project-name: 'sdc-jtosca'
     branch: 'master'
     mvn-settings: 'sdc-jtosca-settings'
-    mvn-params: '-Dsonar.branch=${branch}'
+    mvn-params: '-Dsonar.branch={branch}'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m'

diff --git a/jjb/sdc/sdc-onap-ui.yaml b/jjb/sdc/sdc-onap-ui.yaml
index 38a7f7b..2b09a24 100644 (file)
--- a/jjb/sdc/sdc-onap-ui.yaml
+++ b/jjb/sdc/sdc-onap-ui.yaml
@@ -15,6 +15,7 @@
     files: '**'
     archive-artifacts: ''
     build-timeout: 60
+    maven-version: 'mvn35'
 
 - project:
     name: sdc-onap-ui-sonar
@@ -26,6 +27,6 @@
     project-name: 'sdc-onap-ui'
     branch: 'master'
     mvn-settings: 'sdc-onap-ui-settings'
-    mvn-params: '-Dsonar.branch=${branch}'
+    mvn-params: '-Dsonar.branch={branch}'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m'

diff --git a/jjb/sdc/sdc-sdc-distribution-client.yaml b/jjb/sdc/sdc-sdc-distribution-client.yaml
index 8ea64fc..90606ad 100644 (file)
--- a/jjb/sdc/sdc-sdc-distribution-client.yaml
+++ b/jjb/sdc/sdc-sdc-distribution-client.yaml
@@ -12,12 +12,11 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'beijing':
-          branch: 'beijing'
     mvn-settings: 'sdc-sdc-distribution-client-settings'
     files: '**'
     archive-artifacts: ''
     build-timeout: 60
+    maven-version: 'mvn35'
 
 - project:
     name: sdc-sdc-distribution-client-sonar
@@ -29,6 +28,6 @@
     project-name: 'sdc-sdc-distribution-client'
     branch: 'master'
     mvn-settings: 'sdc-sdc-distribution-client-settings'
-    mvn-params: '-Dsonar.branch=${branch}'
+    mvn-params: '-Dsonar.branch={branch}'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m'

diff --git a/jjb/sdc/sdc-sdc-docker-base.yaml b/jjb/sdc/sdc-sdc-docker-base.yaml
index 766d0af..c03e353 100644 (file)
--- a/jjb/sdc/sdc-sdc-docker-base.yaml
+++ b/jjb/sdc/sdc-sdc-docker-base.yaml
@@ -11,9 +11,8 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'beijing':
-          branch: 'beijing'
     mvn-settings: 'sdc-sdc-docker-base-settings'
     files: '**'
     archive-artifacts: ''
     build-node: ubuntu1604-builder-8c-8g
+    maven-version: 'mvn35'

diff --git a/jjb/sdc/sdc-sdc-pubsub.yaml b/jjb/sdc/sdc-sdc-pubsub.yaml
index 0746bca..294e82f 100644 (file)
--- a/jjb/sdc/sdc-sdc-pubsub.yaml
+++ b/jjb/sdc/sdc-sdc-pubsub.yaml
@@ -21,6 +21,7 @@
     files: '**'
     archive-artifacts: ''
     build-timeout: 60
+    maven-version: 'mvn35'
 
 - project:
     name: sdc-sdc-pubsub-sonar
@@ -32,6 +33,6 @@
     project-name: 'sdc-sdc-pubsub'
     branch: 'master'
     mvn-settings: 'sdc-sdc-pubsub-settings'
-    mvn-params: '-Dsonar.branch=${branch}'
+    mvn-params: '-Dsonar.branch={branch}'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m'

diff --git a/jjb/sdc/sdc-sdc-titan-cassandra.yaml b/jjb/sdc/sdc-sdc-titan-cassandra.yaml
index 035e0e0..128f02c 100644 (file)
--- a/jjb/sdc/sdc-sdc-titan-cassandra.yaml
+++ b/jjb/sdc/sdc-sdc-titan-cassandra.yaml
@@ -16,3 +16,4 @@
     files: '**'
     archive-artifacts: ''
     build-timeout: 60
+    maven-version: 'mvn35'

diff --git a/jjb/sdc/sdc-sdc-tosca.yaml b/jjb/sdc/sdc-sdc-tosca.yaml
index 206cc77..8baf6f7 100644 (file)
--- a/jjb/sdc/sdc-sdc-tosca.yaml
+++ b/jjb/sdc/sdc-sdc-tosca.yaml
@@ -12,12 +12,11 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'beijing':
-          branch: 'beijing'
     mvn-settings: 'sdc-sdc-tosca-settings'
     files: '**'
     archive-artifacts: ''
     build-timeout: 60
+    maven-version: 'mvn35'
 
 - project:
     name: sdc-sdc-tosca-sonar
@@ -29,6 +28,6 @@
     project-name: 'sdc-sdc-tosca'
     branch: 'master'
     mvn-settings: 'sdc-sdc-tosca-settings'
-    mvn-params: '-Dsonar.branch=${branch}'
+    mvn-params: '-Dsonar.branch={branch}'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m'

diff --git a/jjb/sdc/sdc-sdc-workflow-designer.yaml b/jjb/sdc/sdc-sdc-workflow-designer.yaml
index 62c8c21..a7db7e6 100644 (file)
--- a/jjb/sdc/sdc-sdc-workflow-designer.yaml
+++ b/jjb/sdc/sdc-sdc-workflow-designer.yaml
@@ -13,14 +13,13 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'beijing':
-          branch: 'beijing'
     mvn-settings: 'sdc-sdc-workflow-designer-settings'
     files: '**'
     archive-artifacts: ''
     docker-pom: 'pom.xml'
     mvn-profile: docker
     build-node: ubuntu1604-builder-4c-4g
+    maven-version: 'mvn35'
 
 - project:
     name: sdc-sdc-workflow-designer-sonar
@@ -32,6 +31,6 @@
     project-name: 'sdc-sdc-workflow-designer'
     branch: 'master'
     mvn-settings: 'sdc-sdc-workflow-designer-settings'
-    mvn-params: '-Dsonar.branch=${branch}'
+    mvn-params: '-Dsonar.branch={branch}'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m'

diff --git a/jjb/sdc/sdc.yaml b/jjb/sdc/sdc.yaml
index 7be066f..63a0c2e 100644 (file)
--- a/jjb/sdc/sdc.yaml
+++ b/jjb/sdc/sdc.yaml
@@ -22,12 +22,11 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'beijing':
-          branch: 'beijing'
     mvn-settings: 'sdc-settings'
     files: '**'
     archive-artifacts: ''
     build-node: ubuntu1604-builder-8c-8g
+    maven-version: 'mvn35'
 
 - project:
     name: sdc-sonar
@@ -39,6 +38,6 @@
     project-name: 'sdc'
     branch: 'master'
     mvn-settings: 'sdc-settings'
-    mvn-params: '-Djacoco.skip=false -Dsonar.branch=${branch} -Dnpm.registry=https://nexus.onap.org/content/repositories/npm/'
+    mvn-params: '-Djacoco.skip=false -Dsonar.branch={branch} -Dnpm.registry=https://nexus.onap.org/content/repositories/npm/'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m'

diff --git a/packer/provision/local-docker.yaml b/packer/provision/local-docker.yaml
index f563608..e452b70 100644 (file)
--- a/packer/provision/local-docker.yaml
+++ b/packer/provision/local-docker.yaml
@@ -118,6 +118,20 @@
         state: present
       become: true
 
+    - name: Install Erlang dependency packages
+      apt:
+        name:
+          - libwxgtk3.0-0v5
+          - libsctp1
+          - libwxbase3.0-0v5
+      become: true
+
+    - name: Install Erlang
+      apt:
+        deb: https://packages.erlang-solutions.com/erlang/esl-erlang/FLAVOUR_1_general/esl-erlang_19.3.6-1~ubuntu~trusty_amd64.deb
+      install_recommends: yes
+      become: true
+
     - name: Clone rebar3
       git:
         repo: 'https://github.com/erlang/rebar3.git'
@@ -128,8 +142,12 @@
       args:
         chdir: /tmp/rebar3
 
-    - name: Move rebar3 to bin
-      command: mv /tmp/rebar3/rebar3 /usr/bin/rebar3
+    - name: Install rebar3 to bin
+      copy:
+        src: /tmp/rebar3/rebar3
+        dest: /usr/bin/rebar3
+        mode: 0644
+        remote_src: true
       become: true
 
     - name: Remove unused rebar3 source