Merge "Remove commented out docs toxenv"

diff --git a/Sandbox_Setup.md b/Sandbox_Setup.md
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/jenkins-config/clouds/openstack/cattle/centos7-redis-4c-4g.cfg b/jenkins-config/clouds/openstack/cattle/centos7-redis-4c-4g.cfg
index ba78178..4c0766c 100644 (file)
--- a/jenkins-config/clouds/openstack/cattle/centos7-redis-4c-4g.cfg
+++ b/jenkins-config/clouds/openstack/cattle/centos7-redis-4c-4g.cfg
@@ -1,3 +1,3 @@
-IMAGE_NAME=ZZCI - CentOS 7 - builder - 20171102-0130
+IMAGE_NAME=Ubuntu 16.04 - redis - 20180101-1003
 LABELS=centos7-redis-4c-4g
 HARDWARE_ID=v2-highcpu-4

diff --git a/jenkins-config/clouds/openstack/cattle/cloud.cfg b/jenkins-config/clouds/openstack/cattle/cloud.cfg
index 37c4bca..7872de3 100644 (file)
--- a/jenkins-config/clouds/openstack/cattle/cloud.cfg
+++ b/jenkins-config/clouds/openstack/cattle/cloud.cfg
@@ -8,7 +8,7 @@ CLOUD_ZONE=ca-ymq-1
 IMAGE_NAME=ZZCI - CentOS 7 - builder - 20180601-1002
 HARDWARE_ID=v1-standard-1
 NETWORK_ID=bd089be9-e846-4afe-905b-8bb6c7c90faf
-USER_DATA_ID=jenkins-init-system
+USER_DATA_ID=jenkins-init-script
 INSTANCE_CAP=75
 SANDBOX_CAP=4
 FLOATING_IP_POOL=

diff --git a/jenkins-config/clouds/openstack/cattle/queue-docker-4c-4g.cfg b/jenkins-config/clouds/openstack/cattle/queue-docker-4c-4g.cfg
new file mode 100644 (file)
index 0000000..3fb352b
--- /dev/null
+++ b/jenkins-config/clouds/openstack/cattle/queue-docker-4c-4g.cfg
@@ -0,0 +1,6 @@
+IMAGE_NAME=Ubuntu 16.04 - docker - 20180101-1003
+LABELS=queue-docker-4c-4g
+HARDWARE_ID=v2-highcpu-4
+INSTANCE_CAP=1
+NUM_EXECUTORS=4
+RETENTION_TIME=4320

diff --git a/jenkins-config/global-vars-sandbox.sh b/jenkins-config/global-vars-sandbox.sh
index b590e09..589dc6e 100644 (file)
--- a/jenkins-config/global-vars-sandbox.sh
+++ b/jenkins-config/global-vars-sandbox.sh
@@ -11,5 +11,6 @@ LOGS_SERVER=https://logs.onap.org
 NEXUS_URL=https://nexus.onap.org
 NEXUSPROXY=https://nexus.onap.org
 REGISTRY_PORTS=10001 10002 10003 10004
+SIGUL_KEY=onap-test
 SILO=sandbox
 SONAR_URL=https://sonar.onap.org

diff --git a/jenkins.ini.example b/jenkins.ini.example
index 959f06b..9dcf357 100644 (file)
--- a/jenkins.ini.example
+++ b/jenkins.ini.example
@@ -1,13 +1,12 @@
 [job_builder]
 ignore_cache=True
 keep_descriptions=False
-include_path=.:scripts:~/git/
+include_path=.
 recursive=True
+retain_anchors=True
 
 [jenkins]
+user=#username#
+password=#api_token#
+url=https://jenkins.onap.org/sandbox
 query_plugins_info=False
-#user=jenkins
-#password=1234567890abcdef1234567890abcdef
-url=http://localhost:8080
-##### This is deprecated, use job_builder section instead
-#ignore_cache=True

diff --git a/jjb/aaf/aaf-authz.yaml b/jjb/aaf/aaf-authz.yaml
index 76ff4b6..a4256ee 100644 (file)
--- a/jjb/aaf/aaf-authz.yaml
+++ b/jjb/aaf/aaf-authz.yaml
@@ -19,6 +19,7 @@
     mvn-settings: 'aaf-authz-settings'
     files: '**'
     archive-artifacts: ''
+
 - project:
     name: aaf-authz-sonar
     jobs:

diff --git a/jjb/aai/aai-aai-common.yaml b/jjb/aai/aai-aai-common.yaml
index af81d73..c458f9f 100644 (file)
--- a/jjb/aai/aai-aai-common.yaml
+++ b/jjb/aai/aai-aai-common.yaml
@@ -17,6 +17,7 @@
     files: '**'
     archive-artifacts: ''
     build-node: ubuntu1604-builder-4c-4g
+
 - project:
     name: aai-aai-common-sonar
     jobs:

diff --git a/jjb/aai/aai-babel.yaml b/jjb/aai/aai-babel.yaml
index c2dbdde..2166499 100644 (file)
--- a/jjb/aai/aai-babel.yaml
+++ b/jjb/aai/aai-babel.yaml
@@ -20,6 +20,7 @@
     files: '**'
     archive-artifacts: ''
     build-node: ubuntu1604-builder-4c-4g
+
 - project:
     name: aai-babel-sonar
     jobs:

diff --git a/jjb/aai/aai-champ.yaml b/jjb/aai/aai-champ.yaml
index bc56b4f..dcbc03d 100644 (file)
--- a/jjb/aai/aai-champ.yaml
+++ b/jjb/aai/aai-champ.yaml
@@ -20,6 +20,7 @@
     files: '**'
     archive-artifacts: ''
     build-node: ubuntu1604-builder-4c-4g
+
 - project:
     name: aai-champ-sonar
     jobs:

diff --git a/jjb/aai/aai-data-router.yaml b/jjb/aai/aai-data-router.yaml
index 81eaa11..7d8a780 100644 (file)
--- a/jjb/aai/aai-data-router.yaml
+++ b/jjb/aai/aai-data-router.yaml
@@ -19,6 +19,7 @@
     mvn-settings: 'aai-data-router-settings'
     files: '**'
     archive-artifacts: ''
+
 - project:
     name: aai-data-router-sonar
     jobs:

diff --git a/jjb/aai/aai-esr-server.yaml b/jjb/aai/aai-esr-server.yaml
index 624caef..0cfa1c8 100644 (file)
--- a/jjb/aai/aai-esr-server.yaml
+++ b/jjb/aai/aai-esr-server.yaml
@@ -20,6 +20,7 @@
     docker-pom: 'pom.xml'
     mvn-profile: docker
     build-node: ubuntu1604-builder-4c-4g
+
 - project:
     name: aai-esr-server-sonar
     jobs:

diff --git a/jjb/aai/aai-gizmo.yaml b/jjb/aai/aai-gizmo.yaml
index 5be6f46..3c2cb89 100644 (file)
--- a/jjb/aai/aai-gizmo.yaml
+++ b/jjb/aai/aai-gizmo.yaml
@@ -20,6 +20,7 @@
     files: '**'
     archive-artifacts: ''
     build-node: ubuntu1604-builder-4c-4g
+
 - project:
     name: aai-gizmo-sonar
     jobs:

diff --git a/jjb/aai/aai-model-loader.yaml b/jjb/aai/aai-model-loader.yaml
index d2c5613..1cfe7ca 100644 (file)
--- a/jjb/aai/aai-model-loader.yaml
+++ b/jjb/aai/aai-model-loader.yaml
@@ -20,6 +20,7 @@
     files: '**'
     archive-artifacts: ''
     build-node: ubuntu1604-builder-4c-4g
+
 - project:
     name: aai-model-loader-sonar
     jobs:

diff --git a/jjb/aai/aai-resources.yaml b/jjb/aai/aai-resources.yaml
index e30f13b..8dfd630 100644 (file)
--- a/jjb/aai/aai-resources.yaml
+++ b/jjb/aai/aai-resources.yaml
@@ -21,6 +21,7 @@
     files: '**'
     archive-artifacts: ''
     build-node: ubuntu1604-builder-4c-4g
+
 - project:
     name: aai-resources-sonar
     jobs:

diff --git a/jjb/aai/aai-rest-client.yaml b/jjb/aai/aai-rest-client.yaml
index 65e2443..3108e4b 100644 (file)
--- a/jjb/aai/aai-rest-client.yaml
+++ b/jjb/aai/aai-rest-client.yaml
@@ -16,6 +16,7 @@
     mvn-settings: 'aai-rest-client-settings'
     files: '**'
     archive-artifacts: ''
+
 - project:
     name: aai-rest-client-sonar
     jobs:

diff --git a/jjb/aai/aai-router-core-service.yaml b/jjb/aai/aai-router-core-service.yaml
index 98f4a6e..a128471 100644 (file)
--- a/jjb/aai/aai-router-core-service.yaml
+++ b/jjb/aai/aai-router-core-service.yaml
@@ -16,6 +16,7 @@
     mvn-settings: 'aai-router-core-settings'
     files: '**'
     archive-artifacts: ''
+
 - project:
     name: aai-router-core-sonar
     jobs:

diff --git a/jjb/aai/aai-search-data-service.yaml b/jjb/aai/aai-search-data-service.yaml
index 6f56805..6e3692f 100644 (file)
--- a/jjb/aai/aai-search-data-service.yaml
+++ b/jjb/aai/aai-search-data-service.yaml
@@ -19,6 +19,7 @@
     mvn-settings: 'aai-search-data-service-settings'
     files: '**'
     archive-artifacts: ''
+
 - project:
     name: aai-search-data-service-sonar
     jobs:

diff --git a/jjb/aai/aai-sparky-be.yaml b/jjb/aai/aai-sparky-be.yaml
index 2471858..bdc94b3 100644 (file)
--- a/jjb/aai/aai-sparky-be.yaml
+++ b/jjb/aai/aai-sparky-be.yaml
@@ -19,6 +19,7 @@
     mvn-settings: 'aai-sparky-be-settings'
     files: '**'
     archive-artifacts: ''
+
 - project:
     name: aai-sparky-be-sonar
     jobs:

diff --git a/jjb/aai/aai-traversal.yaml b/jjb/aai/aai-traversal.yaml
index 45a8191..75704ee 100644 (file)
--- a/jjb/aai/aai-traversal.yaml
+++ b/jjb/aai/aai-traversal.yaml
@@ -21,6 +21,7 @@
     files: '**'
     archive-artifacts: ''
     build-node: ubuntu1604-builder-4c-4g
+
 - project:
     name: aai-traversal-sonar
     jobs:

diff --git a/jjb/appc/appc-deployment.yaml b/jjb/appc/appc-deployment.yaml
index c6b2c84..964f15a 100644 (file)
--- a/jjb/appc/appc-deployment.yaml
+++ b/jjb/appc/appc-deployment.yaml
@@ -8,10 +8,6 @@
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
       - '{project-name}-{stream}-release-version-java-daily'
-      - '{project-name}-{stream}-docker-java-daily':
-          mvn-params: '-Dmaven.test.skip=true'
-      - '{project-name}-{stream}-docker-version-java-daily':
-          mvn-params: '-Dmaven.test.skip=true'
       - '{project-name}-docker-image-blessing'
 
     project: 'appc/deployment'
@@ -26,3 +22,24 @@
     docker-pom: 'pom.xml'
     mvn-profile: docker
     build-node: ubuntu1604-builder-4c-4g
+
+- project:
+    name: appc-deployment-docker
+    project-name: 'appc-deployment'
+    jobs:
+      - 'docker-java-daily':
+          mvn-params: '-Dmaven.test.skip=true'
+      - 'docker-version-java-daily':
+          mvn-params: '-Dmaven.test.skip=true'
+    project: 'appc/deployment'
+    stream:
+      - 'master':
+          branch: 'master'
+      - 'beijing':
+          branch: 'beijing'
+    mvn-settings: 'appc-deployment-settings'
+    files: '**'
+    archive-artifacts: ''
+    docker-pom: 'pom.xml'
+    mvn-profile: docker
+    build-node: queue-docker-4c-4g

diff --git a/jjb/appc/appc-master.yaml b/jjb/appc/appc-master.yaml
index f6d23c0..b326228 100644 (file)
--- a/jjb/appc/appc-master.yaml
+++ b/jjb/appc/appc-master.yaml
@@ -24,6 +24,7 @@
     files: '**'
     archive-artifacts: ''
     build-node: ubuntu1604-builder-4c-4g
