Merge "fix dfc docker push"

diff --git a/global-jjb b/global-jjb
index ceaa770..8dcb264 160000 (submodule)
--- a/global-jjb
+++ b/global-jjb
@@ -1 +1 @@
-Subproject commit ceaa770aceb35242840d2718a0f8664143a8835f
+Subproject commit 8dcb2644580bc202933cded58875733793ac7607

diff --git a/jjb/aai/aai-aai-common.yaml b/jjb/aai/aai-aai-common.yaml
index 8327a83..74e1b60 100644 (file)
--- a/jjb/aai/aai-aai-common.yaml
+++ b/jjb/aai/aai-aai-common.yaml
@@ -62,3 +62,25 @@
       - gerrit-info-yaml-verify
     project: aai/aai-common
     branch: master
+
+- project:
+    name: 'aai-aai-common-docker'
+    jobs:
+      - '{project-name}-{stream}-verify-docker'
+      - '{project-name}-{stream}-merge-docker'
+    project-name: 'aai-aai-common'
+    project: 'aai/aai-common'
+    stream:
+      - 'master-alpine':
+          branch: 'master'
+          distro: 'alpine'
+      - 'master-ubuntu':
+          branch: 'master'
+          distro: 'ubuntu'
+    docker_name: 'onap/aai-common-{distro}'
+    docker_build_args: '-f ./Dockerfile.{distro}'
+    docker_root: '$WORKSPACE/Dockerfiles/aai-common/'
+    mvn-settings: 'aai-aai-common-settings'
+    mvn-version: 'mvn35'
+    files: 'Dockerfiles/aai-common/**'
+    build-node: ubuntu1604-docker-8c-8g

diff --git a/jjb/appc/appc-cdt.yaml b/jjb/appc/appc-cdt.yaml
index 3cf9089..9378e74 100644 (file)
--- a/jjb/appc/appc-cdt.yaml
+++ b/jjb/appc/appc-cdt.yaml
@@ -9,6 +9,8 @@
           sign-artifacts: true
           build-node: centos7-docker-8c-8g
           maven-versions-plugin: true
+      - '{project-name}-gerrit-release-jobs':
+          build-node: centos7-builder-4c-4g
 
     project: 'appc/cdt'
     stream:

diff --git a/jjb/appc/appc-deployment.yaml b/jjb/appc/appc-deployment.yaml
index 21d3cc2..dc38c0b 100644 (file)
--- a/jjb/appc/appc-deployment.yaml
+++ b/jjb/appc/appc-deployment.yaml
@@ -6,12 +6,6 @@
     jobs:
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
-      - gerrit-maven-stage:
-          sign-artifacts: true
-          build-node: centos7-docker-8c-8g
-          maven-versions-plugin: true
-      - '{project-name}-{stream}-release-version-java-daily'
-      - '{project-name}-docker-image-blessing'
 
     project: 'appc/deployment'
     stream:

diff --git a/jjb/appc/appc-master.yaml b/jjb/appc/appc-master.yaml
index 9929fb1..30a4b94 100644 (file)
--- a/jjb/appc/appc-master.yaml
+++ b/jjb/appc/appc-master.yaml
@@ -13,6 +13,8 @@
           maven-versions-plugin: true
       - '{project-name}-{stream}-release-version-java-daily':
           build-node: ubuntu1604-builder-8c-8g
+      - '{project-name}-gerrit-release-jobs':
+          build-node: centos7-builder-4c-4g
 
     project: 'appc'
     stream:

diff --git a/jjb/appc/appc-parent.yaml b/jjb/appc/appc-parent.yaml
index 7dd63c5..fa63bb2 100644 (file)
--- a/jjb/appc/appc-parent.yaml
+++ b/jjb/appc/appc-parent.yaml
@@ -15,6 +15,8 @@
           sign-artifacts: true
           build-node: centos7-docker-8c-8g
           maven-versions-plugin: true
+      - '{project-name}-gerrit-release-jobs':
+          build-node: centos7-builder-4c-4g
 
     project: 'appc/parent'
     stream:

diff --git a/jjb/ccsdk/apps.yaml b/jjb/ccsdk/apps.yaml
index 5a40b15..89eb16c 100644 (file)
--- a/jjb/ccsdk/apps.yaml
+++ b/jjb/ccsdk/apps.yaml
@@ -20,13 +20,13 @@
           container-staging-registry: 'nexus3.onap.org:10003'
           mvn-params: '-Dmaven.test.skip=true -P docker'
           maven-version: "mvn35"
