Merge "Upgrade to common-packer"

diff --git a/jjb/aaf/aaf-authz-docker.yaml b/jjb/aaf/aaf-authz-docker.yaml
deleted file mode 100644 (file)
index c89d878..0000000
--- a/jjb/aaf/aaf-authz-docker.yaml
+++ /dev/null
@@ -1,36 +0,0 @@
----
-
-- project:
-    name: aaf-authz-docker
-    project-name: 'aaf-authz-docker'
-    jobs:
-      - gerrit-maven-clm:
-      - '{project-name}-{stream}-verify-java-checkstyle'
-      - '{project-name}-{stream}-merge-properties-java':
-         mvn_properties:
-            - docker.pull.registry=nexus3.onap.org:10001
-            - docker.push.registry=nexus3.onap.org:10003
-      - '{project-name}-{stream}-release-java-daily-checkstyle':
-         setVersion: 'DontSetVersion'
-         mvn_properties:
-          - skipDockerBuild=true
-          - skipDockerTag=true
-          - skipDockerPush=true
-      - '{project-name}-{stream}-docker-java-properties-daily':
-         setVersion: 'DontSetVersion'
-         docker-pom: 'authz-service/pom.xml'
-         mvn-profile: 'docker'
-         maven-properties: |
-          skip.docker.build=false
-          skip.docker.tag=false
-          skip.docker.push=false
-          aaf-authz-docker.registry=$
-
-    project: 'aaf/authz'
-    stream:
-      - 'master':
-          branch: 'master'
-    mvn-settings: 'aaf-authz-settings'
-    files: '**'
-    archive-artifacts: ''
-    build-node: ubuntu1604-docker-8c-8g

diff --git a/jjb/aaf/aaf-authz.yaml b/jjb/aaf/aaf-authz.yaml
index 4850eda..918c581 100644 (file)
--- a/jjb/aaf/aaf-authz.yaml
+++ b/jjb/aaf/aaf-authz.yaml
@@ -7,16 +7,11 @@
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
       - '{project-name}-{stream}-release-version-java-daily'
-      - '{project-name}-{stream}-docker-java-daily'
-      - '{project-name}-{stream}-docker-version-java-daily':
-          mvn-goals: 'docker:build'
     project: 'aaf/authz'
     stream:
       - 'master':
           branch: 'master'
     mvn-settings: 'aaf-authz-settings'
-    mvn-profile: docker
-    docker-pom: 'authz-service/pom.xml'
     files: '**'
     archive-artifacts: ''
 - project:

diff --git a/jjb/aaf/aaf-cadi.yaml b/jjb/aaf/aaf-cadi.yaml
deleted file mode 100644 (file)
index 8943f5c..0000000
--- a/jjb/aaf/aaf-cadi.yaml
+++ /dev/null
@@ -1,28 +0,0 @@
----
-- project:
-    name: aaf-cadi
-    project-name: 'aaf-cadi'
-    jobs:
-      - gerrit-maven-clm:
-      - '{project-name}-{stream}-verify-java'
-      - '{project-name}-{stream}-merge-java'
-      - '{project-name}-{stream}-release-version-java-daily'
-    project: 'aaf/cadi'
-    stream:
-      - 'master':
-          branch: 'master'
-    mvn-settings: 'aaf-cadi-settings'
-    files: '**'
-    archive-artifacts: ''
-- project:
-    name: aaf-cadi-sonar
-    jobs:
-      - gerrit-maven-sonar
-    cron: 'H 11 * * *'
-    build-node: ubuntu1604-builder-4c-4g
-    project: 'aaf/cadi'
-    project-name: 'aaf-cadi'
-    branch: 'master'
-    mvn-settings: 'aaf-cadi-settings'
-    mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'