+
 - project:
     name: appc-sonar
     jobs:

diff --git a/jjb/ccsdk/apps.yaml b/jjb/ccsdk/apps.yaml
index 58304b8..a407649 100644 (file)
--- a/jjb/ccsdk/apps.yaml
+++ b/jjb/ccsdk/apps.yaml
@@ -21,6 +21,7 @@
     files: '**'
     archive-artifacts: ''
     build-node: ubuntu1604-builder-4c-4g
+
 - project:
     name: ccsdk-apps-sonar
     jobs:

diff --git a/jjb/ccsdk/features.yaml b/jjb/ccsdk/features.yaml
index 3b7b734..5febe0f 100644 (file)
--- a/jjb/ccsdk/features.yaml
+++ b/jjb/ccsdk/features.yaml
@@ -21,6 +21,7 @@
     files: '**'
     archive-artifacts: ''
     build-node: ubuntu1604-builder-4c-4g
+
 - project:
     name: ccsdk-features-sonar
     jobs:

diff --git a/jjb/ccsdk/platform-plugins.yaml b/jjb/ccsdk/platform-plugins.yaml
index d2e1c84..20d0f8e 100644 (file)
--- a/jjb/ccsdk/platform-plugins.yaml
+++ b/jjb/ccsdk/platform-plugins.yaml
@@ -20,6 +20,7 @@
       deployAtEnd=true
     files: '**'
     archive-artifacts: ''
+
 - project:
     name: ccsdk-platform-plugins-sonar
     jobs:

diff --git a/jjb/ccsdk/sli-adaptors.yaml b/jjb/ccsdk/sli-adaptors.yaml
index 7692fee..e6abc07 100644 (file)
--- a/jjb/ccsdk/sli-adaptors.yaml
+++ b/jjb/ccsdk/sli-adaptors.yaml
@@ -21,6 +21,7 @@
     files: '**'
     archive-artifacts: ''
     build-node: ubuntu1604-builder-4c-4g
+
 - project:
     name: ccsdk-sli-adaptors-sonar
     jobs:
@@ -32,4 +33,4 @@
     branch: 'master'
     mvn-settings: 'ccsdk-sli-adaptors-settings'
     mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
\ No newline at end of file
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'

diff --git a/jjb/ccsdk/sli-northbound.yaml b/jjb/ccsdk/sli-northbound.yaml
index 58b787c..f800970 100644 (file)
--- a/jjb/ccsdk/sli-northbound.yaml
+++ b/jjb/ccsdk/sli-northbound.yaml
@@ -21,6 +21,7 @@
     files: '**'
     archive-artifacts: ''
     build-node: ubuntu1604-builder-4c-4g
+
 - project:
     name: ccsdk-sli-northbound-sonar
     jobs:
@@ -32,4 +33,4 @@
     branch: 'master'
     mvn-settings: 'ccsdk-sli-northbound-settings'
     mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
\ No newline at end of file
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'

diff --git a/jjb/ccsdk/storage-pgaas.yaml b/jjb/ccsdk/storage-pgaas.yaml
index d55781e..86e8331 100644 (file)
--- a/jjb/ccsdk/storage-pgaas.yaml
+++ b/jjb/ccsdk/storage-pgaas.yaml
@@ -20,6 +20,7 @@
       deployAtEnd=true
     files: '**'
     archive-artifacts: ''
+
 - project:
     name: ccsdk-storage-pgaas-sonar
     jobs:

diff --git a/jjb/ci-management/ci-management.yaml b/jjb/ci-management/ci-management.yaml
index a7eb833..c39cb7e 100644 (file)
--- a/jjb/ci-management/ci-management.yaml
+++ b/jjb/ci-management/ci-management.yaml
@@ -12,108 +12,3 @@
     build-timeout: '60'
     build-node: 'centos7-builder-2c-1g'
     jjb-version: 2.0.3