+      - '{project-name}-gerrit-release-jobs':
+          build-node: centos7-builder-4c-4g
 
     project: 'ccsdk/apps'
     stream:
       - 'master':
           branch: 'master'
-      - 'dublin':
-          branch: 'dublin'
     mvn-settings: 'ccsdk-apps-settings'
     # due to a strange macro / variable translation problem this needs to be
     # passed as a string block to properly get the properties correctly defined
@@ -62,8 +62,6 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'dublin':
-          branch: 'dublin'
     mvn-settings: 'ccsdk-apps-settings'
     maven-version: "mvn35"
     build-node: ubuntu1604-builder-4c-4g
@@ -92,3 +90,14 @@
       - gerrit-info-yaml-verify
     project: ccsdk/apps
     branch: master
+
+- project:
+    name: ccsdk-apps-whitesource
+    project-name: ccsdk-apps
+    jobs:
+      - gerrit-whitesource-scan
+    mvn-settings: 'ccsdk-apps-settings'
+    wss-product-name: ccsdk
+    mvn-clean-install: true
+    project: ccsdk/apps
+    branch: master

diff --git a/jjb/ccsdk/ccsdk-csit.yaml b/jjb/ccsdk/ccsdk-csit.yaml
index 40d7500..2cbdf3e 100644 (file)
--- a/jjb/ccsdk/ccsdk-csit.yaml
+++ b/jjb/ccsdk/ccsdk-csit.yaml
@@ -8,8 +8,6 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'dublin':
-          branch: 'dublin'
     functionality:
       - 'healthcheck':
           trigger_jobs: '{project-name}-{stream}-release-java-daily-checkstyle'

diff --git a/jjb/ccsdk/cds.yaml b/jjb/ccsdk/cds.yaml
index 9c6a0ec..8aab71f 100644 (file)
--- a/jjb/ccsdk/cds.yaml
+++ b/jjb/ccsdk/cds.yaml
@@ -16,13 +16,13 @@
           mvn-params: '-Dmaven.test.skip=true -P docker'
           maven-version: "mvn35"
           maven-versions-plugin: true
+      - '{project-name}-gerrit-release-jobs':
+          build-node: centos7-builder-4c-4g
 
     project: 'ccsdk/cds'
     stream:
       - 'master':
           branch: 'master'
-      - 'dublin':
-          branch: 'dublin'
     mvn-settings: 'ccsdk-cds-settings'
     # due to a strange macro / variable translation problem this needs to be
     # passed as a string block to properly get the properties correctly defined
@@ -58,8 +58,6 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'dublin':
-          branch: 'dublin'
     mvn-settings: 'ccsdk-cds-settings'
     maven-version: "mvn35"
     build-node: ubuntu1604-builder-4c-4g
@@ -72,3 +70,14 @@
       - gerrit-info-yaml-verify
     project: ccsdk/cds
     branch: master
+
+- project:
+    name: ccsdk-cds-whitesource
+    project-name: ccsdk-cds
+    jobs:
+      - gerrit-whitesource-scan
+    mvn-settings: 'ccsdk-cds-settings'
+    wss-product-name: ccsdk
+    mvn-clean-install: true
+    project: ccsdk/cds
+    branch: master

diff --git a/jjb/ccsdk/dashboard.yaml b/jjb/ccsdk/dashboard.yaml
index 8ee73ea..7ec5a89 100644 (file)
--- a/jjb/ccsdk/dashboard.yaml
+++ b/jjb/ccsdk/dashboard.yaml
@@ -7,13 +7,13 @@
       - '{project-name}-{stream}-merge-java'
       - gerrit-maven-stage:
           build-node: centos7-builder-4c-4g
+      - '{project-name}-gerrit-release-jobs':
+          build-node: centos7-builder-4c-4g
 
     project: 'ccsdk/dashboard'
     stream:
       - 'master':
           branch: 'master'
-      - 'dublin':
-          branch: 'dublin'
     mvn-settings: 'ccsdk-dashboard-settings'
     # due to a strange macro / variable translation problem this needs to be
     # passed as a string block to properly get the properties correctly defined