diff --git a/jjb/aaf/aaf-inno.yaml b/jjb/aaf/aaf-inno.yaml
deleted file mode 100644 (file)
index 0620e1f..0000000
--- a/jjb/aaf/aaf-inno.yaml
+++ /dev/null
@@ -1,28 +0,0 @@
----
-- project:
-    name: aaf-inno
-    project-name: 'aaf-inno'
-    jobs:
-      - gerrit-maven-clm:
-      - '{project-name}-{stream}-verify-java'
-      - '{project-name}-{stream}-merge-java'
-      - '{project-name}-{stream}-release-version-java-daily'
-    project: 'aaf/inno'
-    stream:
-      - 'master':
-          branch: 'master'
-    mvn-settings: 'aaf-inno-settings'
-    files: '**'
-    archive-artifacts: ''
-- project:
-    name: aaf-inno-sonar
-    jobs:
-      - gerrit-maven-sonar
-    cron: 'H 11 * * *'
-    build-node: ubuntu1604-builder-4c-4g
-    project: 'aaf/inno'
-    project-name: 'aaf-inno'
-    branch: 'master'
-    mvn-settings: 'aaf-inno-settings'
-    mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'

diff --git a/jjb/aaf/aaf-sms.yaml b/jjb/aaf/aaf-sms.yaml
index d097834..0e0c5e6 100644 (file)
--- a/jjb/aaf/aaf-sms.yaml
+++ b/jjb/aaf/aaf-sms.yaml
@@ -7,6 +7,9 @@
       - gerrit-maven-clm
       - '{project-name}-{stream}-verify-golang'
       - '{project-name}-{stream}-merge-golang'
+      - '{project-name}-{stream}-docker-golang-shell-daily':
+          script:
+            !include-raw-escape: 'build-sms-docker-image.sh'
     project: 'aaf/sms'
     stream:
       - 'master':

diff --git a/jjb/aaf/build-sms-docker-image.sh b/jjb/aaf/build-sms-docker-image.sh
new file mode 100755 (executable)
index 0000000..8f31cad
--- /dev/null
+++ b/jjb/aaf/build-sms-docker-image.sh
@@ -0,0 +1,10 @@
+#!/bin/bash
+#
+echo '============== CALLING SCRIPT TO BUILD DOCKER IMAGES ================='
+
+CURRENTDIR="$(pwd)"
+echo $CURRENTDIR
+
+cd sms-service/bin/
+chmod 755 *.sh
+./build_image.sh
\ No newline at end of file

diff --git a/jjb/aai/aai-aai-common.yaml b/jjb/aai/aai-aai-common.yaml
index 326394e..f79da62 100644 (file)
--- a/jjb/aai/aai-aai-common.yaml
+++ b/jjb/aai/aai-aai-common.yaml
@@ -6,8 +6,7 @@
       - gerrit-maven-clm:
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
-      - '{project-name}-{stream}-release-version-java-daily':
-          disabled: true
+      - '{project-name}-{stream}-release-version-java-daily'
     project: 'aai/aai-common'
     stream:
       - 'master':

diff --git a/jjb/aai/aai-babel.yaml b/jjb/aai/aai-babel.yaml
index ed68d30..d704728 100644 (file)
--- a/jjb/aai/aai-babel.yaml
+++ b/jjb/aai/aai-babel.yaml
@@ -6,12 +6,10 @@
       - gerrit-maven-clm:
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
-      - '{project-name}-{stream}-release-java-daily':
-          disabled: true
+      - '{project-name}-{stream}-release-java-daily'
       - '{project-name}-{stream}-aai-docker-java-daily':
           pom: 'pom.xml'
           mvn-goals: 'docker:build'
-          disabled: true
     project: 'aai/babel'
     stream:
       - 'master':

diff --git a/jjb/aai/aai-champ.yaml b/jjb/aai/aai-champ.yaml
index 89bab1b..40fcae0 100644 (file)
--- a/jjb/aai/aai-champ.yaml
+++ b/jjb/aai/aai-champ.yaml
@@ -10,8 +10,7 @@
       - '{project-name}-{stream}-aai-docker-java-daily':
           pom: 'champ-service/pom.xml'
           mvn-goals: 'docker:build'
