Merge "Migrate to gerrit-maven-stage (SO)"
diff --git a/jjb/aai/aai-babel.yaml b/jjb/aai/aai-babel.yaml
index 86e587d..dfda527 100644
--- a/jjb/aai/aai-babel.yaml
+++ b/jjb/aai/aai-babel.yaml
@@ -11,11 +11,16 @@
jobs:
- '{project-name}-{stream}-verify-java'
- '{project-name}-{stream}-merge-java'
- - '{project-name}-{stream}-release-version-java-daily'
- - '{project-name}-{stream}-aai-docker-java-daily':
- pom: 'pom.xml'
- mvn-goals: 'docker:build'
+ - gerrit-maven-stage:
+ sign-artifacts: true
+ build-node: centos7-builder-4c-4g
+ maven-versions-plugin: true
+ - gerrit-maven-docker-stage:
+ mvn-params: 'docker:build -B -Dmaven.test.skip=true -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn'
build-node: ubuntu1604-docker-8c-8g
+ container-public-registry: 'nexus3.onap.org:10001'
+ container-staging-registry: 'nexus3.onap.org:10003'
+
project: 'aai/babel'
stream:
- 'dublin':
diff --git a/jjb/aai/aai-schema-service.yaml b/jjb/aai/aai-schema-service.yaml
index 6868acf..20aea93 100644
--- a/jjb/aai/aai-schema-service.yaml
+++ b/jjb/aai/aai-schema-service.yaml
@@ -11,12 +11,16 @@
jobs:
- '{project-name}-{stream}-verify-java'
- '{project-name}-{stream}-merge-java'
- - '{project-name}-{stream}-release-version-java-daily'
- - '{project-name}-{stream}-docker-java-daily':
- docker-pom: 'aai-schema-service/pom.xml'
- mvn-profile: 'docker'
- mvn-params: '-Dmaven.test.skip=true'
+ - gerrit-maven-stage:
+ sign-artifacts: true
+ build-node: centos7-builder-4c-4g
+ maven-versions-plugin: true
+ - gerrit-maven-docker-stage:
+ mvn-params: '-P docker -Dmaven.test.skip=true'
build-node: ubuntu1604-docker-8c-8g
+ container-public-registry: 'nexus3.onap.org:10001'
+ container-staging-registry: 'nexus3.onap.org:10003'
+
project: 'aai/schema-service'
stream:
- 'master':
diff --git a/jjb/ci-management/ci-management-coverity.yaml b/jjb/ci-management/ci-management-coverity.yaml
index ba37d57..83bdffc 100644
--- a/jjb/ci-management/ci-management-coverity.yaml
+++ b/jjb/ci-management/ci-management-coverity.yaml
@@ -38,18 +38,20 @@
coverity-project-name: ''
coverity-token: ''
coverity-user-email: ''
+ coverity-search-paths: ''
+ coverity-search-exclude-regexs: ''
stream: master
submodule-recursive: true
submodule-timeout: 10
submodule-disable: false
archive-artifacts: >
**/*.log
+ **/*-log.txt
**/hs_err_*.log
**/target/**/feature.xml
**/target/failsafe-reports/failsafe-summary.xml
**/target/surefire-reports/*-output.txt
**/cov-int/BUILD.metrics.xml
- **/cov-int/build-log.txt
**/cov-int/build-timings.txt
**/cov-int/java-security-da-whitelist.dat
@@ -93,6 +95,8 @@
COVERITY_PROJECT_NAME={coverity-project-name}
COVERITY_TOKEN={coverity-token}
COVERITY_USER_EMAIL={coverity-user-email}
+ SEARCH_PATHS={coverity-search-paths}
+ SEARCH_EXCLUDE_REGEXS={coverity-search-exclude-regexs}
- shell: !include-raw-escape:
- ../../global-jjb/shell/common-variables.sh
- ../../shell/maven-coverity.sh
diff --git a/jjb/dmaap/dmaap-kafka-docker.yaml b/jjb/dmaap/dmaap-kafka-docker.yaml
index b6a9ac7..ba433f7 100644
--- a/jjb/dmaap/dmaap-kafka-docker.yaml
+++ b/jjb/dmaap/dmaap-kafka-docker.yaml
@@ -8,6 +8,12 @@
mvn-params: '-Dmaven.test.skip=true'
- '{project-name}-{stream}-docker-java-daily':
mvn-params: '-Dmaven.test.skip=true'
+ - gerrit-maven-docker-stage:
+ build-node: ubuntu1604-docker-8c-8g
+ maven-versions-plugin: true
+ mvn-goals: '-Dmaven.test.skip=true'
+ container-public-registry: 'nexus3.onap.org:10001'
+ container-staging-registry: 'nexus3.onap.org:10003'
project: 'dmaap/kafka11aaf'
stream:
- 'master':
diff --git a/jjb/dmaap/dmaap-kafka.yaml b/jjb/dmaap/dmaap-kafka.yaml
index 7b1573c..85c5f74 100644
--- a/jjb/dmaap/dmaap-kafka.yaml
+++ b/jjb/dmaap/dmaap-kafka.yaml
@@ -5,6 +5,10 @@
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: 'dmaap/kafka11aaf'
stream:
- 'master':
diff --git a/jjb/dmaap/dmaap-messagerouter-docker.yaml b/jjb/dmaap/dmaap-messagerouter-docker.yaml
index f2cf27a..30d6866 100644
--- a/jjb/dmaap/dmaap-messagerouter-docker.yaml
+++ b/jjb/dmaap/dmaap-messagerouter-docker.yaml
@@ -8,6 +8,12 @@
mvn-params: '-Dmaven.test.skip=true'
- '{project-name}-{stream}-docker-java-daily':
mvn-params: '-Dmaven.test.skip=true'
+ - gerrit-maven-docker-stage:
+ build-node: ubuntu1604-docker-8c-8g
+ mvn-goals: '-Dmaven.test.skip=true'
+ maven-versions-plugin: true
+ container-public-registry: 'nexus3.onap.org:10001'
+ container-staging-registry: 'nexus3.onap.org:10003'
project: 'dmaap/messagerouter/messageservice'
stream:
- 'master':
diff --git a/jjb/dmaap/dmaap-zookeeper.yaml b/jjb/dmaap/dmaap-zookeeper.yaml
index de9855c..77416d1 100644
--- a/jjb/dmaap/dmaap-zookeeper.yaml
+++ b/jjb/dmaap/dmaap-zookeeper.yaml
@@ -18,6 +18,12 @@
mvn-params: '-Dmaven.test.skip=true'
- '{project-name}-{stream}-docker-java-daily':
mvn-params: '-Dmaven.test.skip=true'
+ - gerrit-maven-docker-stage:
+ build-node: ubuntu1604-docker-8c-8g
+ mvn-goals: '-Dmaven.test.skip=true'
+ maven-versions-plugin: true
+ container-public-registry: 'nexus3.onap.org:10001'
+ container-staging-registry: 'nexus3.onap.org:10003'
project: 'dmaap/zookeeper'
stream:
- 'master':
diff --git a/jjb/msb/msb-apigateway.yaml b/jjb/msb/msb-apigateway.yaml
index 7529485..495b3cc 100644
--- a/jjb/msb/msb-apigateway.yaml
+++ b/jjb/msb/msb-apigateway.yaml
@@ -11,6 +11,10 @@
jobs:
- '{project-name}-{stream}-verify-java'
- '{project-name}-{stream}-merge-java'
+ - gerrit-maven-stage:
+ sign-artifacts: true
+ build-node: centos7-builder-4c-4g
+ maven-versions-plugin: true
- '{project-name}-{stream}-release-version-java-daily'
- '{project-name}-{stream}-docker-java-version-shell-daily':
docker-pom: 'pom.xml'
diff --git a/jjb/msb/msb-discovery.yaml b/jjb/msb/msb-discovery.yaml
index fe84a2c..054016d 100644
--- a/jjb/msb/msb-discovery.yaml
+++ b/jjb/msb/msb-discovery.yaml
@@ -5,6 +5,10 @@
jobs:
- '{project-name}-{stream}-verify-java'
- '{project-name}-{stream}-merge-java'
+ - gerrit-maven-stage:
+ sign-artifacts: true
+ build-node: centos7-builder-4c-4g
+ maven-versions-plugin: true
- '{project-name}-{stream}-release-version-java-daily'
- '{project-name}-{stream}-docker-java-version-shell-daily':
docker-pom: 'pom.xml'
diff --git a/jjb/msb/msb-java-sdk.yaml b/jjb/msb/msb-java-sdk.yaml
index 5394ba1..5df6d07 100644
--- a/jjb/msb/msb-java-sdk.yaml
+++ b/jjb/msb/msb-java-sdk.yaml
@@ -5,6 +5,10 @@
jobs:
- '{project-name}-{stream}-verify-java'
- '{project-name}-{stream}-merge-java'
+ - gerrit-maven-stage:
+ sign-artifacts: true
+ build-node: centos7-builder-4c-4g
+ maven-versions-plugin: true
- '{project-name}-{stream}-release-version-java-daily'
project: 'msb/java-sdk'
stream:
diff --git a/jjb/msb/msb-swagger-sdk.yaml b/jjb/msb/msb-swagger-sdk.yaml
index 732d618..8cfdbd4 100644
--- a/jjb/msb/msb-swagger-sdk.yaml
+++ b/jjb/msb/msb-swagger-sdk.yaml
@@ -5,6 +5,10 @@
jobs:
- '{project-name}-{stream}-verify-java'
- '{project-name}-{stream}-merge-java'
+ - gerrit-maven-stage:
+ sign-artifacts: true
+ build-node: centos7-builder-4c-4g
+ maven-versions-plugin: true
- '{project-name}-{stream}-release-version-java-daily'
project: 'msb/swagger-sdk'
stream:
diff --git a/jjb/policy/policy-docker-base-common.yaml b/jjb/policy/policy-docker-base-common.yaml
index 6775406..0e77931 100644
--- a/jjb/policy/policy-docker-base-common.yaml
+++ b/jjb/policy/policy-docker-base-common.yaml
@@ -9,12 +9,12 @@
mvn-profile: 'docker'
mvn-params: "-P docker"
build-node: ubuntu1604-docker-8c-8g
- - '{project-name}-{stream}-docker-version-java-daily':
- docker-pom: 'pom.xml'
- mvn-profile: 'docker'
- mvn-params: '-P docker'
- disabled: true
+ - gerrit-maven-docker-stage:
build-node: ubuntu1604-docker-8c-8g
+ maven-versions-plugin: true
+ mvn-params: '-P docker -Dmaven.test.skip=true'
+ container-public-registry: 'nexus3.onap.org:10001'
+ container-staging-registry: 'nexus3.onap.org:10003'
project: 'policy/docker'
stream:
- 'master':
diff --git a/packer/provision/local-docker.yaml b/packer/provision/local-docker.yaml
index 1c5ec18..d38ff8f 100644
--- a/packer/provision/local-docker.yaml
+++ b/packer/provision/local-docker.yaml
@@ -152,7 +152,7 @@
- name: Install Erlang
apt:
- deb: https://packages.erlang-solutions.com/erlang/esl-erlang/FLAVOUR_1_general/esl-erlang_19.3.6-1~ubuntu~trusty_amd64.deb
+ deb: https://packages.erlang-solutions.com/erlang/debian/pool/esl-erlang_19.3.6-1~ubuntu~trusty_amd64.deb
become: true
when: ansible_architecture == 'x86_64' and ansible_distribution == 'Ubuntu'
diff --git a/shell/maven-coverity.sh b/shell/maven-coverity.sh
index 17601d4..22a42c2 100644
--- a/shell/maven-coverity.sh
+++ b/shell/maven-coverity.sh
@@ -20,6 +20,25 @@
echo '---> maven-coverity.sh'
#-----------------------------------------------------------------------------
+# Process parameters for JS/PHP/Ruby files analysis
+
+FS_CAPTURE_SEARCH_PARAMS=''
+if [ -n "${SEARCH_PATHS:=}" ]; then
+ for SEARCH_PATH in ${SEARCH_PATHS}; do
+ if [ -d "${SEARCH_PATH}" ]; then
+ FS_CAPTURE_SEARCH_PARAMS="${FS_CAPTURE_SEARCH_PARAMS} --fs-capture-search '${SEARCH_PATH}'"
+ else
+ echo "'${SEARCH_PATH}' from \$SEARCH_PATHS is not an existing directory." >&2
+ exit 1
+ fi
+ done
+fi
+
+for EXCLUDE_REGEX in ${SEARCH_EXCLUDE_REGEXS:=}; do
+ FS_CAPTURE_SEARCH_PARAMS="${FS_CAPTURE_SEARCH_PARAMS} --fs-capture-search-exclude-regex '${EXCLUDE_REGEX}'"
+done
+
+#-----------------------------------------------------------------------------
# Check if we are allowed to submit results to Coverity Scan service
# and have not exceeded our upload quota limits
# See also: https://scan.coverity.com/faq#frequency
@@ -96,8 +115,9 @@
export MAVEN_OPTS
-cov-build \
+eval cov-build \
--dir 'cov-int' \
+ ${FS_CAPTURE_SEARCH_PARAMS} \
"${MVN}" clean install \
--errors \
--global-settings "${GLOBAL_SETTINGS_FILE}" \