@@ -47,8 +47,16 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'dublin':
-          branch: 'dublin'
     mvn-settings: 'ccsdk-dashboard-settings'
     build-node: centos7-redis-4c-4g
 
+- project:
+    name: ccsdk-dashboard-whitesource
+    project-name: ccsdk-dashboard
+    jobs:
+      - gerrit-whitesource-scan
+    mvn-settings: 'ccsdk-dashboard-settings'
+    wss-product-name: ccsdk
+    mvn-clean-install: true
+    project: ccsdk/dashboard
+    branch: master

diff --git a/jjb/ccsdk/distribution.yaml b/jjb/ccsdk/distribution.yaml
index 90d232a..bc20a16 100644 (file)
--- a/jjb/ccsdk/distribution.yaml
+++ b/jjb/ccsdk/distribution.yaml
@@ -16,12 +16,12 @@
           mvn-params: '-Dmaven.test.skip=true -P docker'
           maven-version: "mvn35"
           maven-versions-plugin: true
+      - '{project-name}-gerrit-release-jobs':
+          build-node: centos7-builder-4c-4g
     project: 'ccsdk/distribution'
     stream:
       - 'master':
           branch: 'master'
-      - 'dublin':
-          branch: 'dublin'
     mvn-settings: 'ccsdk-distribution-settings'
     files: '**'
     archive-artifacts: ''
@@ -57,8 +57,6 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'dublin':
-          branch: 'dublin'
     mvn-settings: 'ccsdk-distribution-settings'
     build-node: ubuntu1604-docker-8c-8g
 

diff --git a/jjb/ccsdk/features.yaml b/jjb/ccsdk/features.yaml
index 4dcc3d4..79e6d14 100644 (file)
--- a/jjb/ccsdk/features.yaml
+++ b/jjb/ccsdk/features.yaml
@@ -8,13 +8,13 @@
       - gerrit-maven-stage:
           build-node: centos7-builder-4c-4g
           sign-artifacts: true
+      - '{project-name}-gerrit-release-jobs':
+          build-node: centos7-builder-4c-4g
 
     project: 'ccsdk/features'
     stream:
       - 'master':
           branch: 'master'
-      - 'dublin':
-          branch: 'dublin'
     mvn-settings: 'ccsdk-features-settings'
     # due to a strange macro / variable translation problem this needs to be
     # passed as a string block to properly get the properties correctly defined
@@ -50,8 +50,6 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'dublin':
-          branch: 'dublin'
     mvn-settings: 'ccsdk-features-settings'
     maven-version: "mvn35"
     build-node: ubuntu1604-builder-4c-4g
@@ -63,3 +61,14 @@
       - gerrit-info-yaml-verify
     project: ccsdk/features
     branch: master
+
+- project:
+    name: ccsdk-features-whitesource
+    project-name: ccsdk-features
+    jobs:
+      - gerrit-whitesource-scan
+    mvn-settings: 'ccsdk-features-settings'
+    wss-product-name: ccsdk
+    mvn-clean-install: true
+    project: ccsdk/features
+    branch: master

diff --git a/jjb/ccsdk/parent.yaml b/jjb/ccsdk/parent.yaml
index 8a79ebf..8c84e7c 100644 (file)
--- a/jjb/ccsdk/parent.yaml
+++ b/jjb/ccsdk/parent.yaml
@@ -8,13 +8,13 @@
       - gerrit-maven-stage:
           build-node: centos7-builder-4c-4g
           sign-artifacts: true
+      - '{project-name}-gerrit-release-jobs':
+          build-node: centos7-builder-4c-4g
 
     project: 'ccsdk/parent'
     stream:
       - 'master':
           branch: 'master'
-      - 'dublin':
-          branch: 'dublin'
     mvn-settings: 'ccsdk-parent-settings'
     # due to a strange macro / variable translation problem this needs to be
     # passed as a string block to properly get the properties correctly defined
@@ -35,8 +35,6 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'dublin':
-          branch: 'dublin'
     mvn-settings: 'ccsdk-parent-settings'
     maven-version: "mvn35"
     build-node: ubuntu1604-builder-4c-4g
@@ -49,3 +47,14 @@
       - gerrit-info-yaml-verify
     project: ccsdk/parent
     branch: master