-      - '{project-name}-{stream}-release-version-java-daily':
-          disabled: true
+      - '{project-name}-{stream}-release-version-java-daily'
     project: 'aai/champ'
     stream:
       - 'master':

diff --git a/jjb/aai/aai-data-router.yaml b/jjb/aai/aai-data-router.yaml
index 9626457..3075bc8 100644 (file)
--- a/jjb/aai/aai-data-router.yaml
+++ b/jjb/aai/aai-data-router.yaml
@@ -6,12 +6,10 @@
       - gerrit-maven-clm:
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
-      - '{project-name}-{stream}-release-version-java-daily':
-          disabled: true
+      - '{project-name}-{stream}-release-version-java-daily'
       - '{project-name}-{stream}-aai-docker-java-daily':
           pom: 'pom.xml'
           mvn-goals: 'docker:build'
-          disabled: true
     project: 'aai/data-router'
     stream:
       - 'master':

diff --git a/jjb/aai/aai-event-client.yaml b/jjb/aai/aai-event-client.yaml
index 31b8cf1..2284565 100644 (file)
--- a/jjb/aai/aai-event-client.yaml
+++ b/jjb/aai/aai-event-client.yaml
@@ -6,9 +6,7 @@
       - gerrit-maven-clm:
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
-      - '{project-name}-{stream}-release-version-java-daily':
-         disabled: true
-
+      - '{project-name}-{stream}-release-version-java-daily'
     project: 'aai/event-client'
     stream:
       - 'master':

diff --git a/jjb/aai/aai-logging-service.yaml b/jjb/aai/aai-logging-service.yaml
index b41e890..dc596be 100644 (file)
--- a/jjb/aai/aai-logging-service.yaml
+++ b/jjb/aai/aai-logging-service.yaml
@@ -6,8 +6,7 @@
       - gerrit-maven-clm:
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
-      - '{project-name}-{stream}-release-version-java-daily':
-         disabled: true
+      - '{project-name}-{stream}-release-version-java-daily'
     project: 'aai/logging-service'
     stream:
       - 'master':

diff --git a/jjb/aai/aai-model-loader.yaml b/jjb/aai/aai-model-loader.yaml
index 62a00bf..12b443c 100644 (file)
--- a/jjb/aai/aai-model-loader.yaml
+++ b/jjb/aai/aai-model-loader.yaml
@@ -6,13 +6,10 @@
       - gerrit-maven-clm:
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
-      - '{project-name}-{stream}-release-version-java-daily':
-          disabled: true
+      - '{project-name}-{stream}-release-version-java-daily'
       - '{project-name}-{stream}-aai-docker-java-daily':
           pom: 'pom.xml'
           mvn-goals: 'docker:build'
-          disabled: true
-
     project: 'aai/model-loader'
     stream:
       - 'master':

diff --git a/jjb/aai/aai-resources.yaml b/jjb/aai/aai-resources.yaml
index 47be5ec..3e12ba6 100644 (file)
--- a/jjb/aai/aai-resources.yaml
+++ b/jjb/aai/aai-resources.yaml
@@ -6,12 +6,10 @@
       - gerrit-maven-clm:
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
-      - '{project-name}-{stream}-release-version-java-daily':
-          disabled: true
+      - '{project-name}-{stream}-release-version-java-daily'
       - '{project-name}-{stream}-docker-java-daily':
           docker-pom: 'aai-resources/pom.xml'
           mvn-profile: 'docker'
-
     project: 'aai/resources'
     stream:
       - 'master':

diff --git a/jjb/aai/aai-rest-client.yaml b/jjb/aai/aai-rest-client.yaml
index fd2462a..670e250 100644 (file)
--- a/jjb/aai/aai-rest-client.yaml
+++ b/jjb/aai/aai-rest-client.yaml
@@ -6,8 +6,7 @@
       - gerrit-maven-clm:
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
-      - '{project-name}-{stream}-release-version-java-daily':
-         disabled: true
+      - '{project-name}-{stream}-release-version-java-daily'
     project: 'aai/rest-client'
     stream:
       - 'master':