-
-- job-template:
-    name: '{project}-verify-jjb'
-
-    project-type: freestyle
-    node: '{build-node}'
-    concurrent: true
-
-    properties:
-      - infra-properties:
-          build-days-to-keep: 14
-
-    parameters:
-      - infra-parameters:
-          project: '{project}'
-          branch: 'master'
-          refspec: 'refs/heads/master'
-          artifacts: '{archive-artifacts}'
-
-    scm:
-      - gerrit-trigger-scm:
-          refspec: '$GERRIT_REFSPEC'
-          choosing-strategy: 'gerrit'
-          submodule-recursive: '{submodule-recursive}'
-
-    wrappers:
-      - infra-wrappers:
-          build-timeout: '{build-timeout}'
-
-    triggers:
-      - gerrit-trigger-patch-submitted:
-          server: '{server-name}'
-          project: '{project}'
-          branch: '{branch}'
-          files: 'jjb/**'
-
-    builders:
-      - config-file-provider:
-          files:
-            - file-id: 'jjbini'
-              variable: 'JJBINI'
-      - shell: |
-          virtualenv $WORKSPACE/venv
-          source $WORKSPACE/venv/bin/activate
-          pip install --upgrade pip
-          pip freeze
-          pip install jenkins-job-builder
-          jenkins-jobs -l DEBUG --conf $JJBINI test -o archives/job_output jjb/
-          gzip archives/job_output/*
-      - ci-management-check-unicode
-
-    publishers:
-      - infra-shiplogs:
-          maven-version: '{maven-version}'
-
-- job-template:
-    name: '{project}-merge-jjb'
-
-    project-type: freestyle
-    node: '{build-node}'
-
-    properties:
-      - infra-properties:
-          build-days-to-keep: 14
-
-    parameters:
-      - infra-parameters:
-          project: '{project}'
-          branch: 'master'
-          refspec: 'refs/heads/master'
-          artifacts: '{archive-artifacts}'
-
-    scm:
-      - gerrit-trigger-scm:
-          refspec: ''
-          choosing-strategy: 'default'
-          submodule-recursive: '{submodule-recursive}'
-
-    wrappers:
-      - infra-wrappers:
-          build-timeout: '{build-timeout}'
-
-    triggers:
-      - gerrit-trigger-patch-merged:
-          server: '{server-name}'
-          project: '{project}'
-          branch: '{branch}'
-          files: 'jjb/**'
-
-    builders:
-      - config-file-provider:
-          files:
-            - file-id: 'jjbini'
-              variable: 'JJBINI'
-      - shell: |
-          virtualenv $WORKSPACE/venv
-          source $WORKSPACE/venv/bin/activate
-          pip install --upgrade pip
-          pip freeze
-          pip install jenkins-job-builder
-          jenkins-jobs --conf $JJBINI update --delete-old --workers 4 jjb/
-
-    publishers:
-      - infra-shiplogs:
-          maven-version: '{maven-version}'

diff --git a/jjb/clamp/clamp.yaml b/jjb/clamp/clamp.yaml
index 8fe9882..9dcd4d3 100644 (file)
--- a/jjb/clamp/clamp.yaml
+++ b/jjb/clamp/clamp.yaml
@@ -32,6 +32,7 @@
     files: '**'
     archive-artifacts: ''
     build-node: ubuntu1604-docker-8c-8g
+
 - project:
     name: clamp-sonar
     jobs:

diff --git a/jjb/cli/cli.yaml b/jjb/cli/cli.yaml
index ef6fc0c..d6fc2e7 100644 (file)
--- a/jjb/cli/cli.yaml
+++ b/jjb/cli/cli.yaml
@@ -21,6 +21,7 @@
     files: '**'
     archive-artifacts: ''
     build-node: ubuntu1604-builder-4c-4g
+
 - project:
     name: cli-sonar
     jobs:

diff --git a/jjb/dcaegen2/apod-analytics.yaml b/jjb/dcaegen2/apod-analytics.yaml
index d3fa087..c11a28d 100644 (file)
--- a/jjb/dcaegen2/apod-analytics.yaml
+++ b/jjb/dcaegen2/apod-analytics.yaml
@@ -24,6 +24,7 @@
           mvn-goals: 'clean install'
       - '{project-name}-{stream}-merge-java':
           mvn-goals: 'clean deploy'
+
 - project:
     name: dcaegen2-analytics-tca-sonar
     jobs:

diff --git a/jjb/dcaegen2/dcaegen2-collectors-snmptrap.yaml b/jjb/dcaegen2/dcaegen2-collectors-snmptrap.yaml
index 47f75bb..d6891db 100644 (file)
--- a/jjb/dcaegen2/dcaegen2-collectors-snmptrap.yaml
+++ b/jjb/dcaegen2/dcaegen2-collectors-snmptrap.yaml
@@ -21,6 +21,7 @@
     files: '**'
     archive-artifacts: ''
     build-node: 'ubuntu1604-docker-8c-8g'
+
 - project:
     name: dcaegen2-collectors-snmptrap-sonar
     jobs:

diff --git a/jjb/dcaegen2/dcaegen2-collectors-ves.yaml b/jjb/dcaegen2/dcaegen2-collectors-ves.yaml
index 641ace5..99df41f 100644 (file)
--- a/jjb/dcaegen2/dcaegen2-collectors-ves.yaml
+++ b/jjb/dcaegen2/dcaegen2-collectors-ves.yaml
@@ -21,6 +21,7 @@
     files: '**'
     archive-artifacts: ''
     build-node: 'ubuntu1604-docker-8c-8g'
+
 - project:
     name: dcaegen2-collectors-ves-sonar
     jobs:

diff --git a/jjb/dcaegen2/dcaegen2-platform-cli.yaml b/jjb/dcaegen2/dcaegen2-platform-cli.yaml
index 2cb26dd..e9cdd04 100644 (file)
--- a/jjb/dcaegen2/dcaegen2-platform-cli.yaml
+++ b/jjb/dcaegen2/dcaegen2-platform-cli.yaml
@@ -21,6 +21,7 @@
     files: '**'
     archive-artifacts: ''
     build-node: 'ubuntu1604-docker-8c-8g'
+
 - project:
     name: dcaegen2-platform-cli-sonar
     jobs:

diff --git a/jjb/dcaegen2/dcaegen2-platform-configbinding.yaml b/jjb/dcaegen2/dcaegen2-platform-configbinding.yaml
index 6d81b77..a083611 100644 (file)
--- a/jjb/dcaegen2/dcaegen2-platform-configbinding.yaml
+++ b/jjb/dcaegen2/dcaegen2-platform-configbinding.yaml
@@ -21,6 +21,7 @@
     files: '**'
     archive-artifacts: ''
     build-node: 'ubuntu1604-docker-8c-8g'
+
 - project:
     name: dcaegen2-platform-configbinding-sonar
     jobs:

diff --git a/jjb/dcaegen2/dcaegen2-platform-inventory-api.yaml b/jjb/dcaegen2/dcaegen2-platform-inventory-api.yaml
index 8b5b88b..65cba2b 100644 (file)
--- a/jjb/dcaegen2/dcaegen2-platform-inventory-api.yaml
+++ b/jjb/dcaegen2/dcaegen2-platform-inventory-api.yaml
@@ -25,6 +25,7 @@
     files: '**'
     archive-artifacts: ''
     build-node: 'ubuntu1604-docker-8c-8g'
+
 - project:
     name: dcaegen2-platform-inventory-api-sonar
     jobs:

diff --git a/jjb/dcaegen2/dcaegen2-platform-plugins.yaml b/jjb/dcaegen2/dcaegen2-platform-plugins.yaml
index 6aa6f1e..d4206c0 100644 (file)
--- a/jjb/dcaegen2/dcaegen2-platform-plugins.yaml
+++ b/jjb/dcaegen2/dcaegen2-platform-plugins.yaml
@@ -21,6 +21,7 @@
     files: '**'
     archive-artifacts: ''
     build-node: 'ubuntu1604-docker-8c-8g'
+
 - project:
     name: dcaegen2-platform-plugins-sonar
     jobs:

diff --git a/jjb/dcaegen2/dcaegen2-platform-policy-handler.yaml b/jjb/dcaegen2/dcaegen2-platform-policy-handler.yaml
index c968ebc..2acf453 100644 (file)
--- a/jjb/dcaegen2/dcaegen2-platform-policy-handler.yaml
+++ b/jjb/dcaegen2/dcaegen2-platform-policy-handler.yaml
@@ -21,6 +21,7 @@
     files: '**'
     archive-artifacts: ''
     build-node: 'ubuntu1604-docker-8c-8g'
+
 - project:
     name: dcaegen2-platform-policy-handler-sonar
     jobs:

diff --git a/jjb/dcaegen2/dcaegen2-services-heartbeat.yaml b/jjb/dcaegen2/dcaegen2-services-heartbeat.yaml
index 6803f47..7e58ebb 100644 (file)
--- a/jjb/dcaegen2/dcaegen2-services-heartbeat.yaml
+++ b/jjb/dcaegen2/dcaegen2-services-heartbeat.yaml
@@ -21,6 +21,7 @@
     files: '**'
     archive-artifacts: ''
     build-node: 'ubuntu1604-docker-8c-8g'
+
 - project:
     name: dcaegen2-services-heartbeat-sonar
     jobs:

diff --git a/jjb/dcaegen2/dcaegen2-services-mapper.yaml b/jjb/dcaegen2/dcaegen2-services-mapper.yaml
index e9c0118..aed6187 100644 (file)
--- a/jjb/dcaegen2/dcaegen2-services-mapper.yaml
+++ b/jjb/dcaegen2/dcaegen2-services-mapper.yaml
@@ -21,6 +21,7 @@
     build-node: 'ubuntu1604-docker-8c-8g'
     maven-deploy-properties: |
       deployAtEnd=true
+
 - project:
     name: dcaegen2-services-mapper-sonar
     jobs:
@@ -33,4 +34,3 @@
     mvn-settings: 'dcaegen2-services-mapper-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-

diff --git a/jjb/dcaegen2/dcaegen2-services-prh.yaml b/jjb/dcaegen2/dcaegen2-services-prh.yaml
index 6e88a84..ad1fa4a 100644 (file)
--- a/jjb/dcaegen2/dcaegen2-services-prh.yaml
+++ b/jjb/dcaegen2/dcaegen2-services-prh.yaml
@@ -22,6 +22,7 @@
     build-node: 'ubuntu1604-docker-8c-8g'
     maven-deploy-properties: |
       deployAtEnd=true
+
 - project:
     name: dcaegen2-services-prh-sonar
     jobs:
@@ -34,4 +35,3 @@
     mvn-settings: 'dcaegen2-services-prh-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-

diff --git a/jjb/dcaegen2/dcaegen2-utils.yaml b/jjb/dcaegen2/dcaegen2-utils.yaml
index e3cdc6a..0b17722 100644 (file)
--- a/jjb/dcaegen2/dcaegen2-utils.yaml
+++ b/jjb/dcaegen2/dcaegen2-utils.yaml
@@ -23,6 +23,7 @@
     files: '**'
     archive-artifacts: ''
     build-node: 'ubuntu1604-builder-4c-4g'
+
 - project:
     name: dcaegen2-utils-sonar
     jobs:

diff --git a/jjb/demo/demo.yaml b/jjb/demo/demo.yaml
index e1407ba..a86ded7 100644 (file)
--- a/jjb/demo/demo.yaml
+++ b/jjb/demo/demo.yaml
@@ -13,11 +13,10 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'beijing':
-          branch: 'beijing'
     mvn-settings: 'demo-settings'
     files: '**'
     archive-artifacts: ''
+
 - project:
     name: demo-sonar
     jobs:

diff --git a/jjb/dmaap/dmaap-buscontroller.yaml b/jjb/dmaap/dmaap-buscontroller.yaml
index 34b3055..f614e63 100644 (file)
--- a/jjb/dmaap/dmaap-buscontroller.yaml
+++ b/jjb/dmaap/dmaap-buscontroller.yaml
@@ -24,6 +24,7 @@
     mvn-settings: 'dmaap-buscontroller-settings'
     files: '**'
     archive-artifacts: ''
+
 - project:
     name: dmaap-buscontroller-sonar
     jobs:

diff --git a/jjb/dmaap/dmaap-messagerouter-dmaapclient.yaml b/jjb/dmaap/dmaap-messagerouter-dmaapclient.yaml
index b500752..c656c96 100644 (file)
--- a/jjb/dmaap/dmaap-messagerouter-dmaapclient.yaml
+++ b/jjb/dmaap/dmaap-messagerouter-dmaapclient.yaml
@@ -14,6 +14,7 @@
     mvn-settings: 'dmaap-messagerouter-dmaapclient-settings'
     files: '**'
     archive-artifacts: ''
+
 - project:
     name: dmaap-messagerouter-dmaapclient-sonar
     jobs:

diff --git a/jjb/dmaap/dmaap-messagerouter-messageservice.yaml b/jjb/dmaap/dmaap-messagerouter-messageservice.yaml
index 6dd1e37..9ba4f7a 100644 (file)
--- a/jjb/dmaap/dmaap-messagerouter-messageservice.yaml
+++ b/jjb/dmaap/dmaap-messagerouter-messageservice.yaml
@@ -14,6 +14,7 @@
     mvn-settings: 'dmaap-messagerouter-messageservice-settings'
     files: '**'
     archive-artifacts: ''
+
 - project:
     name: dmaap-messagerouter-messageservice-sonar
     jobs:

diff --git a/jjb/dmaap/dmaap-messagerouter-mirroragent.yaml b/jjb/dmaap/dmaap-messagerouter-mirroragent.yaml
index ecbc783..0ab449a 100644 (file)
--- a/jjb/dmaap/dmaap-messagerouter-mirroragent.yaml
+++ b/jjb/dmaap/dmaap-messagerouter-mirroragent.yaml
@@ -14,6 +14,7 @@
     mvn-settings: 'dmaap-messagerouter-mirroragent-settings'
     files: '**'
     archive-artifacts: ''
+
 - project:
     name: dmaap-messagerouter-mirroragent-sonar
     jobs:

diff --git a/jjb/dmaap/dmaap-messagerouter-msgrtr.yaml b/jjb/dmaap/dmaap-messagerouter-msgrtr.yaml
index 346211b..05e9ea9 100644 (file)
--- a/jjb/dmaap/dmaap-messagerouter-msgrtr.yaml
+++ b/jjb/dmaap/dmaap-messagerouter-msgrtr.yaml
@@ -14,6 +14,7 @@
     mvn-settings: 'dmaap-messagerouter-msgrtr-settings'
     files: '**'
     archive-artifacts: ''
+
 - project:
     name: dmaap-messagerouter-msgrtr-sonar
     jobs:

diff --git a/jjb/doc/doc.yaml b/jjb/doc/doc.yaml
index 018f74a..538885f 100644 (file)
--- a/jjb/doc/doc.yaml
+++ b/jjb/doc/doc.yaml
@@ -9,8 +9,6 @@
       - '{project-name}-{stream}-merge-rtd'
 
     project: 'doc'
-
-
     rtdproject: 'onap'
     mvn-settings: 'doc-settings'
     stream:

diff --git a/jjb/externalapi/externalapi-nbi.yaml b/jjb/externalapi/externalapi-nbi.yaml
index 6f7dd2e..ffdbc93 100644 (file)
--- a/jjb/externalapi/externalapi-nbi.yaml
+++ b/jjb/externalapi/externalapi-nbi.yaml
@@ -21,6 +21,7 @@
     files: '**'
     archive-artifacts: ''
     build-node: ubuntu1604-builder-4c-4g
+
 - project:
     name: externalapi-nbi-sonar
     jobs:

diff --git a/jjb/global-jjb b/jjb/global-jjb
index f58aa56..5ca1149 160000 (submodule)
--- a/jjb/global-jjb
+++ b/jjb/global-jjb
@@ -1 +1 @@
-Subproject commit f58aa56acc44a8eb7498af10e5d229e1690e58b0
+Subproject commit 5ca1149a99351cc571d21b315e4acecae6b109b5

diff --git a/jjb/global-macros.yaml b/jjb/global-macros.yaml
index d7ca143..1f751da 100644 (file)
--- a/jjb/global-macros.yaml
+++ b/jjb/global-macros.yaml
@@ -4,12 +4,6 @@
 # vim: sw=2 ts=2 sts=2 et :
 
 # BUILDERS
-- builder:
-    name: ci-management-check-unicode
-    builders:
-      - shell: |
-          $WORKSPACE/scripts/check-unicode.sh jjb/
-
 - builder:
     name: provide-maven-settings
     builders:
@@ -458,3 +452,20 @@
             - 'onap-jenkins-ssh'
       - openstack:
           single-use: true
+
+- wrapper:
+    # This wrapper is used for docker build jobs to use the dedicated docker
+    # build VM and turn off OpenStack single-use
+    name: infra-wrappers-docker-build
+    wrappers:
+      - timestamps
+      - timeout:
+          type: absolute
+          timeout: '{build-timeout}'
+          timeout-var: 'BUILD_TIMEOUT'
+          fail: true
+      - ssh-agent-credentials:
+          users:
+            - 'onap-jenkins-ssh'
+      - openstack:
+          single-use: false

diff --git a/jjb/global-templates-java.yaml b/jjb/global-templates-java.yaml
index 7683924..ef91f81 100644 (file)
--- a/jjb/global-templates-java.yaml
+++ b/jjb/global-templates-java.yaml
@@ -1202,6 +1202,7 @@
     #     branch:    git branch (eg. stable/lithium or master)
 
     name: '{project-name}-{stream}-docker-java-daily'
+    id: '{project-name}-{stream}-docker-java-daily'
     project-type: freestyle
     node: 'ubuntu1604-docker-8c-8g'
     disabled: '{disabled}'
@@ -1258,6 +1259,75 @@
       - infra-shiplogs:
           maven-version: '{maven-version}'
 
+- job-template:
+    # Job template for Docker daily jobs
+    #
+    # The purpose of this job template is to run:
+    # 1. login to the docker registry
+    # 2. docker push
+    #
+    # Required Variables:
+    #     branch:    git branch (eg. stable/lithium or master)
+
+    name: '{project-name}-{stream}-docker-java-daily'
+    id: docker-java-daily
+    project-type: freestyle
+    node: '{build-node}'
+    disabled: '{disabled}'
+    properties:
+      - infra-properties:
+          build-days-to-keep: '{build-days-to-keep}'
+
+    parameters:
+      - infra-parameters:
+          project: '{project}'
+          branch: '{branch}'
+          refspec: 'refs/heads/{branch}'
+          artifacts: '{archive-artifacts}'
+      - maven-exec:
+          maven-version: '{maven-version}'
+      - maven-params:
+          mvn-params: '{mvn-params}'
+
+    scm:
+      - gerrit-trigger-scm:
+          refspec: ''
+          choosing-strategy: 'default'
+          submodule-recursive: '{submodule-recursive}'
+
+    wrappers:
+      - infra-wrappers-docker-build:
+          build-timeout: '{build-timeout}'
+
+    triggers:
+      # 12 AM UTC
+      - timed: 'H 12 * * *'
+      - gerrit-trigger-release-manually:
+          server: '{server-name}'
+          project: '{project}'
+          branch: '{branch}'
+
+    builders:
+
+      - provide-maven-settings:
+          global-settings-file: 'global-settings'
+          settings-file: '{mvn-settings}'
+
+      - docker-login
+
+      - maven-docker-push-daily:
+          maven-version: '{maven-version}'
+          mvn-settings: '{mvn-settings}'
+          pom: '{docker-pom}'
+          # use default as mvn-profile if profile is not needed
+          mvn-profile: '{mvn-profile}'
+          mvn-params: '{mvn-params}'
+
+    publishers:
+      - infra-shiplogs:
+          maven-version: '{maven-version}'
+
+
 - job-template:
     # Job template for building & pushing docker images
     #
@@ -1588,6 +1658,7 @@
     #     maven-properties: properties passed to maven
 
     name: '{project-name}-{stream}-docker-version-java-daily'
+    id: '{project-name}-{stream}-docker-version-java-daily'
     project-type: freestyle
     node: 'ubuntu1604-docker-8c-8g'
     disabled: '{disabled}'
@@ -1657,6 +1728,90 @@
       - infra-shiplogs:
           maven-version: '{maven-version}'
 
+- job-template:
+    # Job template for building & pushing docker images
+    #
+    # The purpose of this job template is to run:
+    #  1. login to the docker registry
+    #  2. inject a version.properties file and set versions
+    #  3. run a docker push
+    #
+    # Required Variables:
+    #     pom:       name/location of the pom.xml file relative to the workspace
+    #     profile:   the docker profile defined in the pom
+    #     maven-properties: properties passed to maven
+
+    name: '{project-name}-{stream}-docker-version-java-daily'
+    id: 'docker-version-java-daily'
+    project-type: freestyle
+    node: '{build-node}'
+    disabled: '{disabled}'
+    properties:
+      - infra-properties:
+          build-days-to-keep: '{build-days-to-keep}'
+
+    parameters:
+      - infra-parameters:
+          project: '{project}'
+          branch: '{branch}'
+          refspec: 'refs/heads/{branch}'
+          artifacts: '{archive-artifacts}'
+      - maven-exec:
+          maven-version: '{maven-version}'
+      - maven-params:
+          mvn-params: '{mvn-params}'
+
+    scm:
+      - gerrit-trigger-scm:
+          refspec: ''
+          choosing-strategy: 'default'
+          submodule-recursive: '{submodule-recursive}'
+
+    wrappers:
+      - infra-wrappers-docker-build:
+          build-timeout: '{build-timeout}'
+
+    triggers:
+      # 12 AM UTC
+      - timed: 'H 12 * * *'
+      - gerrit-trigger-release-manually:
+          server: '{server-name}'
+          project: '{project}'
+          branch: '{branch}'
+
+    builders:
+
+      - provide-maven-settings:
+          global-settings-file: 'global-settings'
+          settings-file: '{mvn-settings}'
+
+      - inject:
+          properties-file: version.properties
+
+      - maven-target:
+          maven-version: '{maven-version}'
+          goals: 'versions:set versions:update-child-modules versions:commit -B'
+          properties:
+            - 'newVersion=${{release_version}}'
+          settings: '{mvn-settings}'
+          settings-type: cfp
+          global-settings: 'global-settings'
+          global-settings-type: cfp
+
+      - docker-login
+
+      - maven-docker-push-daily:
+          maven-version: '{maven-version}'
+          mvn-settings: '{mvn-settings}'
+          pom: '{docker-pom}'
+          # use default as mvn-profile if profile is not needed
+          mvn-profile: '{mvn-profile}'
+          mvn-params: '{mvn-params}'
+
+    publishers:
+      - infra-shiplogs:
+          maven-version: '{maven-version}'
+
 - job-template:
     # Job template for building & pushing docker images
     #

diff --git a/jjb/global-templates-python.yaml b/jjb/global-templates-python.yaml
index 966ecb3..88aef7a 100644 (file)
--- a/jjb/global-templates-python.yaml
+++ b/jjb/global-templates-python.yaml
@@ -151,7 +151,7 @@
 
     name: '{project-name}-{stream}-3scm-docker-shell-daily'
     project-type: freestyle
-    node: 'ubuntu1604-docker-8c-8g'
+    node: 'queue-docker-4c-4g'
 
     properties:
       - infra-properties:
@@ -188,12 +188,11 @@
           checkout-dir: '{checkout-dir3}'
 
     wrappers:
-      - infra-wrappers:
+      - infra-wrappers-docker-build:
           build-timeout: '{build-timeout}'
 
     triggers:
-      # 12 AM UTC
-      - timed: 'H 12 * * *'
+      - timed: 'H */4 * * *'
       - gerrit-trigger-release-manually:
           server: '{server-name}'
           project: '{project}'