+
+- project:
+    name: ccsdk-parent-whitesource
+    project-name: ccsdk-parent
+    jobs:
+      - gerrit-whitesource-scan
+    mvn-settings: 'ccsdk-parent-settings'
+    wss-product-name: ccsdk
+    mvn-clean-install: true
+    project: ccsdk/parent
+    branch: master

diff --git a/jjb/ccsdk/platform-plugins.yaml b/jjb/ccsdk/platform-plugins.yaml
index d8e75f0..e9b6ebd 100644 (file)
--- a/jjb/ccsdk/platform-plugins.yaml
+++ b/jjb/ccsdk/platform-plugins.yaml
@@ -8,13 +8,13 @@
       - gerrit-maven-stage:
           build-node: centos7-builder-4c-4g
           sign-artifacts: true
+      - '{project-name}-gerrit-release-jobs':
+          build-node: centos7-builder-4c-4g
 
     project: 'ccsdk/platform/plugins'
     stream:
       - 'master':
           branch: 'master'
-      - 'dublin':
-          branch: 'dublin'
     mvn-settings: 'ccsdk-platform-plugins-settings'
     # due to a strange macro / variable translation problem this needs to be
     # passed as a string block to properly get the properties correctly defined
@@ -48,8 +48,6 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'dublin':
-          branch: 'dublin'
     mvn-settings: 'ccsdk-platform-plugins-settings'
     build-node: centos7-redis-4c-4g
 
@@ -61,3 +59,14 @@
       - gerrit-info-yaml-verify
     project: ccsdk/platform/plugins
     branch: master
+
+- project:
+    name: ccsdk-platform-plugins-whitesource
+    project-name: ccsdk-platform-plugins
+    jobs:
+      - gerrit-whitesource-scan
+    mvn-settings: 'ccsdk-platform-plugins-settings'
+    wss-product-name: ccsdk
+    mvn-clean-install: true
+    project: ccsdk/platform/plugins
+    branch: master

diff --git a/jjb/ccsdk/sli-adaptors.yaml b/jjb/ccsdk/sli-adaptors.yaml
index 3161d18..86513bb 100644 (file)
--- a/jjb/ccsdk/sli-adaptors.yaml
+++ b/jjb/ccsdk/sli-adaptors.yaml
@@ -8,13 +8,13 @@
       - gerrit-maven-stage:
           build-node: centos7-builder-4c-4g
           sign-artifacts: true
+      - '{project-name}-gerrit-release-jobs':
+          build-node: centos7-builder-4c-4g
 
     project: 'ccsdk/sli/adaptors'
     stream:
       - 'master':
           branch: 'master'
-      - 'dublin':
-          branch: 'dublin'
     mvn-settings: 'ccsdk-sli-adaptors-settings'
     # due to a strange macro / variable translation problem this needs to be
     # passed as a string block to properly get the properties correctly defined
@@ -50,8 +50,6 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'dublin':
-          branch: 'dublin'
     mvn-settings: 'ccsdk-sli-adaptors-settings'
     maven-version: "mvn35"
     build-node: ubuntu1604-builder-4c-4g
@@ -64,3 +62,14 @@
       - gerrit-info-yaml-verify
     project: ccsdk/sli/adaptors
     branch: master
+
+- project:
+    name: ccsdk-sli-adaptors-whitesource
+    project-name: ccsdk-sli-adaptors
+    jobs:
+      - gerrit-whitesource-scan
+    mvn-settings: 'ccsdk-sli-adaptors-settings'
+    wss-product-name: ccsdk
+    mvn-clean-install: true
+    project: ccsdk/sli/adaptors
+    branch: master

diff --git a/jjb/ccsdk/sli-core.yaml b/jjb/ccsdk/sli-core.yaml
index 39904c3..6a36250 100644 (file)
--- a/jjb/ccsdk/sli-core.yaml
+++ b/jjb/ccsdk/sli-core.yaml
@@ -8,13 +8,13 @@
       - gerrit-maven-stage:
           build-node: centos7-builder-4c-4g
           sign-artifacts: true
+      - '{project-name}-gerrit-release-jobs':
+          build-node: centos7-builder-4c-4g
 
     project: 'ccsdk/sli/core'
     stream:
       - 'master':
           branch: 'master'