diff --git a/jjb/aai/aai-router-core-service.yaml b/jjb/aai/aai-router-core-service.yaml
index 758235a..9eca1f4 100644 (file)
--- a/jjb/aai/aai-router-core-service.yaml
+++ b/jjb/aai/aai-router-core-service.yaml
@@ -6,8 +6,7 @@
       - gerrit-maven-clm:
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
-      - '{project-name}-{stream}-release-version-java-daily':
-         disabled: true
+      - '{project-name}-{stream}-release-version-java-daily'
     project: 'aai/router-core'
     stream:
       - 'master':

diff --git a/jjb/aai/aai-search-data-service.yaml b/jjb/aai/aai-search-data-service.yaml
index 2661a31..6084d40 100644 (file)
--- a/jjb/aai/aai-search-data-service.yaml
+++ b/jjb/aai/aai-search-data-service.yaml
@@ -6,12 +6,10 @@
       - gerrit-maven-clm:
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
-      - '{project-name}-{stream}-release-version-java-daily':
-          disabled: true
+      - '{project-name}-{stream}-release-version-java-daily'
       - '{project-name}-{stream}-aai-docker-java-daily':
           pom: 'pom.xml'
           mvn-goals: 'docker:build'
-          disabled: true
     project: 'aai/search-data-service'
     stream:
       - 'master':

diff --git a/jjb/aai/aai-sparky-be.yaml b/jjb/aai/aai-sparky-be.yaml
index fa851d8..3a1f2e0 100644 (file)
--- a/jjb/aai/aai-sparky-be.yaml
+++ b/jjb/aai/aai-sparky-be.yaml
@@ -6,12 +6,10 @@
       - gerrit-maven-clm:
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
-      - '{project-name}-{stream}-release-version-java-daily':
-          disabled: true
+      - '{project-name}-{stream}-release-version-java-daily'
       - '{project-name}-{stream}-aai-docker-java-daily':
           pom: 'pom.xml'
           mvn-goals: 'docker:build'
-          disabled: true
     project: 'aai/sparky-be'
     stream:
       - 'master':

diff --git a/jjb/aai/aai-sparky-fe.yaml b/jjb/aai/aai-sparky-fe.yaml
index 414765f..97d3604 100644 (file)
--- a/jjb/aai/aai-sparky-fe.yaml
+++ b/jjb/aai/aai-sparky-fe.yaml
@@ -7,8 +7,7 @@
       - gerrit-maven-clm:
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
-      - '{project-name}-{stream}-release-version-java-daily':
-          disabled: true
+      - '{project-name}-{stream}-release-version-java-daily'
     project: 'aai/sparky-fe'
     stream:
       - 'master':

diff --git a/jjb/aai/aai-traversal.yaml b/jjb/aai/aai-traversal.yaml
index 7c3de1b..8726ad4 100644 (file)
--- a/jjb/aai/aai-traversal.yaml
+++ b/jjb/aai/aai-traversal.yaml
@@ -6,12 +6,10 @@
       - gerrit-maven-clm:
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
-      - '{project-name}-{stream}-release-version-java-daily':
-         disabled: true
+      - '{project-name}-{stream}-release-version-java-daily'
       - '{project-name}-{stream}-docker-java-daily':
           docker-pom: 'aai-traversal/pom.xml'
           mvn-profile: 'docker'
-
     project: 'aai/traversal'
     stream:
       - 'master':

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

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

diff --git a/jjb/dcaegen2/dcaegen2-services-prh.yaml b/jjb/dcaegen2/dcaegen2-services-prh.yaml
index 052786e..b4a6a03 100644 (file)
--- a/jjb/dcaegen2/dcaegen2-services-prh.yaml
+++ b/jjb/dcaegen2/dcaegen2-services-prh.yaml
@@ -11,7 +11,7 @@
     stream:
       - 'master':
           branch: 'master'
-    mvn-settings: 'dcaegen2-services-mapper-settings'
+    mvn-settings: 'dcaegen2-services-prh-settings'
     files: '**'
     archive-artifacts: ''
     build-node: 'ubuntu1604-docker-8c-8g'