diff --git a/jjb/holmes/holmes-common.yaml b/jjb/holmes/holmes-common.yaml
index 8fb735a..8463468 100644 (file)
--- a/jjb/holmes/holmes-common.yaml
+++ b/jjb/holmes/holmes-common.yaml
@@ -16,6 +16,7 @@
     files: '**'
     archive-artifacts: ''
     build-node: ubuntu1604-builder-4c-4g
+
 - project:
     name: holmes-common-sonar
     jobs:

diff --git a/jjb/holmes/holmes-dsa.yaml b/jjb/holmes/holmes-dsa.yaml
index 849b429..aad09f2 100644 (file)
--- a/jjb/holmes/holmes-dsa.yaml
+++ b/jjb/holmes/holmes-dsa.yaml
@@ -20,6 +20,7 @@
     docker-pom: 'pom.xml'
     mvn-profile: docker
     build-node: ubuntu1604-builder-4c-4g
+
 - project:
     name: holmes-dsa-sonar
     jobs:

diff --git a/jjb/holmes/holmes-engine-mgt.yaml b/jjb/holmes/holmes-engine-mgt.yaml
index e783a8e..12f31ab 100644 (file)
--- a/jjb/holmes/holmes-engine-mgt.yaml
+++ b/jjb/holmes/holmes-engine-mgt.yaml
@@ -20,6 +20,7 @@
     docker-pom: 'pom.xml'
     mvn-profile: docker
     build-node: ubuntu1604-builder-4c-4g
+
 - project:
     name: holmes-engine-management-sonar
     jobs:

diff --git a/jjb/holmes/holmes-rule-mgt.yaml b/jjb/holmes/holmes-rule-mgt.yaml
index 5dcd132..9edc33e 100644 (file)
--- a/jjb/holmes/holmes-rule-mgt.yaml
+++ b/jjb/holmes/holmes-rule-mgt.yaml
@@ -20,6 +20,7 @@
     docker-pom: 'pom.xml'
     mvn-profile: docker
     build-node: ubuntu1604-builder-4c-4g
+
 - project:
     name: holmes-rule-management-sonar
     jobs:

diff --git a/jjb/integration/integration.yaml b/jjb/integration/integration.yaml
index f76f892..6c700fb 100644 (file)
--- a/jjb/integration/integration.yaml
+++ b/jjb/integration/integration.yaml
@@ -15,8 +15,6 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'beijing':
-          branch: 'beijing'
     mvn-settings: 'integration-settings'
     files: '**'
     archive-artifacts: ''

diff --git a/jjb/lab/lab.yaml b/jjb/lab/lab.yaml
index 65820bf..15645a7 100644 (file)
--- a/jjb/lab/lab.yaml
+++ b/jjb/lab/lab.yaml
@@ -4,18 +4,12 @@
     jobs:
       - 'lab-{job-name}'
     job-name:
-      - "windriver-beijing-heat-deploy":
-          job-desc: "Heat-based deployment into Wind River lab Integration-Stable tenant"
-      - "windriver-beijing-oom-deploy":
-          job-desc: "OOM-based deployment into Wind River lab Integration-Jenkins tenant"
-      - "tlab-beijing-heat-deploy":
-          job-desc: "Heat-based deployment into AT&T TLAB Integration-HEAT-Test tenant"
-      - "tlab-beijing-oom-deploy":
-          job-desc: "OOM-based deployment into AT&T TLAB Integration-OOM-Test tenant"
       - "windriver-heat-daily":
           job-desc: "Heat-based deployment into Wind River lab Integration-HEAT-Daily tenant"
       - "windriver-oom-daily":
           job-desc: "OOM-based deployment into Wind River lab Integration-OOM-Daily tenant"
+      - "windriver-oom-staging-daily":
+          job-desc: "OOM-based deployment into Wind River lab Integration-OOM-Staging-Daily tenant"
       - "tlab-heat-daily":
           job-desc: "Heat-based deployment into AT&T TLAB Integration-HEAT-Test tenant"
       - "tlab-oom-daily":

diff --git a/jjb/logging-analytics/logging-analytics.yaml b/jjb/logging-analytics/logging-analytics.yaml
index 1318003..bf041e2 100644 (file)
--- a/jjb/logging-analytics/logging-analytics.yaml
+++ b/jjb/logging-analytics/logging-analytics.yaml
@@ -19,6 +19,7 @@
     files: '**'
     archive-artifacts: ''
     build-node: ubuntu1604-builder-4c-4g
+
 - project:
     name: logging-analytics-sonar
     jobs:
@@ -31,6 +32,7 @@
     mvn-settings: 'logging-analytics-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+
 - project:
     name: logging-analytics-pylog
     project-name: 'logging-analytics-pylog'
@@ -55,6 +57,7 @@
     files: '**'
     archive-artifacts: ''
     build-node: ubuntu1604-builder-4c-4g
+
 - project:
     name: logging-analytics-pylog-python
     project-name: 'logging-analytics-pylog'

diff --git a/jjb/modeling/modeling-toscaparsers-javatoscachecker-csit.yaml b/jjb/modeling/modeling-toscaparsers-javatoscachecker-csit.yaml
index ee8de9c..55d66d4 100644 (file)
--- a/jjb/modeling/modeling-toscaparsers-javatoscachecker-csit.yaml
+++ b/jjb/modeling/modeling-toscaparsers-javatoscachecker-csit.yaml
@@ -1,5 +1,4 @@
 ---
-
 - project:
     name: modeling-toscaparsers-javatoscachecker-csit
     jobs:

diff --git a/jjb/modeling/modeling-toscaparsers-javatoscachecker.yaml b/jjb/modeling/modeling-toscaparsers-javatoscachecker.yaml
index 53350d0..210fa41 100644 (file)
--- a/jjb/modeling/modeling-toscaparsers-javatoscachecker.yaml
+++ b/jjb/modeling/modeling-toscaparsers-javatoscachecker.yaml
@@ -28,6 +28,7 @@
           skip.docker.build=false
           skip.docker.tag=false
           skip.docker.push=false
+
 - project:
     name: modeling-toscaparsers-sonar
     jobs:

diff --git a/jjb/modeling/modeling-toscaparsers-nfvparser.yaml b/jjb/modeling/modeling-toscaparsers-nfvparser.yaml
index c2a49e4..ecc884d 100644 (file)
--- a/jjb/modeling/modeling-toscaparsers-nfvparser.yaml
+++ b/jjb/modeling/modeling-toscaparsers-nfvparser.yaml
@@ -1,5 +1,4 @@
 ---
-
 - project:
     name: modeling-toscaparsers-nfvparser
     project-name: 'modeling-toscaparsers-nfvparser'

diff --git a/jjb/msb/msb-apigateway.yaml b/jjb/msb/msb-apigateway.yaml
index d9db19d..21d63d7 100644 (file)
--- a/jjb/msb/msb-apigateway.yaml
+++ b/jjb/msb/msb-apigateway.yaml
@@ -21,6 +21,7 @@
     files: '**'
     archive-artifacts: ''
     build-node: ubuntu1604-builder-4c-4g
+
 - project:
     name: msb-apigateway-sonar
     jobs:

diff --git a/jjb/msb/msb-discovery.yaml b/jjb/msb/msb-discovery.yaml
index 3ef99d7..1183592 100644 (file)
--- a/jjb/msb/msb-discovery.yaml
+++ b/jjb/msb/msb-discovery.yaml
@@ -20,6 +20,7 @@
     files: '**'
     archive-artifacts: ''
     build-node: ubuntu1604-builder-4c-4g
+
 - project:
     name: msb-discovery-sonar
     jobs:

diff --git a/jjb/msb/msb-java-sdk.yaml b/jjb/msb/msb-java-sdk.yaml
index e236542..4e41919 100644 (file)
--- a/jjb/msb/msb-java-sdk.yaml
+++ b/jjb/msb/msb-java-sdk.yaml
@@ -15,6 +15,7 @@
     files: '**'
     archive-artifacts: ''
     build-node: ubuntu1604-builder-4c-4g
+
 - project:
     name: msb-java-sdk-sonar
     jobs:

diff --git a/jjb/msb/msb-swagger-sdk.yaml b/jjb/msb/msb-swagger-sdk.yaml
index 5bf3715..c7eb47c 100644 (file)
--- a/jjb/msb/msb-swagger-sdk.yaml
+++ b/jjb/msb/msb-swagger-sdk.yaml
@@ -15,6 +15,7 @@
     files: '**'
     archive-artifacts: ''
     build-node: ubuntu1604-builder-4c-4g
+
 - project:
     name: msb-swagger-sdk-sonar
     jobs:

diff --git a/jjb/multicloud/multicloud-framework-java.yaml b/jjb/multicloud/multicloud-framework-java.yaml
index f4dfa6e..78dfaff 100644 (file)
--- a/jjb/multicloud/multicloud-framework-java.yaml
+++ b/jjb/multicloud/multicloud-framework-java.yaml
@@ -26,6 +26,7 @@
     files: '**'
     archive-artifacts: ''
     build-node: ubuntu1604-builder-4c-4g
+
 - project:
     name: multicloud-framework-sonar
     jobs:

diff --git a/jjb/multicloud/multicloud-openstack-vmware-java.yaml b/jjb/multicloud/multicloud-openstack-vmware-java.yaml
index 257910f..f45c9ea 100644 (file)
--- a/jjb/multicloud/multicloud-openstack-vmware-java.yaml
+++ b/jjb/multicloud/multicloud-openstack-vmware-java.yaml
@@ -26,6 +26,7 @@
     files: '**'
     archive-artifacts: ''
     build-node: ubuntu1604-builder-4c-4g
+
 - project:
     name: multicloud-openstack-vmware-sonar
     jobs:

diff --git a/jjb/multicloud/multicloud-openstack.yaml b/jjb/multicloud/multicloud-openstack.yaml
index 6d4fe7d..be69898 100644 (file)
--- a/jjb/multicloud/multicloud-openstack.yaml
+++ b/jjb/multicloud/multicloud-openstack.yaml
@@ -50,6 +50,7 @@
     files: '**'
     archive-artifacts: ''
     build-node: 'ubuntu1604-memcached-4c-4g'
+
 - project:
     name: multicloud-openstack-newton-sonar
     jobs:
@@ -63,6 +64,7 @@
     mvn-settings: 'multicloud-openstack-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+
 - project:
     name: multicloud-openstack-ocata-sonar
     jobs:
@@ -76,6 +78,7 @@
     mvn-settings: 'multicloud-openstack-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+
 - project:
     name: multicloud-openstack-windriver-sonar
     jobs:
@@ -89,6 +92,7 @@
     mvn-settings: 'multicloud-openstack-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+
 - project:
     name: multicloud-openstack-pike-sonar
     jobs:

diff --git a/jjb/oom/oom-oneclick-config.yaml b/jjb/oom/oom-oneclick-config.yaml
index 65fda16..10d574c 100644 (file)
--- a/jjb/oom/oom-oneclick-config.yaml
+++ b/jjb/oom/oom-oneclick-config.yaml
@@ -17,6 +17,7 @@
      - 'master':
          branch: 'master'
    mvn-settings: 'oom-settings'
+
 - job-template:
     name: '{project}-{stream}-release-config'
     project-type: freestyle

diff --git a/jjb/optf/optf-has.yaml b/jjb/optf/optf-has.yaml
index a4f7a79..60e984e 100644 (file)
--- a/jjb/optf/optf-has.yaml
+++ b/jjb/optf/optf-has.yaml
@@ -29,6 +29,7 @@
     files: '**'
     archive-artifacts: ''
     build-node: 'ubuntu1604-builder-4c-4g'
+
 - project:
     name: optf-has-sonar
     jobs:

diff --git a/jjb/optf/optf-osdf.yaml b/jjb/optf/optf-osdf.yaml
index 004d842..23d4144 100644 (file)
--- a/jjb/optf/optf-osdf.yaml
+++ b/jjb/optf/optf-osdf.yaml
@@ -28,6 +28,7 @@
     files: '**'
     archive-artifacts: ''
     build-node: 'ubuntu1604-builder-4c-4g'
+
 - project:
     name: optf-osdf-sonar
     jobs:

diff --git a/jjb/policy/policy-apex-pdp.yaml b/jjb/policy/policy-apex-pdp.yaml
index c43565d..9933ea1 100644 (file)
--- a/jjb/policy/policy-apex-pdp.yaml
+++ b/jjb/policy/policy-apex-pdp.yaml
@@ -25,6 +25,7 @@
     files: '**'
     archive-artifacts: ''
     build-node: ubuntu1604-builder-4c-4g
+
 - project:
     name: policy-apex-pdp-sonar
     jobs:

diff --git a/jjb/policy/policy-api.yaml b/jjb/policy/policy-api.yaml
index 0d1482f..07f973e 100644 (file)
--- a/jjb/policy/policy-api.yaml
+++ b/jjb/policy/policy-api.yaml
@@ -15,6 +15,7 @@
     files: '**'
     archive-artifacts: ''
     build-node: ubuntu1604-builder-4c-4g
+
 - project:
     name: policy-api-sonar
     jobs:

diff --git a/jjb/policy/policy-common.yaml b/jjb/policy/policy-common.yaml
index fef485e..dc487c3 100644 (file)
--- a/jjb/policy/policy-common.yaml
+++ b/jjb/policy/policy-common.yaml
@@ -17,6 +17,7 @@
     files: '**'
     archive-artifacts: ''
     build-node: ubuntu1604-builder-4c-4g
+
 - project:
     name: policy-common-sonar
     jobs:

diff --git a/jjb/policy/policy-core.yaml b/jjb/policy/policy-core.yaml
index 5e8d69f..5094d2d 100644 (file)
--- a/jjb/policy/policy-core.yaml
+++ b/jjb/policy/policy-core.yaml
@@ -15,6 +15,7 @@
     files: '**'
     archive-artifacts: ''
     build-node: ubuntu1604-builder-4c-4g
+
 - project:
     name: policy-core-sonar
     jobs:

diff --git a/jjb/policy/policy-distribution.yaml b/jjb/policy/policy-distribution.yaml
index d7f853e..d449ce4 100644 (file)
--- a/jjb/policy/policy-distribution.yaml
+++ b/jjb/policy/policy-distribution.yaml
@@ -15,6 +15,7 @@
     files: '**'
     archive-artifacts: ''
     build-node: ubuntu1604-builder-4c-4g
+
 - project:
     name: policy-distribution-sonar
     jobs:

diff --git a/jjb/policy/policy-drools-applications.yaml b/jjb/policy/policy-drools-applications.yaml
index 39879c8..c23536f 100644 (file)
--- a/jjb/policy/policy-drools-applications.yaml
+++ b/jjb/policy/policy-drools-applications.yaml
@@ -17,6 +17,7 @@
     files: '**'
     archive-artifacts: ''
     build-node: 'ubuntu1604-builder-4c-4g'
+
 - project:
     name: policy-drools-applications-sonar
     jobs:

diff --git a/jjb/policy/policy-drools-pdp.yaml b/jjb/policy/policy-drools-pdp.yaml
index bacd997..217bfd4 100644 (file)
--- a/jjb/policy/policy-drools-pdp.yaml
+++ b/jjb/policy/policy-drools-pdp.yaml
@@ -27,6 +27,7 @@
     files: '**'
     archive-artifacts: ''
     build-node: 'ubuntu1604-builder-4c-4g'
+
 - project:
     name: policy-drools-pdp-sonar
     jobs:

diff --git a/jjb/policy/policy-engine.yaml b/jjb/policy/policy-engine.yaml
index c364ef5..de5085a 100644 (file)
--- a/jjb/policy/policy-engine.yaml
+++ b/jjb/policy/policy-engine.yaml
@@ -27,6 +27,7 @@
     files: '**'
     archive-artifacts: ''
     build-node: 'ubuntu1604-builder-4c-4g'
+
 - project:
     name: policy-engine-sonar
     jobs:

diff --git a/jjb/policy/policy-gui.yaml b/jjb/policy/policy-gui.yaml
index 63c4596..e872270 100644 (file)
--- a/jjb/policy/policy-gui.yaml
+++ b/jjb/policy/policy-gui.yaml
@@ -15,6 +15,7 @@
     files: '**'
     archive-artifacts: ''
     build-node: ubuntu1604-builder-4c-4g
+
 - project:
     name: policy-gui-sonar
     jobs:

diff --git a/jjb/policy/policy-models.yaml b/jjb/policy/policy-models.yaml
index ea7ce9d..4070ebc 100644 (file)
--- a/jjb/policy/policy-models.yaml
+++ b/jjb/policy/policy-models.yaml
@@ -15,6 +15,7 @@
     files: '**'
     archive-artifacts: ''
     build-node: ubuntu1604-builder-4c-4g
+
 - project:
     name: policy-models-sonar
     jobs:

diff --git a/jjb/policy/policy-pap.yaml b/jjb/policy/policy-pap.yaml
index 0602e18..32c5373 100644 (file)
--- a/jjb/policy/policy-pap.yaml
+++ b/jjb/policy/policy-pap.yaml
@@ -15,6 +15,7 @@
     files: '**'
     archive-artifacts: ''
     build-node: ubuntu1604-builder-4c-4g
+
 - project:
     name: policy-pap-sonar
     jobs:

diff --git a/jjb/policy/policy-pdp.yaml b/jjb/policy/policy-pdp.yaml
index c0f1f40..418457e 100644 (file)
--- a/jjb/policy/policy-pdp.yaml
+++ b/jjb/policy/policy-pdp.yaml
@@ -15,6 +15,7 @@
     files: '**'
     archive-artifacts: ''
     build-node: ubuntu1604-builder-4c-4g
+
 - project:
     name: policy-pdp-sonar
     jobs:

diff --git a/jjb/policy/policy-xacml-pdp.yaml b/jjb/policy/policy-xacml-pdp.yaml
index c377d6c..e497018 100644 (file)
--- a/jjb/policy/policy-xacml-pdp.yaml
+++ b/jjb/policy/policy-xacml-pdp.yaml
@@ -15,6 +15,7 @@
     files: '**'
     archive-artifacts: ''
     build-node: ubuntu1604-builder-4c-4g
+
 - project:
     name: policy-xacml-pdp-sonar
     jobs:

diff --git a/jjb/portal-sdk/portal-sdk.yaml b/jjb/portal-sdk/portal-sdk.yaml
index 25be786..5032c42 100644 (file)
--- a/jjb/portal-sdk/portal-sdk.yaml
+++ b/jjb/portal-sdk/portal-sdk.yaml
@@ -32,6 +32,7 @@
     files: '**'
     archive-artifacts: ''
     build-node: ubuntu1604-builder-4c-4g
+
 - project:
     name: portal-sdk-sonar
     jobs:

diff --git a/jjb/portal/portal.yaml b/jjb/portal/portal.yaml
index 4f8eb84..6c93fa8 100644 (file)
--- a/jjb/portal/portal.yaml
+++ b/jjb/portal/portal.yaml
@@ -16,6 +16,7 @@
     archive-artifacts: ''
     build-node: ubuntu1604-builder-4c-4g
     maven-deploy-properties: -Dbuild.number=$BUILD_NUMBER
+
 - project:
     name: portal-sonar
     jobs:

diff --git a/jjb/sdc/sdc-jtosca.yaml b/jjb/sdc/sdc-jtosca.yaml
index 1aeae3a..d54ed77 100644 (file)
--- a/jjb/sdc/sdc-jtosca.yaml
+++ b/jjb/sdc/sdc-jtosca.yaml
@@ -18,6 +18,7 @@
     files: '**'
     archive-artifacts: ''
     build-timeout: 60
+
 - project:
     name: sdc-jtosca-sonar
     jobs:
@@ -29,4 +30,4 @@
     branch: 'master'
     mvn-settings: 'sdc-jtosca-settings'
     mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
\ No newline at end of file
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'

diff --git a/jjb/sdc/sdc-onap-ui.yaml b/jjb/sdc/sdc-onap-ui.yaml
index 32c6bf5..63ecf8d 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
+
 - project:
     name: sdc-onap-ui-sonar
     jobs:
@@ -26,4 +27,4 @@
     branch: 'master'
     mvn-settings: 'sdc-onap-ui-settings'
     mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
\ No newline at end of file
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'

diff --git a/jjb/sdc/sdc-sdc-distribution-client.yaml b/jjb/sdc/sdc-sdc-distribution-client.yaml
index 26d5084..49e286e 100644 (file)
--- a/jjb/sdc/sdc-sdc-distribution-client.yaml
+++ b/jjb/sdc/sdc-sdc-distribution-client.yaml
@@ -18,6 +18,7 @@
     files: '**'
     archive-artifacts: ''
     build-timeout: 60
+
 - project:
     name: sdc-sdc-distribution-client-sonar
     jobs:
@@ -29,4 +30,4 @@
     branch: 'master'
     mvn-settings: 'sdc-sdc-distribution-client-settings'
     mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
\ No newline at end of file
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'

diff --git a/jjb/sdc/sdc-sdc-pubsub.yaml b/jjb/sdc/sdc-sdc-pubsub.yaml
new file mode 100644 (file)
index 0000000..1c5ec9a
--- /dev/null
+++ b/jjb/sdc/sdc-sdc-pubsub.yaml
@@ -0,0 +1,8 @@
+---
+- project:
+    name: sdc-sdc-pubsub-info
+    project-name: 'sdc-sdc-pubsub'
+    jobs:
+      - gerrit-info-yaml-verify
+    project: 'sdc/sdc-pubsub'
+    branch: 'master'