-      - 'dublin':
-          branch: 'dublin'
     mvn-settings: 'ccsdk-sli-core-settings'
     # due to a strange macro / variable translation problem this needs to be
     # passed as a string block to properly get the properties correctly defined
@@ -50,8 +50,6 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'dublin':
-          branch: 'dublin'
     mvn-settings: 'ccsdk-sli-core-settings'
     maven-version: "mvn35"
     build-node: ubuntu1604-builder-4c-4g
@@ -64,3 +62,14 @@
       - gerrit-info-yaml-verify
     project: ccsdk/sli/core
     branch: master
+
+- project:
+    name: ccsdk-sli-core-whitesource
+    project-name: ccsdk-sli-core
+    jobs:
+      - gerrit-whitesource-scan
+    mvn-settings: 'ccsdk-sli-core-settings'
+    wss-product-name: ccsdk
+    mvn-clean-install: true
+    project: ccsdk/sli/core
+    branch: master

diff --git a/jjb/ccsdk/sli-northbound.yaml b/jjb/ccsdk/sli-northbound.yaml
index 4019afd..7918ebe 100644 (file)
--- a/jjb/ccsdk/sli-northbound.yaml
+++ b/jjb/ccsdk/sli-northbound.yaml
@@ -7,14 +7,14 @@
       - '{project-name}-{stream}-merge-java'
       - gerrit-maven-stage:
           build-node: centos7-builder-4c-4g
+      - '{project-name}-gerrit-release-jobs':
+          build-node: centos7-builder-4c-4g
 
     sign-artifacts: true
     project: 'ccsdk/sli/northbound'
     stream:
       - 'master':
           branch: 'master'
-      - 'dublin':
-          branch: 'dublin'
     mvn-settings: 'ccsdk-sli-northbound-settings'
     # due to a strange macro / variable translation problem this needs to be
     # passed as a string block to properly get the properties correctly defined
@@ -50,8 +50,6 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'dublin':
-          branch: 'dublin'
     mvn-settings: 'ccsdk-sli-northbound-settings'
     maven-version: "mvn35"
     build-node: ubuntu1604-builder-4c-4g
@@ -64,3 +62,14 @@
       - gerrit-info-yaml-verify
     project: ccsdk/sli/northbound
     branch: master
+
+- project:
+    name: ccsdk-sli-northbound-whitesource
+    project-name: ccsdk-sli-northbound
+    jobs:
+      - gerrit-whitesource-scan
+    mvn-settings: 'ccsdk-sli-northbound-settings'
+    wss-product-name: ccsdk
+    mvn-clean-install: true
+    project: ccsdk/sli/northbound
+    branch: master

diff --git a/jjb/ccsdk/sli-plugins.yaml b/jjb/ccsdk/sli-plugins.yaml
index ca5deee..6f3c395 100644 (file)
--- a/jjb/ccsdk/sli-plugins.yaml
+++ b/jjb/ccsdk/sli-plugins.yaml
@@ -8,13 +8,13 @@
       - gerrit-maven-stage:
           build-node: centos7-builder-4c-4g
           sign-artifacts: true
+      - '{project-name}-gerrit-release-jobs':
+          build-node: centos7-builder-4c-4g
 
     project: 'ccsdk/sli/plugins'
     stream:
       - 'master':
           branch: 'master'
-      - 'dublin':
-          branch: 'dublin'
     mvn-settings: 'ccsdk-sli-plugins-settings'
     # due to a strange macro / variable translation problem this needs to be
     # passed as a string block to properly get the properties correctly defined
@@ -49,8 +49,6 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'dublin':
-          branch: 'dublin'
     mvn-settings: 'ccsdk-sli-plugins-settings'
     maven-version: "mvn35"
 
@@ -62,3 +60,14 @@
       - gerrit-info-yaml-verify
     project: ccsdk/sli/plugins
     branch: master
+
+- project:
+    name: ccsdk-sli-plugins-whitesource
+    project-name: ccsdk-sli-plugins
+    jobs:
+      - gerrit-whitesource-scan
+    mvn-settings: 'ccsdk-sli-plugins-settings'
+    wss-product-name: ccsdk
+    mvn-clean-install: true
+    project: ccsdk/sli/plugins
+    branch: master

