Merge "Added multiplatform jobs for policy-api image"

diff --git a/jjb/aai/aai-graphgraph.yaml b/jjb/aai/aai-graphgraph.yaml
index 27e097e..ea34ec8 100644 (file)
--- a/jjb/aai/aai-graphgraph.yaml
+++ b/jjb/aai/aai-graphgraph.yaml
@@ -23,6 +23,8 @@
     stream:
       - 'master':
           branch: 'master'
+      - 'elalto':
+          branch: 'elalto'
     mvn-settings: 'aai-graphgraph-settings'
     files: '**'
     archive-artifacts: ''

diff --git a/jjb/ccsdk/features.yaml b/jjb/ccsdk/features.yaml
index 1560b48..fbbab16 100644 (file)
--- a/jjb/ccsdk/features.yaml
+++ b/jjb/ccsdk/features.yaml
@@ -17,6 +17,8 @@
           branch: 'master'
       - 'elalto':
           branch: 'elalto'
+      - 'elalto-fluorine':
+          branch: 'elalto-fluorine'
     mvn-settings: 'ccsdk-features-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
@@ -26,6 +28,7 @@
     files: '**'
     archive-artifacts: ''
     maven-version: "mvn35"
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     build-node: ubuntu1604-builder-4c-4g
 
 - project:

diff --git a/jjb/optf/build-optf-fgps-docker-image.sh b/jjb/optf/build-optf-fgps-docker-image.sh
index 6c93c8b..2d7b4f6 100644 (file)
--- a/jjb/optf/build-optf-fgps-docker-image.sh
+++ b/jjb/optf/build-optf-fgps-docker-image.sh
@@ -6,5 +6,5 @@ CURRENTDIR="$(pwd)"
 echo $CURRENTDIR
 
 chmod 755 ./*.*
-
+cd ./valetapi
 ./build-dockers.sh

diff --git a/jjb/vid/vid.yaml b/jjb/vid/vid.yaml
index 5cfce34..b0845fd 100644 (file)
--- a/jjb/vid/vid.yaml
+++ b/jjb/vid/vid.yaml
@@ -21,6 +21,8 @@
           mvn-params: '-P docker'
           container-public-registry: 'nexus3.onap.org:10001'
           container-staging-registry: 'nexus3.onap.org:10003'
+      - '{project-name}-gerrit-release-jobs':
+          build-node: centos7-docker-8c-8g
     project: 'vid'
     stream:
       - 'master':

diff --git a/packer/common-packer b/packer/common-packer
index 1cb0f11..57648e1 160000 (submodule)
--- a/packer/common-packer
+++ b/packer/common-packer
@@ -1 +1 @@
-Subproject commit 1cb0f11add7a8494b6b22f4d55a5ab3f7b1ee3cd
+Subproject commit 57648e1600c3c2457900ad4872f26d8f5cd679c7