diff --git a/jjb/sdc/sdc-sdc-tosca.yaml b/jjb/sdc/sdc-sdc-tosca.yaml
index b0e852a..918194a 100644 (file)
--- a/jjb/sdc/sdc-sdc-tosca.yaml
+++ b/jjb/sdc/sdc-sdc-tosca.yaml
@@ -18,6 +18,7 @@
     files: '**'
     archive-artifacts: ''
     build-timeout: 60
+
 - project:
     name: sdc-sdc-tosca-sonar
     jobs:
@@ -29,4 +30,4 @@
     branch: 'master'
     mvn-settings: 'sdc-sdc-tosca-settings'
     mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
\ No newline at end of file
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'

diff --git a/jjb/sdc/sdc-sdc-workflow-designer.yaml b/jjb/sdc/sdc-sdc-workflow-designer.yaml
index 87ec020..8c1b207 100644 (file)
--- a/jjb/sdc/sdc-sdc-workflow-designer.yaml
+++ b/jjb/sdc/sdc-sdc-workflow-designer.yaml
@@ -21,6 +21,7 @@
     docker-pom: 'pom.xml'
     mvn-profile: docker
     build-node: ubuntu1604-builder-4c-4g
+
 - project:
     name: sdc-sdc-workflow-designer-sonar
     jobs:

diff --git a/jjb/sdc/sdc.yaml b/jjb/sdc/sdc.yaml
index 09e70ff..83520c0 100644 (file)
--- a/jjb/sdc/sdc.yaml
+++ b/jjb/sdc/sdc.yaml
@@ -24,6 +24,7 @@
     files: '**'
     archive-artifacts: ''
     build-node: ubuntu1604-builder-8c-8g
+
 - project:
     name: sdc-sonar
     jobs:
@@ -36,4 +37,4 @@
     mvn-settings: 'sdc-settings'
     mvn-params: '-Djacoco.skip=false'
     mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
\ No newline at end of file
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'

diff --git a/jjb/sdnc/sdnc-apps.yaml b/jjb/sdnc/sdnc-apps.yaml
index 0f94e6d..0738979 100644 (file)
--- a/jjb/sdnc/sdnc-apps.yaml
+++ b/jjb/sdnc/sdnc-apps.yaml
@@ -22,6 +22,7 @@
     files: '**'
     archive-artifacts: ''
     build-node: ubuntu1604-builder-4c-4g
+
 - project:
     name: sdnc-apps-sonar
     jobs:

diff --git a/jjb/sdnc/sdnc-features.yaml b/jjb/sdnc/sdnc-features.yaml
index 5368368..12accbb 100644 (file)
--- a/jjb/sdnc/sdnc-features.yaml
+++ b/jjb/sdnc/sdnc-features.yaml
@@ -22,6 +22,7 @@
     files: '**'
     archive-artifacts: ''
     build-node: ubuntu1604-builder-4c-4g
+
 - project:
     name: sdnc-features-sonar
     jobs:

diff --git a/jjb/sdnc/sdnc-northbound.yaml b/jjb/sdnc/sdnc-northbound.yaml
index 5f9e2f1..e82b314 100644 (file)
--- a/jjb/sdnc/sdnc-northbound.yaml
+++ b/jjb/sdnc/sdnc-northbound.yaml
@@ -22,6 +22,7 @@
     files: '**'
     archive-artifacts: ''
     build-node: ubuntu1604-builder-4c-4g
+
 - project:
     name: sdnc-northbound-sonar
     jobs:

diff --git a/jjb/so/so-libs.yaml b/jjb/so/so-libs.yaml
index 1ff4ca4..d571cf4 100644 (file)
--- a/jjb/so/so-libs.yaml
+++ b/jjb/so/so-libs.yaml
@@ -19,6 +19,7 @@
       deployAtEnd=true
     files: '**'
     archive-artifacts: ''
+
 - project:
     name: so-libs-sonar
     jobs:

diff --git a/jjb/so/so.yaml b/jjb/so/so.yaml
index 99db60f..79ebdf9 100644 (file)
--- a/jjb/so/so.yaml
+++ b/jjb/so/so.yaml
@@ -28,6 +28,7 @@
     files: '**'
     archive-artifacts: ''
     build-node: ubuntu1604-builder-4c-4g
+
 - project:
     name: so-sonar
     jobs:

diff --git a/jjb/testsuite/testsuite.yaml b/jjb/testsuite/testsuite.yaml
index f2e862d..92d5ffa 100644 (file)
--- a/jjb/testsuite/testsuite.yaml
+++ b/jjb/testsuite/testsuite.yaml
@@ -27,6 +27,4 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'amsterdam':
-          branch: 'amsterdam'
     mvn-settings: 'testsuite-settings'

diff --git a/jjb/ui/ui-dmaapbc.yaml b/jjb/ui/ui-dmaapbc.yaml
index 5a896b8..0b70287 100644 (file)
--- a/jjb/ui/ui-dmaapbc.yaml
+++ b/jjb/ui/ui-dmaapbc.yaml
@@ -18,6 +18,7 @@
     files: '**'
     archive-artifacts: ''
     build-node: ubuntu1604-builder-4c-4g
+
 - project:
     name: ui-dmaapbc-sonar
     jobs:

diff --git a/jjb/usecaseui/usecase-ui-server.yaml b/jjb/usecaseui/usecase-ui-server.yaml
index 86df049..f56e0c5 100644 (file)
--- a/jjb/usecaseui/usecase-ui-server.yaml
+++ b/jjb/usecaseui/usecase-ui-server.yaml
@@ -20,6 +20,7 @@
     docker-pom: 'pom.xml'
     mvn-profile: docker
     build-node: ubuntu1604-builder-4c-4g
+
 - project:
     name: usecase-ui-server-sonar
     jobs:

diff --git a/jjb/usecaseui/usecase-ui.yaml b/jjb/usecaseui/usecase-ui.yaml
index 6854d87..34393e1 100644 (file)
--- a/jjb/usecaseui/usecase-ui.yaml
+++ b/jjb/usecaseui/usecase-ui.yaml
@@ -20,6 +20,7 @@
     docker-pom: 'pom.xml'
     mvn-profile: docker
     build-node: ubuntu1604-builder-4c-4g
+
 - project:
     name: usecase-ui-sonar
     jobs:

diff --git a/jjb/vfc/vfc-gvnfm-vnflcm-java.yaml b/jjb/vfc/vfc-gvnfm-vnflcm-java.yaml
index 1925217..5a07ba8 100644 (file)
--- a/jjb/vfc/vfc-gvnfm-vnflcm-java.yaml
+++ b/jjb/vfc/vfc-gvnfm-vnflcm-java.yaml
@@ -25,6 +25,7 @@
     files: '**'
     archive-artifacts: ''
     build-node: centos7-redis-4c-4g
+
 - project:
     name: vfc-gvnfm-vnflcm-lcm-sonar
     jobs:

diff --git a/jjb/vfc/vfc-gvnfm-vnfmgr-java.yaml b/jjb/vfc/vfc-gvnfm-vnfmgr-java.yaml
index d82505d..314c0ac 100644 (file)
--- a/jjb/vfc/vfc-gvnfm-vnfmgr-java.yaml
+++ b/jjb/vfc/vfc-gvnfm-vnfmgr-java.yaml
@@ -24,6 +24,7 @@
     files: '**'
     archive-artifacts: ''
     build-node: ubuntu1604-builder-4c-4g
+
 - project:
     name: vfc-gvnfm-vnfmgr-mgr-sonar
     jobs:

diff --git a/jjb/vfc/vfc-gvnfm-vnfres-java.yaml b/jjb/vfc/vfc-gvnfm-vnfres-java.yaml
index ee2b740..1061e71 100644 (file)
--- a/jjb/vfc/vfc-gvnfm-vnfres-java.yaml
+++ b/jjb/vfc/vfc-gvnfm-vnfres-java.yaml
@@ -25,6 +25,7 @@
     files: '**'
     archive-artifacts: ''
     build-node: ubuntu1604-builder-4c-4g
+
 - project:
     name: vfc-gvnfm-vnfres-res-sonar
     jobs:

diff --git a/jjb/vfc/vfc-nfvo-catalog.yaml b/jjb/vfc/vfc-nfvo-catalog.yaml
index c483ad7..1006430 100644 (file)
--- a/jjb/vfc/vfc-nfvo-catalog.yaml
+++ b/jjb/vfc/vfc-nfvo-catalog.yaml
@@ -26,6 +26,7 @@
     files: '**'
     archive-artifacts: ''
     build-node: centos7-redis-4c-4g
+
 - project:
     name: vfc-nfvo-catalog-sonar
     jobs:

diff --git a/jjb/vfc/vfc-nfvo-driver-ems-java.yaml b/jjb/vfc/vfc-nfvo-driver-ems-java.yaml
index 69f192e..5cc0aec 100644 (file)
--- a/jjb/vfc/vfc-nfvo-driver-ems-java.yaml
+++ b/jjb/vfc/vfc-nfvo-driver-ems-java.yaml
@@ -25,6 +25,7 @@
     files: '**'
     archive-artifacts: ''
     build-node: ubuntu1604-builder-4c-4g
+
 - project:
     name: vfc-nfvo-driver-ems-sonar
     jobs:

diff --git a/jjb/vfc/vfc-nfvo-driver-sfc.yaml b/jjb/vfc/vfc-nfvo-driver-sfc.yaml
index ffac8a6..0b2aeb8 100644 (file)
--- a/jjb/vfc/vfc-nfvo-driver-sfc.yaml
+++ b/jjb/vfc/vfc-nfvo-driver-sfc.yaml
@@ -24,6 +24,7 @@
     files: '**'
     archive-artifacts: ''
     build-node: ubuntu1604-builder-4c-4g
+
 - project:
     name: vfc-nfvo-driver-sfc-sonar
     jobs:

diff --git a/jjb/vfc/vfc-nfvo-driver-svnfm-huawei.yaml b/jjb/vfc/vfc-nfvo-driver-svnfm-huawei.yaml
index ace1f86..3307b4b 100644 (file)
--- a/jjb/vfc/vfc-nfvo-driver-svnfm-huawei.yaml
+++ b/jjb/vfc/vfc-nfvo-driver-svnfm-huawei.yaml
@@ -20,6 +20,7 @@
     files: '**'
     archive-artifacts: ''
     build-node: ubuntu1604-builder-4c-4g
+
 - project:
     name: vfc-nfvo-driver-svnfm-huawei-sonar
     jobs:

diff --git a/jjb/vfc/vfc-nfvo-driver-vnfm-gvnfm-java.yaml b/jjb/vfc/vfc-nfvo-driver-vnfm-gvnfm-java.yaml
index 7769c2b..c5cc853 100644 (file)
--- a/jjb/vfc/vfc-nfvo-driver-vnfm-gvnfm-java.yaml
+++ b/jjb/vfc/vfc-nfvo-driver-vnfm-gvnfm-java.yaml
@@ -25,6 +25,7 @@
     files: '**'
     archive-artifacts: ''
     build-node: ubuntu1604-builder-4c-4g
+
 - project:
     name: vfc-nfvo-driver-vnfm-gvnfm-gvnfmadapter-sonar
     jobs:

diff --git a/jjb/vfc/vfc-nfvo-driver-vnfm-gvnfm-juju.yaml b/jjb/vfc/vfc-nfvo-driver-vnfm-gvnfm-juju.yaml
index a1efb31..5275547 100644 (file)
--- a/jjb/vfc/vfc-nfvo-driver-vnfm-gvnfm-juju.yaml
+++ b/jjb/vfc/vfc-nfvo-driver-vnfm-gvnfm-juju.yaml
@@ -19,6 +19,7 @@
     files: '**'
     archive-artifacts: ''
     build-node: ubuntu1604-builder-4c-4g
+
 - project:
     name: vfc-nfvo-driver-vnfm-gvnfm-juju-sonar
     jobs:
@@ -31,4 +32,4 @@
     branch: 'master'
     mvn-settings: 'vfc-nfvo-driver-vnfm-gvnfm-settings'
     mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
\ No newline at end of file
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'

diff --git a/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-nokia.yaml b/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-nokia.yaml
index 0accce8..f937be5 100644 (file)
--- a/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-nokia.yaml
+++ b/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-nokia.yaml
@@ -20,6 +20,7 @@
     files: '**'
     archive-artifacts: ''
     build-node: ubuntu1604-builder-4c-4g