diff --git a/jjb/ccsdk/utils.yaml b/jjb/ccsdk/utils.yaml
index 996a236..ca72bea 100644 (file)
--- a/jjb/ccsdk/utils.yaml
+++ b/jjb/ccsdk/utils.yaml
@@ -8,13 +8,13 @@
       - gerrit-maven-stage:
           build-node: centos7-builder-4c-4g
           sign-artifacts: true
+      - '{project-name}-gerrit-release-jobs':
+          build-node: centos7-builder-4c-4g
 
     project: 'ccsdk/utils'
     stream:
       - 'master':
           branch: 'master'
-      - 'dublin':
-          branch: 'dublin'
     mvn-settings: 'ccsdk-utils-settings'
     # due to a strange macro / variable translation problem this needs to be
     # passed as a string block to properly get the properties correctly defined
@@ -34,8 +34,6 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'dublin':
-          branch: 'dublin'
     mvn-settings: 'ccsdk-utils-settings'
 
 
@@ -46,3 +44,14 @@
       - gerrit-info-yaml-verify
     project: ccsdk/utils
     branch: master
+
+- project:
+    name: ccsdk-utils-whitesource
+    project-name: ccsdk-utils
+    jobs:
+      - gerrit-whitesource-scan
+    mvn-settings: 'ccsdk-utils-settings'
+    wss-product-name: ccsdk
+    mvn-clean-install: true
+    project: ccsdk/utils
+    branch: master

diff --git a/jjb/portal-sdk/portal-sdk.yaml b/jjb/portal-sdk/portal-sdk.yaml
index d77ea9f..ca0a873 100644 (file)
--- a/jjb/portal-sdk/portal-sdk.yaml
+++ b/jjb/portal-sdk/portal-sdk.yaml
@@ -16,8 +16,6 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'release-2.5.0':
-          branch: 'release-2.5.0'
     mvn-settings: 'portal-sdk-settings'
     files: '**'
     archive-artifacts: ''

diff --git a/jjb/portal/portal-docker.yaml b/jjb/portal/portal-docker.yaml
index d275d65..a45188d 100644 (file)
--- a/jjb/portal/portal-docker.yaml
+++ b/jjb/portal/portal-docker.yaml
@@ -17,8 +17,6 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'release-2.2.0':
-          branch: 'release-2.2.0'
     mvn-settings: 'portal-settings'
     files: '**'
     archive-artifacts: ''

diff --git a/jjb/portal/portal.yaml b/jjb/portal/portal.yaml
index ce944dd..95aca52 100644 (file)
--- a/jjb/portal/portal.yaml
+++ b/jjb/portal/portal.yaml
@@ -18,8 +18,6 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'release-2.2.0':
-          branch: 'release-2.2.0'
     mvn-settings: 'portal-settings'
     files: '**'
     archive-artifacts: ''

diff --git a/jjb/sdnc/sdnc-apps.yaml b/jjb/sdnc/sdnc-apps.yaml
index 8553eae..85efe1b 100644 (file)
--- a/jjb/sdnc/sdnc-apps.yaml
+++ b/jjb/sdnc/sdnc-apps.yaml
@@ -25,8 +25,6 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'dublin':
-          branch: 'dublin'
     mvn-settings: 'sdnc-apps-settings'
 
     # due to a strange macro / variable translation problem this needs to be
@@ -63,8 +61,6 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'dublin':
-          branch: 'dublin'
     mvn-settings: 'sdnc-apps-settings'
     files: '**'
     archive-artifacts: ''
@@ -98,8 +94,6 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'dublin':
-          branch: 'dublin'
     mvn-settings: 'sdnc-apps-settings'
 
 - project:

diff --git a/jjb/sdnc/sdnc-csit.yaml b/jjb/sdnc/sdnc-csit.yaml
index 285f0f0..dd76bd4 100644 (file)
--- a/jjb/sdnc/sdnc-csit.yaml
+++ b/jjb/sdnc/sdnc-csit.yaml
@@ -8,8 +8,6 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'dublin':
-          branch: 'dublin'
     functionality:
       - 'healthcheck':
           trigger_jobs: '{project-name}-{stream}-release-java-daily-checkstyle'

