summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
m---------global-jjb0
-rw-r--r--jjb/ccsdk/apps.yaml3
-rw-r--r--jjb/ccsdk/cds.yaml3
-rw-r--r--jjb/ccsdk/dashboard.yaml3
-rw-r--r--jjb/ccsdk/distribution.yaml3
-rw-r--r--jjb/ccsdk/features.yaml2
-rw-r--r--jjb/ccsdk/parent.yaml3
-rw-r--r--jjb/ccsdk/platform-plugins.yaml3
-rw-r--r--jjb/ccsdk/sli-adaptors.yaml3
-rw-r--r--jjb/ccsdk/sli-core.yaml3
-rw-r--r--jjb/ccsdk/sli-northbound.yaml3
-rw-r--r--jjb/ccsdk/sli-plugins.yaml3
-rw-r--r--jjb/ccsdk/utils.yaml3
-rw-r--r--jjb/portal-sdk/portal-sdk.yaml2
-rw-r--r--jjb/portal/portal-docker.yaml2
-rw-r--r--jjb/portal/portal.yaml2
-rw-r--r--shell/maven-coverity.sh45
17 files changed, 57 insertions, 29 deletions
diff --git a/global-jjb b/global-jjb
-Subproject 545231d5a9f5da4f59ac2bb9601a9bfb9ee45f8
+Subproject 8dcb2644580bc202933cded58875733793ac760
diff --git a/jjb/ccsdk/apps.yaml b/jjb/ccsdk/apps.yaml
index 22c143f69..89eb16c27 100644
--- a/jjb/ccsdk/apps.yaml
+++ b/jjb/ccsdk/apps.yaml
@@ -20,7 +20,8 @@
container-staging-registry: 'nexus3.onap.org:10003'
mvn-params: '-Dmaven.test.skip=true -P docker'
maven-version: "mvn35"
- - '{project-name}-gerrit-release-jobs'
+ - '{project-name}-gerrit-release-jobs':
+ build-node: centos7-builder-4c-4g
project: 'ccsdk/apps'
stream:
diff --git a/jjb/ccsdk/cds.yaml b/jjb/ccsdk/cds.yaml
index 9d55da2f5..8aab71f8e 100644
--- a/jjb/ccsdk/cds.yaml
+++ b/jjb/ccsdk/cds.yaml
@@ -16,7 +16,8 @@
mvn-params: '-Dmaven.test.skip=true -P docker'
maven-version: "mvn35"
maven-versions-plugin: true
- - '{project-name}-gerrit-release-jobs'
+ - '{project-name}-gerrit-release-jobs':
+ build-node: centos7-builder-4c-4g
project: 'ccsdk/cds'
stream:
diff --git a/jjb/ccsdk/dashboard.yaml b/jjb/ccsdk/dashboard.yaml
index c2b2a5318..7ec5a8970 100644
--- a/jjb/ccsdk/dashboard.yaml
+++ b/jjb/ccsdk/dashboard.yaml
@@ -7,7 +7,8 @@
- '{project-name}-{stream}-merge-java'
- gerrit-maven-stage:
build-node: centos7-builder-4c-4g
- - '{project-name}-gerrit-release-jobs'
+ - '{project-name}-gerrit-release-jobs':
+ build-node: centos7-builder-4c-4g
project: 'ccsdk/dashboard'
stream:
diff --git a/jjb/ccsdk/distribution.yaml b/jjb/ccsdk/distribution.yaml
index cd68bbef9..bc20a163f 100644
--- a/jjb/ccsdk/distribution.yaml
+++ b/jjb/ccsdk/distribution.yaml
@@ -16,7 +16,8 @@
mvn-params: '-Dmaven.test.skip=true -P docker'
maven-version: "mvn35"
maven-versions-plugin: true
- - '{project-name}-gerrit-release-jobs'
+ - '{project-name}-gerrit-release-jobs':
+ build-node: centos7-builder-4c-4g
project: 'ccsdk/distribution'
stream:
- 'master':
diff --git a/jjb/ccsdk/features.yaml b/jjb/ccsdk/features.yaml
index df57b7731..79e6d1430 100644
--- a/jjb/ccsdk/features.yaml
+++ b/jjb/ccsdk/features.yaml
@@ -8,6 +8,8 @@
- 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:
diff --git a/jjb/ccsdk/parent.yaml b/jjb/ccsdk/parent.yaml
index 7cd5502b1..8c84e7c8d 100644
--- a/jjb/ccsdk/parent.yaml
+++ b/jjb/ccsdk/parent.yaml
@@ -8,7 +8,8 @@
- gerrit-maven-stage:
build-node: centos7-builder-4c-4g
sign-artifacts: true
- - '{project-name}-gerrit-release-jobs'
+ - '{project-name}-gerrit-release-jobs':
+ build-node: centos7-builder-4c-4g
project: 'ccsdk/parent'
stream:
diff --git a/jjb/ccsdk/platform-plugins.yaml b/jjb/ccsdk/platform-plugins.yaml
index 67058a717..e9b6ebd1e 100644
--- a/jjb/ccsdk/platform-plugins.yaml
+++ b/jjb/ccsdk/platform-plugins.yaml
@@ -8,7 +8,8 @@
- gerrit-maven-stage:
build-node: centos7-builder-4c-4g
sign-artifacts: true
- - '{project-name}-gerrit-release-jobs'
+ - '{project-name}-gerrit-release-jobs':
+ build-node: centos7-builder-4c-4g
project: 'ccsdk/platform/plugins'
stream:
diff --git a/jjb/ccsdk/sli-adaptors.yaml b/jjb/ccsdk/sli-adaptors.yaml
index 69a8aec6b..86513bbb3 100644
--- a/jjb/ccsdk/sli-adaptors.yaml
+++ b/jjb/ccsdk/sli-adaptors.yaml
@@ -8,7 +8,8 @@
- gerrit-maven-stage:
build-node: centos7-builder-4c-4g
sign-artifacts: true
- - '{project-name}-gerrit-release-jobs'
+ - '{project-name}-gerrit-release-jobs':
+ build-node: centos7-builder-4c-4g
project: 'ccsdk/sli/adaptors'
stream:
diff --git a/jjb/ccsdk/sli-core.yaml b/jjb/ccsdk/sli-core.yaml
index 71c2ef0f5..6a3625061 100644
--- a/jjb/ccsdk/sli-core.yaml
+++ b/jjb/ccsdk/sli-core.yaml
@@ -8,7 +8,8 @@
- gerrit-maven-stage:
build-node: centos7-builder-4c-4g
sign-artifacts: true
- - '{project-name}-gerrit-release-jobs'
+ - '{project-name}-gerrit-release-jobs':
+ build-node: centos7-builder-4c-4g
project: 'ccsdk/sli/core'
stream:
diff --git a/jjb/ccsdk/sli-northbound.yaml b/jjb/ccsdk/sli-northbound.yaml
index 0de31a95f..7918ebe05 100644
--- a/jjb/ccsdk/sli-northbound.yaml
+++ b/jjb/ccsdk/sli-northbound.yaml
@@ -7,7 +7,8 @@
- '{project-name}-{stream}-merge-java'
- gerrit-maven-stage:
build-node: centos7-builder-4c-4g
- - '{project-name}-gerrit-release-jobs'
+ - '{project-name}-gerrit-release-jobs':
+ build-node: centos7-builder-4c-4g
sign-artifacts: true
project: 'ccsdk/sli/northbound'
diff --git a/jjb/ccsdk/sli-plugins.yaml b/jjb/ccsdk/sli-plugins.yaml
index 089016a71..6f3c39519 100644
--- a/jjb/ccsdk/sli-plugins.yaml
+++ b/jjb/ccsdk/sli-plugins.yaml
@@ -8,7 +8,8 @@
- gerrit-maven-stage:
build-node: centos7-builder-4c-4g
sign-artifacts: true
- - '{project-name}-gerrit-release-jobs'
+ - '{project-name}-gerrit-release-jobs':
+ build-node: centos7-builder-4c-4g
project: 'ccsdk/sli/plugins'
stream:
diff --git a/jjb/ccsdk/utils.yaml b/jjb/ccsdk/utils.yaml
index 6a92218d6..ca72bea15 100644
--- a/jjb/ccsdk/utils.yaml
+++ b/jjb/ccsdk/utils.yaml
@@ -8,7 +8,8 @@
- gerrit-maven-stage:
build-node: centos7-builder-4c-4g
sign-artifacts: true
- - '{project-name}-gerrit-release-jobs'
+ - '{project-name}-gerrit-release-jobs':
+ build-node: centos7-builder-4c-4g
project: 'ccsdk/utils'
stream:
diff --git a/jjb/portal-sdk/portal-sdk.yaml b/jjb/portal-sdk/portal-sdk.yaml
index d77ea9fe0..ca0a873a4 100644
--- 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 d275d6536..a45188d52 100644
--- 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 ce944dd9e..95aca522e 100644
--- 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/shell/maven-coverity.sh b/shell/maven-coverity.sh
index 22a42c2d5..f263963fe 100644
--- 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
#-----------------------------------------------------------------------------