Merge "Delete HPA discovery csit test"

diff --git a/jenkins-config/clouds/openstack/cattle/queue-docker-4c-4g.cfg b/jenkins-config/clouds/openstack/cattle/queue-docker-4c-4g.cfg
index 9c3e28f..e3cd68c 100644 (file)
--- a/jenkins-config/clouds/openstack/cattle/queue-docker-4c-4g.cfg
+++ b/jenkins-config/clouds/openstack/cattle/queue-docker-4c-4g.cfg
@@ -1,4 +1,4 @@
-IMAGE_NAME=ZZCI - Ubuntu 16.04 - docker - x86_64 - 20180815-183048.979
+IMAGE_NAME=ZZCI - Ubuntu 16.04 - docker - x86_64 - 20180817-215307.947
 LABELS=queue-docker-4c-4g
 HARDWARE_ID=v2-highcpu-4
 INSTANCE_CAP=1

diff --git a/jenkins-config/clouds/openstack/cattle/ubuntu1604-docker-8c-8g.cfg b/jenkins-config/clouds/openstack/cattle/ubuntu1604-docker-8c-8g.cfg
index 5bd7dbd..f852426 100644 (file)
--- a/jenkins-config/clouds/openstack/cattle/ubuntu1604-docker-8c-8g.cfg
+++ b/jenkins-config/clouds/openstack/cattle/ubuntu1604-docker-8c-8g.cfg
@@ -1,3 +1,3 @@
-IMAGE_NAME=ZZCI - Ubuntu 16.04 - docker - x86_64 - 20180815-183048.979
+IMAGE_NAME=ZZCI - Ubuntu 16.04 - docker - x86_64 - 20180817-215307.947
 LABELS=ubuntu1604-docker-8c-8g
 HARDWARE_ID=v2-highcpu-8

diff --git a/jjb/aaf/aaf-sms.yaml b/jjb/aaf/aaf-sms.yaml
index b8ccf73..913c798 100644 (file)
--- a/jjb/aaf/aaf-sms.yaml
+++ b/jjb/aaf/aaf-sms.yaml
@@ -5,7 +5,8 @@
     subproject: 'aaf-sms-client'
     path: 'sms-service/src'
     jobs:
-      - gerrit-maven-clm
+      - gerrit-maven-clm:
+          mvn-params: '-f sms-client/java/pom.xml'
       - '{project-name}-{stream}-verify-golang'
       - '{project-name}-{stream}-merge-golang'
       - '{project-name}-{stream}-{subproject}-release-version-java-daily':

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-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-services-pm-mapper.yaml b/jjb/dcaegen2/dcaegen2-services-pm-mapper.yaml
deleted file mode 100644 (file)
index 12e13a5..0000000
--- a/jjb/dcaegen2/dcaegen2-services-pm-mapper.yaml
+++ /dev/null
@@ -1,36 +0,0 @@
----
-- project:
-    name: dcaegen2-services-pm-mapper
-    # job template iterators
-    project-name: 'dcaegen2-services-pm-mapper'
-    stream:
-      - 'master':
-          branch: 'master'
-    # apply to all jobs
-    project: 'dcaegen2/services/pm-mapper'
-    mvn-settings: 'dcaegen2-services-pm-mapper-settings'
-    files: '**'
-    maven-deploy-properties: |
-      deployAtEnd=true
-    archive-artifacts: ''
-    build-node: ubuntu1604-docker-8c-8g
-    jobs:
-      - gerrit-maven-clm
-      - '{project-name}-{stream}-release-version-java-daily'
-      - '{project-name}-{stream}-verify-java':
-          mvn-goals: 'clean install'
-      - '{project-name}-{stream}-merge-java':
-          mvn-goals: 'clean deploy'
-
-- project:
-    name: dcaegen2-services-pm-mapper-sonar
-    jobs:
-      - gerrit-maven-sonar
-    cron: 'H 11 * * *'
-    build-node: ubuntu1604-builder-4c-4g
-    project: 'dcaegen2/services/pm-mapper'
-    project-name: 'dcaegen2-services-pm-mapper'
-    branch: 'master'
-    mvn-settings: 'dcaegen2-services-pm-mapper-settings'
-    mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'