diff --git a/jjb/sdnc/sdnc-northbound.yaml b/jjb/sdnc/sdnc-northbound.yaml
index 6d626b8..9da5a83 100644 (file)
--- a/jjb/sdnc/sdnc-northbound.yaml
+++ b/jjb/sdnc/sdnc-northbound.yaml
@@ -13,8 +13,6 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'dublin':
-          branch: 'dublin'
     mvn-settings: 'sdnc-northbound-settings'
 
     # due to a strange macro / variable translation problem this needs to be
@@ -50,8 +48,6 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'dublin':
-          branch: 'dublin'
     mvn-settings: 'sdnc-northbound-settings'
 
 - project:

diff --git a/jjb/sdnc/sdnc-oam.yaml b/jjb/sdnc/sdnc-oam.yaml
index cdb0ba6..56b6863 100644 (file)
--- a/jjb/sdnc/sdnc-oam.yaml
+++ b/jjb/sdnc/sdnc-oam.yaml
@@ -21,8 +21,6 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'dublin':
-          branch: 'dublin'
     mvn-settings: 'sdnc-oam-settings'
     files: '**'
     archive-artifacts: ''
@@ -40,8 +38,6 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'dublin':
-          branch: 'dublin'
     mvn-settings: 'sdnc-oam-settings'
     files: '**'
     archive-artifacts: ''
@@ -75,8 +71,6 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'dublin':
-          branch: 'dublin'
     mvn-settings: 'sdnc-oam-settings'
 
 - project:

diff --git a/shell/maven-coverity.sh b/shell/maven-coverity.sh
index 22a42c2..f263963 100644 (file)
--- a/shell/maven-coverity.sh
+++ b/shell/maven-coverity.sh
@@ -19,6 +19,9 @@ PS4='+['$(readlink -f "$0")' ${FUNCNAME[0]%main}#$LINENO] '
 
 echo '---> maven-coverity.sh'
 
+SUBMISSION_ATTEMPTS=5
+SUBMISSION_INITIAL_REST_INTERVAL=30 # seconds, will be doubled after each attempt
+
 #-----------------------------------------------------------------------------
 # Process parameters for JS/PHP/Ruby files analysis
 
@@ -148,18 +151,36 @@ tar \
   --file='results.tgz' \
   'cov-int'
 
-curl \
-  --verbose \
-  --silent \
-  --show-error \
-  --fail \
-  --form "project=${COVERITY_PROJECT_NAME}" \
-  --form "email=${COVERITY_USER_EMAIL}" \
-  --form "token=${COVERITY_TOKEN}" \
-  --form 'file=@results.tgz' \
-  --form "version=${GIT_COMMIT:0:7}" \
-  --form "description=${GIT_BRANCH}" \
-  'https://scan.coverity.com/builds'
+for (( ATTEMPT=1; ATTEMPT<=SUBMISSION_ATTEMPTS; ATTEMPT++ )); do
+  CURL_OUTPUT=$(
+    curl \
+      --verbose \
+      --silent \
+      --show-error \
+      --fail \
+      --write-out '\n%{http_code}' \
+      --form "project=${COVERITY_PROJECT_NAME}" \
+      --form "email=${COVERITY_USER_EMAIL}" \
+      --form "token=${COVERITY_TOKEN}" \
+      --form 'file=@results.tgz' \
+      --form "version=${GIT_COMMIT:0:7}" \
+      --form "description=${GIT_BRANCH}" \
+      'https://scan.coverity.com/builds'
+  )
+  HTTP_RESPONSE_CODE=$(echo -n "${CURL_OUTPUT}" | tail -1)
+  test x"${HTTP_RESPONSE_CODE}" = x"200" \
+    && break
+
+  sleep "${SUBMISSION_REST_INTERVAL:-$SUBMISSION_INITIAL_REST_INTERVAL}"
+
+  SUBMISSION_REST_INTERVAL=$(( ${SUBMISSION_REST_INTERVAL:-$SUBMISSION_INITIAL_REST_INTERVAL} * 2 ))
+done
+
+HTTP_RESPONSE=$(echo -n "${CURL_OUTPUT}" | head -n -1 | tr -d '\n')
+if [ x"${HTTP_RESPONSE}" != x"Build successfully submitted." ]; then
+  echo "Coverity Scan service responded with '${HTTP_RESPONSE}' while 'Build successfully submitted.' expected." >&2
+  exit 1
+fi
 
 #-----------------------------------------------------------------------------