diff --git a/jjb/dcaegen2/dcaegen2-utils.yaml b/jjb/dcaegen2/dcaegen2-utils.yaml
index 25da475..e3cdc6a 100644 (file)
--- a/jjb/dcaegen2/dcaegen2-utils.yaml
+++ b/jjb/dcaegen2/dcaegen2-utils.yaml
@@ -3,30 +3,12 @@
     name: dcaegen2-utils
     project-name: 'dcaegen2-utils'
     python-version: python3
-    subproject:
-      - 'dcaeapplib':
-          tox-dir: dcaeapplib/
-          tox-envs: ''
-      - 'onap-dcae-cbs-docker-client':
-          tox-dir: onap-dcae-cbs-docker-client/
-          tox-envs: ''
-      - 'onap-dcae-dcaepolicy-lib':
-          tox-dir: onap-dcae-dcaepolicy-lib/
-          tox-envs: ''
-      - 'python-discovery-client':
-          tox-dir: python-discovery-client/
-          tox-envs: ''
-      - 'python-dockering':
-          tox-dir: python-dockering/
-          tox-envs: ''
 
     jobs:
       - gerrit-maven-clm
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
       - '{project-name}-{stream}-release-version-java-daily'
-      - '{project-name}-{subproject}-python-staging-{stream}'
-      - '{project-name}-{subproject}-python-release-{stream}'
 
     project: 'dcaegen2/utils'
     stream:

diff --git a/jjb/music/music-distributed-kv-store-csit.yaml b/jjb/music/music-distributed-kv-store-csit.yaml
new file mode 100644 (file)
index 0000000..1eeaf0f
--- /dev/null
+++ b/jjb/music/music-distributed-kv-store-csit.yaml
@@ -0,0 +1,17 @@
+---
+- project:
+    name: music-distributed-kv-store-csit
+    project-name: 'music-distributed-kv-store'
+    jobs:
+      - '{project-name}-{stream}-verify-csit-{functionality}'
+      - '{project-name}-{stream}-csit-{functionality}'
+    project: 'music/distributed-kv-store'
+    stream:
+      - 'master':
+          branch: 'master'
+    functionality:
+      - 'music-distributed-kv-store-test-plan':
+          trigger_jobs:
+            - 'music-distributed-kv-store-master-docker-golang-shell-daily'
+    robot-options: ''
+    branch: 'master'

diff --git a/jjb/policy/policy-csit.yaml b/jjb/policy/policy-csit.yaml
index db3bdbf..b45b5ae 100644 (file)
--- a/jjb/policy/policy-csit.yaml
+++ b/jjb/policy/policy-csit.yaml
@@ -8,8 +8,8 @@
     functionality:
       - 'health':
           trigger_jobs:
-            - 'policy-engine-{stream}-merge-java'
-            - 'policy-drools-pdp-{stream}-merge-java'
+            - 'policy-engine-{stream}-merge-scm-mvn-script'
+            - 'policy-drools-pdp-{stream}-merge-scm-mvn-script'
             - 'policy-drools-applications-{stream}-merge-java'
     robot-options: ''
     branch: 'master'

diff --git a/jjb/policy/policy-drools-applications.yaml b/jjb/policy/policy-drools-applications.yaml
index 39879c8..15c29ca 100644 (file)
--- a/jjb/policy/policy-drools-applications.yaml
+++ b/jjb/policy/policy-drools-applications.yaml
@@ -6,8 +6,7 @@
       - gerrit-maven-clm:
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
-      - '{project-name}-{stream}-release-version-java-daily':
-          disabled: true
+      - '{project-name}-{stream}-release-version-java-daily'
 
     project: 'policy/drools-applications'
     stream:

diff --git a/jjb/policy/policy-drools-pdp.yaml b/jjb/policy/policy-drools-pdp.yaml
index bacd997..030472a 100644 (file)
--- a/jjb/policy/policy-drools-pdp.yaml
+++ b/jjb/policy/policy-drools-pdp.yaml
@@ -17,7 +17,6 @@
             -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn'
           script:
             !include-raw-escape: 'include-raw-docker-release.sh'