+
 - project:
     name: vfc-nfvo-driver-vnfm-svnfm-nokia-sonar
     jobs:

diff --git a/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-zte-java.yaml b/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-zte-java.yaml
index 557f7cf..19d8f21 100644 (file)
--- a/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-zte-java.yaml
+++ b/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-zte-java.yaml
@@ -1,5 +1,4 @@
 ---
-
 - project:
     name: vfc-nfvo-driver-vnfm-svnfm-zte-java
     project-name: 'vfc-nfvo-driver-vnfm-svnfm-zte'
@@ -21,6 +20,7 @@
     files: '**'
     archive-artifacts: ''
     build-node: ubuntu1604-builder-4c-4g
+
 - project:
     name: vfc-nfvo-driver-vnfm-svnfm-zte-sonar
     jobs:

diff --git a/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-zte-python.yaml b/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-zte-python.yaml
index 0f77612..39d7eb8 100644 (file)
--- a/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-zte-python.yaml
+++ b/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-zte-python.yaml
@@ -1,5 +1,4 @@
 ---
-
 - project:
     name: vfc-nfvo-driver-vnfm-svnfm-zte-python
     project-name: 'vfc-nfvo-driver-vnfm-svnfm'

diff --git a/jjb/vfc/vfc-nfvo-lcm-java.yaml b/jjb/vfc/vfc-nfvo-lcm-java.yaml
index a1ec2fd..0332f12 100644 (file)
--- a/jjb/vfc/vfc-nfvo-lcm-java.yaml
+++ b/jjb/vfc/vfc-nfvo-lcm-java.yaml
@@ -1,5 +1,4 @@
 ---
-
 - project:
     name: vfc-nfvo-lcm-java
     project-name: 'vfc-nfvo-lcm'
@@ -21,6 +20,7 @@
     files: '**'
     archive-artifacts: ''
     build-node: centos7-redis-4c-4g
+
 - project:
     name: vfc-nfvo-lcm-sonar
     jobs:

diff --git a/jjb/vfc/vfc-nfvo-lcm-python.yaml b/jjb/vfc/vfc-nfvo-lcm-python.yaml
index 8fc3b9e..6fa0d24 100644 (file)
--- a/jjb/vfc/vfc-nfvo-lcm-python.yaml
+++ b/jjb/vfc/vfc-nfvo-lcm-python.yaml
@@ -1,5 +1,4 @@
 ---
-
 - project:
     name: vfc-nfvo-lcm
     project-name: 'vfc-nfvo-lcm'

diff --git a/jjb/vfc/vfc-nfvo-multivimproxy.yaml b/jjb/vfc/vfc-nfvo-multivimproxy.yaml
index cc712e0..4265d3f 100644 (file)
--- a/jjb/vfc/vfc-nfvo-multivimproxy.yaml
+++ b/jjb/vfc/vfc-nfvo-multivimproxy.yaml
@@ -1,5 +1,4 @@
 ---
-
 - project:
     name: vfc-nfvo-multivimproxy
     project: 'vfc/nfvo/multivimproxy'
@@ -19,6 +18,7 @@
           mvn-goals: 'install'
           script:
             !include-raw-escape: 'build-nfvo-multivimproxy-docker-image.sh'
+
 - project:
     name: vfc-nfvo-multivimproxy-sonar
     jobs:

diff --git a/jjb/vfc/vfc-nfvo-resmanagement.yaml b/jjb/vfc/vfc-nfvo-resmanagement.yaml
index 0002c35..010539c 100644 (file)
--- a/jjb/vfc/vfc-nfvo-resmanagement.yaml
+++ b/jjb/vfc/vfc-nfvo-resmanagement.yaml
@@ -1,5 +1,4 @@
 ---
-
 - project:
     name: vfc-nfvo-resmanagement
     project: 'vfc/nfvo/resmanagement'
@@ -19,6 +18,7 @@
           mvn-goals: 'install'
           script:
             !include-raw-escape: 'build-nfvo-resmanagement-docker-image.sh'
+
 - project:
     name: vfc-nfvo-resmanagement-sonar
     jobs:

diff --git a/jjb/vfc/vfc-nfvo-wfengine-java.yaml b/jjb/vfc/vfc-nfvo-wfengine-java.yaml
index c35b6a8..28d0712 100644 (file)
--- a/jjb/vfc/vfc-nfvo-wfengine-java.yaml
+++ b/jjb/vfc/vfc-nfvo-wfengine-java.yaml
@@ -1,5 +1,4 @@
 ---
-
 - project:
     name: vfc-nfvo-wfengine
     project-name: 'vfc-nfvo-wfengine'
@@ -29,6 +28,7 @@
     files: '**'
     archive-artifacts: ''
     build-node: ubuntu1604-builder-4c-4g
+
 - project:
     name: vfc-nfvo-wfengine-wfenginemgrservice-sonar
     jobs:

diff --git a/jjb/vid/vid.yaml b/jjb/vid/vid.yaml
index 0591b95..fad1ca9 100644 (file)
--- a/jjb/vid/vid.yaml
+++ b/jjb/vid/vid.yaml
@@ -19,6 +19,7 @@
     files: '**'
     archive-artifacts: ''
     build-node: ubuntu1604-builder-4c-4g
+
 - project:
     name: vid-sonar
     jobs:

diff --git a/jjb/vnfrqts/vnfrqts-epics.yaml b/jjb/vnfrqts/vnfrqts-epics.yaml
index f871f4b..1e582a8 100644 (file)
--- a/jjb/vnfrqts/vnfrqts-epics.yaml
+++ b/jjb/vnfrqts/vnfrqts-epics.yaml
@@ -1,7 +1,7 @@
 ---
 - project:
     name: vnfrqts-epics
-    project: 'vnfrqts-epics'
+    project: 'vnfrqts/epics'
     jobs:
       - gerrit-info-yaml-verify
     project-name: 'vnfrqts-epics'

diff --git a/jjb/vnfrqts/vnfrqts-guidelines.yaml b/jjb/vnfrqts/vnfrqts-guidelines.yaml
index 576f9a7..a8f5ece 100644 (file)
--- a/jjb/vnfrqts/vnfrqts-guidelines.yaml
+++ b/jjb/vnfrqts/vnfrqts-guidelines.yaml
@@ -1,7 +1,7 @@
 ---
 - project:
     name: vnfrqts-guidelines
-    project: 'vnfrqts-guidelines'
+    project: 'vnfrqts/guidelines'
     jobs:
       - gerrit-info-yaml-verify
     project-name: 'vnfrqts-guidelines'

diff --git a/jjb/vnfrqts/vnfrqts-requirements.yaml b/jjb/vnfrqts/vnfrqts-requirements.yaml
index 5500798..e62095f 100644 (file)
--- a/jjb/vnfrqts/vnfrqts-requirements.yaml
+++ b/jjb/vnfrqts/vnfrqts-requirements.yaml
@@ -1,7 +1,7 @@
 ---
 - project:
     name: vnfrqts-requirements
-    project: 'vnfrqts-requirements'
+    project: 'vnfrqts/requirements'
     jobs:
       - gerrit-info-yaml-verify
     project-name: 'vnfrqts-requirements'

diff --git a/jjb/vnfrqts/vnfrqts-testcases.yaml b/jjb/vnfrqts/vnfrqts-testcases.yaml
index b40afa9..83fb50e 100644 (file)
--- a/jjb/vnfrqts/vnfrqts-testcases.yaml
+++ b/jjb/vnfrqts/vnfrqts-testcases.yaml
@@ -1,7 +1,7 @@
 ---
 - project:
     name: vnfrqts-testcases
-    project: 'vnfrqts-testcases'
+    project: 'vnfrqts/testcases'
     jobs:
       - gerrit-info-yaml-verify
     project-name: 'vnfrqts-testcases'

diff --git a/jjb/vnfrqts/vnfrqts-usecases.yaml b/jjb/vnfrqts/vnfrqts-usecases.yaml
index e254f4a..0fdceb2 100644 (file)
--- a/jjb/vnfrqts/vnfrqts-usecases.yaml
+++ b/jjb/vnfrqts/vnfrqts-usecases.yaml
@@ -1,7 +1,7 @@
 ---
 - project:
     name: vnfrqts-usecases
-    project: 'vnfrqts-usecases'
+    project: 'vnfrqts/usecases'
     jobs:
       - gerrit-info-yaml-verify
     project-name: 'vnfrqts-usecases'

diff --git a/jjb/vnfsdk/vnfsdk-dovetail-integration-python.yaml b/jjb/vnfsdk/vnfsdk-dovetail-integration-python.yaml
index 9a736da..3a704fa 100644 (file)
--- a/jjb/vnfsdk/vnfsdk-dovetail-integration-python.yaml
+++ b/jjb/vnfsdk/vnfsdk-dovetail-integration-python.yaml
@@ -26,6 +26,7 @@
           docker-pom: 'pom.xml'
           mvn-profile: 'docker'
           mvn-params: '-Dmaven.test.skip=true'
+
 - project:
     name: vnfsdk-dovetail-integration-tox-sonar
     jobs:
@@ -38,3 +39,11 @@
     mvn-settings: 'vnfsdk-dovetail-integration-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+
+- project:
+    name: vnfsdk-dovetail-integration-info
+    jobs:
+      - gerrit-info-yaml-verify
+    project: 'vnfsdk/dovetail-integration'
+    project-name: 'vnfsdk-dovetail-integration'
+    branch: 'master'

diff --git a/jjb/vnfsdk/vnfsdk-functest.yaml b/jjb/vnfsdk/vnfsdk-functest.yaml
index ec97de3..85e9b1b 100644 (file)
--- a/jjb/vnfsdk/vnfsdk-functest.yaml
+++ b/jjb/vnfsdk/vnfsdk-functest.yaml
@@ -3,7 +3,7 @@
     name: vnfsdk-functest
     project-name: 'vnfsdk-functest'
     jobs:
-    - gerrit-maven-clm:
+    - gerrit-maven-clm
     - '{project-name}-{stream}-verify-java'
     - '{project-name}-{stream}-merge-java'
     - '{project-name}-{stream}-release-version-java-daily'
@@ -16,6 +16,7 @@
     files: '**'
     archive-artifacts: ''
     build-node: ubuntu1604-builder-4c-4g
+
 - project:
     name: vnfsdk-functest-sonar
     jobs:
@@ -28,3 +29,11 @@
     mvn-settings: 'vnfsdk-functest-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+
+- project:
+    name: vnfsdk-functest-info
+    jobs:
+      - gerrit-info-yaml-verify
+    project: 'vnfsdk/functest'
+    project-name: 'vnfsdk-functest'
+    branch: 'master'

diff --git a/jjb/vnfsdk/vnfsdk-ice-python.yaml b/jjb/vnfsdk/vnfsdk-ice-python.yaml
index a3ad7d3..223eeef 100644 (file)
--- a/jjb/vnfsdk/vnfsdk-ice-python.yaml
+++ b/jjb/vnfsdk/vnfsdk-ice-python.yaml
@@ -29,6 +29,7 @@
       - '{project-name}-{stream}-{subproject}-merge-java'
       - '{project-name}-{subproject}-python-staging-{stream}'
       - '{project-name}-{subproject}-python-release-{stream}'
+
 - project:
     name: vnfsdk-ice-docker
     project-name: 'vnfsdk-ice-docker'
@@ -50,6 +51,7 @@
           docker-pom: 'docker/pom.xml'
           mvn-profile: 'docker'
           mvn-params: '-Dmaven.test.skip=true'
+
 - project:
     name: vnfsdk-ice-validation-scripts-tox-sonar
     jobs:
@@ -63,6 +65,7 @@
     mvn-settings: 'vnfsdk-ice-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+
 - project:
     name: vnfsdk-ice-ice-server-tox-sonar
     jobs:
@@ -77,3 +80,10 @@
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
 
+- project:
+    name: vnfsdk-ice-info
+    jobs:
+      - gerrit-info-yaml-verify
+    project: 'vnfsdk/ice'
+    project-name: 'vnfsdk-ice'
+    branch: 'master'