diff --git a/jjb/doc/doc.yaml b/jjb/doc/doc.yaml
index 538885f..53409de 100644 (file)
--- a/jjb/doc/doc.yaml
+++ b/jjb/doc/doc.yaml
@@ -3,7 +3,6 @@
     name: doc
     project-name: 'doc'
     jobs:
-      - gerrit-maven-clm
       - '{project-name}-{stream}-verify-rtd':
           build-node: centos7-builder-4c-4g
       - '{project-name}-{stream}-merge-rtd'

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

diff --git a/jjb/integration/integration.yaml b/jjb/integration/integration.yaml
index 6c700fb..e97f0ab 100644 (file)
--- a/jjb/integration/integration.yaml
+++ b/jjb/integration/integration.yaml
@@ -3,7 +3,8 @@
     name: integration
     project-name: 'integration'
     jobs:
-      - gerrit-maven-clm
+      - gerrit-maven-clm:
+          mvn-params: '-f version-manifest/pom.xml'
       - '{project-name}-{stream}-{subproject}-verify-java'
       - '{project-name}-{stream}-{subproject}-merge-java'
       - '{project-name}-{stream}-{subproject}-release-version-java-daily'

diff --git a/jjb/multicloud/build-multicloud-azure-docker-image.sh b/jjb/multicloud/build-multicloud-azure-docker-image.sh
new file mode 100644 (file)
index 0000000..e4e6d8d
--- /dev/null
+++ b/jjb/multicloud/build-multicloud-azure-docker-image.sh
@@ -0,0 +1,11 @@
+#!/bin/bash
+#
+echo '============== CALLING SCRIPT TO BUILD DOCKER IMAGES ================='
+
+CURRENTDIR="$(pwd)"
+echo $CURRENTDIR
+
+chmod 755 ./azure/docker/*.*
+
+./azure/docker/build_image.sh
+

diff --git a/jjb/multicloud/multicloud-azure-java.yaml b/jjb/multicloud/multicloud-azure-java.yaml
new file mode 100644 (file)
index 0000000..39179fa
--- /dev/null
+++ b/jjb/multicloud/multicloud-azure-java.yaml
@@ -0,0 +1,41 @@
+---
+- project:
+    name: multicloud-azure-java
+    project-name: 'multicloud-azure'
+    project: 'multicloud/azure'
+    stream:
+      - 'master':
+          branch: 'master'
+    mvn-settings: 'multicloud-azure-settings'
+    subproject:
+      - 'azure':
+          pom: 'azure/pom.xml'
+          pattern: 'azure/**'
+    jobs:
+      - gerrit-maven-clm
+      - '{project-name}-{stream}-verify-java'
+      - '{project-name}-{stream}-merge-java'
+      - '{project-name}-{stream}-{subproject}-verify-java'
+      - '{project-name}-{stream}-{subproject}-merge-java'
+      - '{project-name}-{stream}-{subproject}-release-version-java-daily'
+      - '{project-name}-{stream}-docker-java-version-shell-daily':
+          docker-pom: 'pom.xml'
+          mvn-goals: 'install'
+          script:
+            !include-raw-escape: 'build-multicloud-azure-docker-image.sh'
+    files: '**'
+    archive-artifacts: ''
+    build-node: ubuntu1604-builder-4c-4g
+
+- project:
+    name: multicloud-azure-sonar
+    jobs:
+      - gerrit-maven-sonar
+    cron: 'H 11 * * *'
+    build-node: ubuntu1604-builder-4c-4g
+    project: 'multicloud/azure'
+    project-name: 'multicloud-azure'
+    branch: 'master'
+    mvn-settings: 'multicloud-azure-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'

diff --git a/jjb/multicloud/multicloud-azure-python.yaml b/jjb/multicloud/multicloud-azure-python.yaml
new file mode 100644 (file)
index 0000000..5066a4c
--- /dev/null
+++ b/jjb/multicloud/multicloud-azure-python.yaml
@@ -0,0 +1,16 @@
+---
+- project:
+    name: multicloud-azure-python
+    project-name: 'multicloud-azure'
+    project: 'multicloud/azure'
+    stream:
+      - 'master':
+          branch: 'master'
+    mvn-settings: 'multicloud-azure-settings'
+    build-node: 'ubuntu1604-builder-4c-4g'
+    subproject:
+      - 'azure':
+          path: 'azure'
+          pattern: 'azure/**'
+    jobs:
+      - '{project-name}-{stream}-{subproject}-verify-python'

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 a11d53e..292bf85 100644 (file)
--- a/jjb/sdc/sdc-dcae-d-ci.yaml
+++ b/jjb/sdc/sdc-dcae-d-ci.yaml
@@ -30,5 +30,6 @@
     project-name: 'sdc-dcae-d-ci'
     branch: 'master'
     mvn-settings: 'sdc-dcae-d-ci-settings'
+    mvn-params: '-Dsonar.branch={branch}'
     mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    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 d2f6233..ae44b01 100644 (file)
--- a/jjb/sdc/sdc-dcae-d-dt-be-main.yaml
+++ b/jjb/sdc/sdc-dcae-d-dt-be-main.yaml
@@ -30,5 +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-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    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 e1c63c2..60eebbc 100644 (file)
--- a/jjb/sdc/sdc-dcae-d-dt-be-property.yaml
+++ b/jjb/sdc/sdc-dcae-d-dt-be-property.yaml
@@ -26,5 +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-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    mvn-opts: '-Xmx1024m'

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

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

diff --git a/jjb/sdc/sdc-dcae-d-tosca-lab.yaml b/jjb/sdc/sdc-dcae-d-tosca-lab.yaml
index 1fec7f7..fce057b 100644 (file)
--- a/jjb/sdc/sdc-dcae-d-tosca-lab.yaml
+++ b/jjb/sdc/sdc-dcae-d-tosca-lab.yaml
@@ -25,5 +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-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
\ No newline at end of file
+    mvn-opts: '-Xmx1024m'

diff --git a/jjb/sdc/sdc-jtosca.yaml b/jjb/sdc/sdc-jtosca.yaml
index a30fa6c..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.name=${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 3d02e68..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,5 +27,6 @@
     project-name: 'sdc-onap-ui'
     branch: 'master'
     mvn-settings: 'sdc-onap-ui-settings'
+    mvn-params: '-Dsonar.branch={branch}'
     mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    mvn-opts: '-Xmx1024m'

diff --git a/jjb/sdc/sdc-sdc-distribution-client.yaml b/jjb/sdc/sdc-sdc-distribution-client.yaml
index 36135d9..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.name=${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 8d8a43d..294e82f 100644 (file)
--- a/jjb/sdc/sdc-sdc-pubsub.yaml
+++ b/jjb/sdc/sdc-sdc-pubsub.yaml
@@ -11,7 +11,6 @@
     name: sdc-sdc-pubsub
     project-name: 'sdc-sdc-pubsub'
     jobs:
-      - gerrit-maven-clm
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
     project: 'sdc/sdc-pubsub'
@@ -22,6 +21,7 @@
     files: '**'
     archive-artifacts: ''
     build-timeout: 60
+    maven-version: 'mvn35'
 
 - project:
     name: sdc-sdc-pubsub-sonar
@@ -33,5 +33,6 @@
     project-name: 'sdc-sdc-pubsub'
     branch: 'master'
     mvn-settings: 'sdc-sdc-pubsub-settings'
+    mvn-params: '-Dsonar.branch={branch}'
     mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    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 b241aab..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.name=${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 efa3097..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,5 +31,6 @@
     project-name: 'sdc-sdc-workflow-designer'
     branch: 'master'
     mvn-settings: 'sdc-sdc-workflow-designer-settings'
+    mvn-params: '-Dsonar.branch={branch}'
     mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    mvn-opts: '-Xmx1024m'

diff --git a/jjb/sdc/sdc.yaml b/jjb/sdc/sdc.yaml
index 798325c..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.name=${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/jjb/so/so-chef-repo.yaml b/jjb/so/so-chef-repo.yaml
deleted file mode 100644 (file)
index 08acb54..0000000
--- a/jjb/so/so-chef-repo.yaml
+++ /dev/null
@@ -1,13 +0,0 @@
----
-- project:
-    name: so-chef-repo
-    project-name: 'so-chef-repo'
-    jobs:
-      - gerrit-maven-clm
-    project: 'so/chef-repo'
-    stream:
-      - 'master':
-          branch: 'master'
-    mvn-settings: 'so-chef-repo-settings'
-    files: '**'
-    archive-artifacts: ''

diff --git a/jjb/so/so-docker-config.yaml b/jjb/so/so-docker-config.yaml
deleted file mode 100644 (file)
index 0d61fc4..0000000
--- a/jjb/so/so-docker-config.yaml
+++ /dev/null
@@ -1,13 +0,0 @@
----
-- project:
-    name: so-docker-config
-    project-name: 'so-docker-config'
-    jobs:
-      - gerrit-maven-clm
-    project: 'so/docker-config'
-    stream:
-      - 'master':
-          branch: 'master'
-    mvn-settings: 'so-docker-config-settings'
-    files: '**'
-    archive-artifacts: ''

diff --git a/jjb/so/so-so-config.yaml b/jjb/so/so-so-config.yaml
deleted file mode 100644 (file)
index bf63719..0000000
--- a/jjb/so/so-so-config.yaml
+++ /dev/null
@@ -1,13 +0,0 @@
----
-- project:
-    name: so-so-config
-    project-name: 'so-so-config'
-    jobs:
-      - gerrit-maven-clm
-    project: 'so/so-config'
-    stream:
-      - 'master':
-          branch: 'master'
-    mvn-settings: 'so-so-config-settings'
-    files: '**'
-    archive-artifacts: ''

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

diff --git a/jjb/testsuite/testsuite-python-testing-utils.yaml b/jjb/testsuite/testsuite-python-testing-utils.yaml
index d5875a2..400170c 100644 (file)
--- a/jjb/testsuite/testsuite-python-testing-utils.yaml
+++ b/jjb/testsuite/testsuite-python-testing-utils.yaml
@@ -7,7 +7,6 @@
           path: '.'
           pattern: '**'
     jobs:
-      - gerrit-maven-clm
       - '{project-name}-{stream}-{subproject}-verify-python'
 
     project: 'testsuite/python-testing-utils'

diff --git a/jjb/testsuite/testsuite.yaml b/jjb/testsuite/testsuite.yaml
index 92d5ffa..f4a4652 100644 (file)
--- a/jjb/testsuite/testsuite.yaml
+++ b/jjb/testsuite/testsuite.yaml
@@ -3,7 +3,6 @@
     name: testsuite
     project-name: 'testsuite'
     jobs:
-      - gerrit-maven-clm
       - '{project-name}-{stream}-3scm-docker-shell-daily':
           script:
             !include-raw-escape: 'testsuite-docker.sh'

diff --git a/packer/provision/local-docker.yaml b/packer/provision/local-docker.yaml
index a82a03f..4170b81 100644 (file)
--- a/packer/provision/local-docker.yaml
+++ b/packer/provision/local-docker.yaml
@@ -5,6 +5,7 @@
   become_user: root
   become_method: sudo
   vars:
+    apt_file: /etc/apt/sources.list.d/google-chrome.list
     docker_compose_version: 1.17.1
     glide_checksum: sha256:c403933503ea40308ecfadcff581ff0dc3190c57958808bb9eed016f13f6f32c
     glide_version: v0.13.1
@@ -96,3 +97,59 @@
           - maven
           - python-ncclient
       become: true
+
+    - name: Add Google Chrome key
+      apt_key:
+        url: https://dl-ssl.google.com/linux/linux_signing_key.pub
+        state: present
+      become: true
+
+    - name: Add Google Chrome repo
+      copy: content="deb http://dl.google.com/linux/chrome/deb/ stable main" dest={{apt_file}} owner=root group=root mode=644
+      become: true
+
+    - name: Update apt cache
+      apt: update_cache=yes
+      become: true
+
+    - name: Install Google Chrome
+      apt:
+        name: google-chrome-stable
+        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'
+        dest: /tmp/rebar3
+
+    - name: Bootstrap rebar3
+      command: ./bootstrap
+      args:
+        chdir: /tmp/rebar3
+
+    - name: Install rebar3 to bin
+      copy:
+        src: /tmp/rebar3/rebar3
+        dest: /usr/bin/rebar3
+        remote_src: true
+      become: true
+
+    - name: Remove unused rebar3 source
+      file:
+        path: /tmp/rebar3
+        state: absent