-          disabled: true
 
     project: 'policy/drools-pdp'
     stream:

diff --git a/jjb/policy/policy-engine.yaml b/jjb/policy/policy-engine.yaml
index c364ef5..99e57b6 100644 (file)
--- a/jjb/policy/policy-engine.yaml
+++ b/jjb/policy/policy-engine.yaml
@@ -17,7 +17,6 @@
             -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn'
           script:
             !include-raw-escape: 'include-raw-docker-release.sh'
-          disabled: true
 
     project: 'policy/engine'
     stream:

diff --git a/jjb/so/so-aria-rest-server.yaml b/jjb/so/so-aria-rest-server.yaml
new file mode 100644 (file)
index 0000000..b43d17d
--- /dev/null
+++ b/jjb/so/so-aria-rest-server.yaml
@@ -0,0 +1,19 @@
+---
+- project:
+    name: so-aria-rest-server
+    project: 'so'
+    project-name: 'so'
+    python-version: python3
+    build-node: 'ubuntu1604-builder-4c-4g'
+    subproject:
+      - 'aria-aria-rest-sever':
+          tox-dir: aria/aria-rest-server/
+          tox-envs: ''
+    jobs:
+      - '{project-name}-{subproject}-python-staging-{stream}'
+      - '{project-name}-{subproject}-python-release-{stream}'
+
+    stream:
+      - 'master':
+          branch: 'master'
+

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

diff --git a/jjb/vfc/vfc-nfvo-multivimproxy-csit.yaml b/jjb/vfc/vfc-nfvo-multivimproxy-csit.yaml
new file mode 100644 (file)
index 0000000..580443f
--- /dev/null
+++ b/jjb/vfc/vfc-nfvo-multivimproxy-csit.yaml
@@ -0,0 +1,14 @@
+---
+- project:
+    name: vfc-nfvo-multivimproxy-csit
+    jobs:
+      - '{project-name}-{stream}-verify-csit-{functionality}'
+      - '{project-name}-{stream}-csit-{functionality}'
+    project-name: 'vfc-nfvo-multivimproxy'
+    stream: 'master'
+    functionality:
+      - 'sanity-check':
+          trigger_jobs:
+            - 'vfc-nfvo-multivimproxy-master-docker-java-version-shell-daily'
+    robot-options: ''
+    branch: 'master'
\ No newline at end of file

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

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

diff --git a/jjb/vnfsdk/vnfsdk-ice-csit.yaml b/jjb/vnfsdk/vnfsdk-ice-csit.yaml
new file mode 100644 (file)
index 0000000..3fc35c9
--- /dev/null
+++ b/jjb/vnfsdk/vnfsdk-ice-csit.yaml
@@ -0,0 +1,13 @@
+---
+- project:
+    name: vnfsdk-ice-csit
+    jobs:
+      - '{project-name}-{stream}-verify-csit-{functionality}'
+      - '{project-name}-{stream}-csit-{functionality}'
+    project-name: 'vnfsdk-ice'
+    stream: 'master'
+    functionality:
+      - 'sanity-check':
+          trigger_jobs:
+    robot-options: ''
+    branch: 'master'

diff --git a/jjb/vnfsdk/vnfsdk-ves-agent.yaml b/jjb/vnfsdk/vnfsdk-ves-agent.yaml
index c0bf970..05fdcbd 100644 (file)
--- a/jjb/vnfsdk/vnfsdk-ves-agent.yaml
+++ b/jjb/vnfsdk/vnfsdk-ves-agent.yaml
@@ -9,6 +9,7 @@
     jobs:
       - gerrit-maven-clm:
           mvn-params: '-f veslibrary/ves_javalibrary/evel_javalib2/pom.xml'
+      - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-{subproject}-verify-java'
       - '{project-name}-{stream}-{subproject}-merge-java'
       - '{project-name}-{stream}-{subproject}-release-version-java-daily'