diff --git a/jjb/vnfsdk/vnfsdk-lctest.yaml b/jjb/vnfsdk/vnfsdk-lctest.yaml
index 9a7e2a1..e77fa78 100644 (file)
--- a/jjb/vnfsdk/vnfsdk-lctest.yaml
+++ b/jjb/vnfsdk/vnfsdk-lctest.yaml
@@ -5,9 +5,16 @@
     jobs:
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
-
     project-name: 'vnfsdk-lctest'
     stream:
       - 'master':
           branch: 'master'
     mvn-settings: 'vnfsdk-lctest-settings'
+
+- project:
+    name: vnfsdk-lctest-info
+    jobs:
+      - gerrit-info-yaml-verify
+    project: 'vnfsdk/lctest'
+    project-name: 'vnfsdk-lctest'
+    branch: 'master'

diff --git a/jjb/vnfsdk/vnfsdk-model.yaml b/jjb/vnfsdk/vnfsdk-model.yaml
new file mode 100644 (file)
index 0000000..71808ea
--- /dev/null
+++ b/jjb/vnfsdk/vnfsdk-model.yaml
@@ -0,0 +1,9 @@
+---
+- project:
+    name: vnfsdk-model
+    project: 'vnfsdk/model'
+    jobs:
+      - gerrit-info-yaml-verify
+    project-name: vnfsdk-model
+    branch: master
+    mvn-settings: vnfsdk-model-settings

diff --git a/jjb/vnfsdk/vnfsdk-pkgtools-python.yaml b/jjb/vnfsdk/vnfsdk-pkgtools-python.yaml
index a0480d1..2ed1153 100644 (file)
--- a/jjb/vnfsdk/vnfsdk-pkgtools-python.yaml
+++ b/jjb/vnfsdk/vnfsdk-pkgtools-python.yaml
@@ -20,6 +20,7 @@
       - '{project-name}-{stream}-{subproject}-verify-python'
       - '{project-name}-{subproject}-python-staging-{stream}'
       - '{project-name}-{subproject}-python-release-{stream}'
+
 - project:
     name: vnfsdk-pkgtools-tox-sonar
     jobs:
@@ -32,3 +33,11 @@
     mvn-settings: 'vnfsdk-pkgtools-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+
+- project:
+    name: vnfsdk-pkgtools-info
+    jobs:
+      - gerrit-info-yaml-verify
+    project: 'vnfsdk/pkgtools'
+    project-name: 'vnfsdk-pkgtools'
+    branch: 'master'

diff --git a/jjb/vnfsdk/vnfsdk-refrepo.yaml b/jjb/vnfsdk/vnfsdk-refrepo.yaml
index 0b07b10..debb979 100644 (file)
--- a/jjb/vnfsdk/vnfsdk-refrepo.yaml
+++ b/jjb/vnfsdk/vnfsdk-refrepo.yaml
@@ -3,7 +3,7 @@
     name: vnfsdk-refrepo
     project-name: 'vnfsdk-refrepo'
     jobs:
-      - gerrit-maven-clm:
+      - gerrit-maven-clm
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
       - '{project-name}-{stream}-release-version-java-daily'
@@ -15,7 +15,6 @@
           docker-pom: 'vnfmarket-be/deployment/docker/docker-postgres/pom.xml'
           mvn-profile: 'docker'
           mvn-params: '-Dmaven.test.skip=true'
-
     project: 'vnfsdk/refrepo'
     stream:
       - 'master':
@@ -24,6 +23,7 @@
     files: '**'
     archive-artifacts: ''
     build-node: ubuntu1604-builder-4c-4g
+
 - project:
     name: vnfsdk-refrepo-sonar
     jobs:
@@ -36,3 +36,11 @@
     mvn-settings: 'vnfsdk-refrepo-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+
+- project:
+    name: vnfsdk-refrepo-info
+    jobs:
+      - gerrit-info-yaml-verify
+    project: 'vnfsdk/refrepo'
+    project-name: 'vnfsdk-refrepo'
+    branch: 'master'

diff --git a/jjb/vnfsdk/vnfsdk-validation.yaml b/jjb/vnfsdk/vnfsdk-validation.yaml
index 79b8573..7e85987 100644 (file)
--- a/jjb/vnfsdk/vnfsdk-validation.yaml
+++ b/jjb/vnfsdk/vnfsdk-validation.yaml
@@ -3,11 +3,10 @@
     name: vnfsdk-validation
     project-name: 'vnfsdk-validation'
     jobs:
-    - gerrit-maven-clm:
+    - gerrit-maven-clm
     - '{project-name}-{stream}-verify-java'
     - '{project-name}-{stream}-merge-java'
     - '{project-name}-{stream}-release-version-java-daily'
-
     project: 'vnfsdk/validation'
     stream:
       - 'master':
@@ -16,6 +15,7 @@
     files: '**'
     archive-artifacts: ''
     build-node: ubuntu1604-builder-4c-4g
+
 - project:
     name: vnfsdk-validation-sonar
     jobs:
@@ -27,4 +27,12 @@
     branch: 'master'
     mvn-settings: 'vnfsdk-validation-settings'
     mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
\ No newline at end of file
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+
+- project:
+    name: vnfsdk-validation-info
+    jobs:
+      - gerrit-info-yaml-verify
+    project: 'vnfsdk/validation'
+    project-name: 'vnfsdk-validation'
+    branch: 'master'

diff --git a/jjb/vnfsdk/vnfsdk-ves-agent.yaml b/jjb/vnfsdk/vnfsdk-ves-agent.yaml
index ac77b77..37d5b9c 100644 (file)
--- a/jjb/vnfsdk/vnfsdk-ves-agent.yaml
+++ b/jjb/vnfsdk/vnfsdk-ves-agent.yaml
@@ -14,7 +14,6 @@
       - '{project-name}-{stream}-{subproject}-verify-java'
       - '{project-name}-{stream}-{subproject}-merge-java'
       - '{project-name}-{stream}-{subproject}-release-java-daily'
-
     project: 'vnfsdk/ves-agent'
     stream:
       - 'master':
@@ -23,6 +22,7 @@
     files: '**'
     archive-artifacts: ''
     build-node: ubuntu1604-builder-4c-4g
+
 - project:
     name: vnfsdk-ves-agent-sonar
     jobs:
@@ -36,3 +36,11 @@
     mvn-settings: 'vnfsdk-ves-agent-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+
+- project:
+    name: vnfsdk-ves-agent-info
+    jobs:
+      - gerrit-info-yaml-verify
+    project: 'vnfsdk/ves-agent'
+    project-name: 'vnfsdk-ves-agent'
+    branch: 'master'

diff --git a/jjb/vvp/vvp-cms.yaml b/jjb/vvp/vvp-cms.yaml
index bc73a23..b0a3a43 100644 (file)
--- a/jjb/vvp/vvp-cms.yaml
+++ b/jjb/vvp/vvp-cms.yaml
@@ -20,6 +20,7 @@
           mvn-params: '-Dmaven.test.skip=true'
     docker-pom: 'pom.xml'
     mvn-profile: 'default'
+
 - project:
     name: vvp-cms-sonar
     jobs:

diff --git a/jjb/vvp/vvp-engagementmgr.yaml b/jjb/vvp/vvp-engagementmgr.yaml
index c1b4404..b21bc98 100644 (file)
--- a/jjb/vvp/vvp-engagementmgr.yaml
+++ b/jjb/vvp/vvp-engagementmgr.yaml
@@ -20,6 +20,7 @@
           mvn-params: '-Dmaven.test.skip=true'
     docker-pom: 'pom.xml'
     mvn-profile: 'default'
+
 - project:
     name: vvp-engagementmgr-sonar
     jobs:

diff --git a/jjb/vvp/vvp-gitlab.yaml b/jjb/vvp/vvp-gitlab.yaml
index 3613edc..9e31eb0 100644 (file)
--- a/jjb/vvp/vvp-gitlab.yaml
+++ b/jjb/vvp/vvp-gitlab.yaml
@@ -20,6 +20,7 @@
           mvn-params: '-Dmaven.test.skip=true'
     docker-pom: 'pom.xml'
     mvn-profile: 'default'
+
 - project:
     name: vvp-gitlab-sonar
     jobs:

diff --git a/jjb/vvp/vvp-image-scanner.yaml b/jjb/vvp/vvp-image-scanner.yaml
index f29f877..359344b 100644 (file)
--- a/jjb/vvp/vvp-image-scanner.yaml
+++ b/jjb/vvp/vvp-image-scanner.yaml
@@ -20,6 +20,7 @@
           mvn-params: '-Dmaven.test.skip=true'
     docker-pom: 'pom.xml'
     mvn-profile: 'default'
+
 - project:
     name: vvp-image-scanner-sonar
     jobs:

diff --git a/jjb/vvp/vvp-jenkins.yaml b/jjb/vvp/vvp-jenkins.yaml
index 77c8a72..283c159 100644 (file)
--- a/jjb/vvp/vvp-jenkins.yaml
+++ b/jjb/vvp/vvp-jenkins.yaml
@@ -20,6 +20,7 @@
           mvn-params: '-Dmaven.test.skip=true'
     docker-pom: 'pom.xml'
     mvn-profile: 'default'
+
 - project:
     name: vvp-jenkins-sonar
     jobs:

diff --git a/jjb/vvp/vvp-portal.yaml b/jjb/vvp/vvp-portal.yaml
index d62bd85..bba7766 100644 (file)
--- a/jjb/vvp/vvp-portal.yaml
+++ b/jjb/vvp/vvp-portal.yaml
@@ -20,6 +20,7 @@
           mvn-params: '-Dmaven.test.skip=true'
     docker-pom: 'pom.xml'
     mvn-profile: 'default'
+
 - project:
     name: vvp-portal-sonar
     jobs:

diff --git a/jjb/vvp/vvp-postgresql.yaml b/jjb/vvp/vvp-postgresql.yaml
index c3a0f31..0790140 100644 (file)
--- a/jjb/vvp/vvp-postgresql.yaml
+++ b/jjb/vvp/vvp-postgresql.yaml
@@ -20,6 +20,7 @@
           mvn-params: '-Dmaven.test.skip=true'
     docker-pom: 'pom.xml'
     mvn-profile: 'default'
+
 - project:
     name: vvp-postgresql-sonar
     jobs:

diff --git a/jjb/vvp/vvp-test-engine.yaml b/jjb/vvp/vvp-test-engine.yaml
index b4ccbd8..ad7b1c1 100644 (file)
--- a/jjb/vvp/vvp-test-engine.yaml
+++ b/jjb/vvp/vvp-test-engine.yaml
@@ -20,6 +20,7 @@
           mvn-params: '-Dmaven.test.skip=true'
     docker-pom: 'pom.xml'
     mvn-profile: 'default'
+
 - project:
     name: vvp-test-engine-sonar
     jobs:

diff --git a/jjb/vvp/vvp-validation-scripts.yaml b/jjb/vvp/vvp-validation-scripts.yaml
index 7a57deb..6100c0e 100644 (file)
--- a/jjb/vvp/vvp-validation-scripts.yaml
+++ b/jjb/vvp/vvp-validation-scripts.yaml
@@ -16,6 +16,7 @@
     jobs:
       - gerrit-python-xc-clm
       - '{project-name}-{stream}-{subproject}-verify-python'
+
 - project:
     name: vvp-validation-scripts-sonar
     jobs:
@@ -28,4 +29,3 @@
     mvn-settings: 'vvp-validation-scripts-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-

diff --git a/scripts/.gitignore b/scripts/.gitignore
deleted file mode 100644 (file)
index c5ec4a4..0000000
--- a/scripts/.gitignore
+++ /dev/null
@@ -1,7 +0,0 @@
-# Python
-__pycache__/
-*.pyc
-
-# ODL Signer
-.sign-artifacts
-gpg-signatures

diff --git a/scripts/check-unicode.sh b/scripts/check-unicode.sh
deleted file mode 100755 (executable)
index 931c99f..0000000
--- a/scripts/check-unicode.sh
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/bin/bash
-
-# @License EPL-1.0 <http://spdx.org/licenses/EPL-1.0>
-##############################################################################
-# Copyright (c) 2015 The Linux Foundation and others.
-#
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-#   Thanh Ha (The Linux Foundation) - Initial implementation
-##############################################################################
-
-directory=${1:-"."}
-
-echo "Scanning $directory"
-if LC_ALL=C grep -r '[^[:print:][:space:]]' "$directory"; then
-    echo "Found files containing non-ascii characters."
-    exit 1
-fi
-
-echo "All files are ASCII only"
-