summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--jjb/ccsdk/apps.yaml2
-rw-r--r--jjb/ccsdk/ccsdk-oran.yaml2
-rw-r--r--jjb/ccsdk/cds.yaml2
-rw-r--r--jjb/ccsdk/distribution.yaml2
-rw-r--r--jjb/ccsdk/features.yaml2
-rw-r--r--jjb/ccsdk/parent.yaml2
-rw-r--r--jjb/ccsdk/sli.yaml2
-rw-r--r--jjb/cps/cps-ncmp-dmi-plugin.yaml2
-rw-r--r--jjb/cps/cps.yaml2
-rw-r--r--jjb/dmaap/dmaap-buscontroller.yaml4
-rw-r--r--jjb/dmaap/dmaap-datarouter.yaml4
-rw-r--r--jjb/dmaap/dmaap-messagerouter-dmaapclient.yaml4
-rw-r--r--jjb/dmaap/dmaap-messagerouter-messageservice.yaml4
-rw-r--r--jjb/sdnc/sdnc-apps.yaml2
-rw-r--r--jjb/sdnc/sdnc-northbound.yaml2
-rw-r--r--jjb/sdnc/sdnc-oam.yaml2
-rwxr-xr-xshell/onap-gerrit-review-wrapper.sh15
17 files changed, 31 insertions, 24 deletions
diff --git a/jjb/ccsdk/apps.yaml b/jjb/ccsdk/apps.yaml
index ab933262a..d830dc555 100644
--- a/jjb/ccsdk/apps.yaml
+++ b/jjb/ccsdk/apps.yaml
@@ -19,7 +19,7 @@
sign-artifacts: true
mvn-params: '-Dmaven.test.skip=true'
cron: ''
- sbom-generator: true
+ sbom-generator: false
- gerrit-maven-docker-stage:
container-public-registry: 'nexus3.onap.org:10001'
diff --git a/jjb/ccsdk/ccsdk-oran.yaml b/jjb/ccsdk/ccsdk-oran.yaml
index 75c02d9e1..74b88cc56 100644
--- a/jjb/ccsdk/ccsdk-oran.yaml
+++ b/jjb/ccsdk/ccsdk-oran.yaml
@@ -14,7 +14,7 @@
mvn-params: '-Dmaven.test.skip=true'
mvn-opts: '-Ddocker.skip=true'
cron: ''
- sbom-generator: true
+ sbom-generator: false
- gerrit-maven-docker-stage:
build-node: centos7-docker-8c-8g
container-public-registry: 'nexus3.onap.org:10001'
diff --git a/jjb/ccsdk/cds.yaml b/jjb/ccsdk/cds.yaml
index 2646caff1..ea5066e09 100644
--- a/jjb/ccsdk/cds.yaml
+++ b/jjb/ccsdk/cds.yaml
@@ -13,7 +13,7 @@
sign-artifacts: true
mvn-params: '-Dmaven.test.skip=true'
cron: ''
- sbom-generator: true
+ sbom-generator: false
- gerrit-maven-docker-stage:
container-public-registry: 'nexus3.onap.org:10001'
container-staging-registry: 'nexus3.onap.org:10003'
diff --git a/jjb/ccsdk/distribution.yaml b/jjb/ccsdk/distribution.yaml
index a119eb2a4..c47f21e0f 100644
--- a/jjb/ccsdk/distribution.yaml
+++ b/jjb/ccsdk/distribution.yaml
@@ -14,7 +14,7 @@
mvn-params: '-Dmaven.test.skip=true'
maven-versions-plugin: true
cron: ''
- sbom-generator: true
+ sbom-generator: false
- gerrit-maven-docker-stage:
build-node: centos7-docker-8c-8g
container-public-registry: 'nexus3.onap.org:10001'
diff --git a/jjb/ccsdk/features.yaml b/jjb/ccsdk/features.yaml
index 7ffdc36a5..40e5a8ed7 100644
--- a/jjb/ccsdk/features.yaml
+++ b/jjb/ccsdk/features.yaml
@@ -13,7 +13,7 @@
sign-artifacts: true
mvn-params: '-Dmaven.test.skip=true'
cron: ''
- sbom-generator: true
+ sbom-generator: false
- '{project-name}-gerrit-release-jobs':
build-node: centos7-docker-8c-8g
diff --git a/jjb/ccsdk/parent.yaml b/jjb/ccsdk/parent.yaml
index bbc8e2bc7..0673e149c 100644
--- a/jjb/ccsdk/parent.yaml
+++ b/jjb/ccsdk/parent.yaml
@@ -13,7 +13,7 @@
sign-artifacts: true
mvn-params: '-Dmaven.test.skip=true'
cron: ''
- sbom-generator: true
+ sbom-generator: false
- '{project-name}-gerrit-release-jobs':
build-node: centos7-docker-8c-8g
diff --git a/jjb/ccsdk/sli.yaml b/jjb/ccsdk/sli.yaml
index 26145f96b..fff889093 100644
--- a/jjb/ccsdk/sli.yaml
+++ b/jjb/ccsdk/sli.yaml
@@ -13,7 +13,7 @@
sign-artifacts: true
mvn-params: '-Dmaven.test.skip=true'
cron: ''
- sbom-generator: true
+ sbom-generator: false
- '{project-name}-gerrit-release-jobs':
build-node: centos7-docker-8c-8g
diff --git a/jjb/cps/cps-ncmp-dmi-plugin.yaml b/jjb/cps/cps-ncmp-dmi-plugin.yaml
index edf6e3b1f..163324172 100644
--- a/jjb/cps/cps-ncmp-dmi-plugin.yaml
+++ b/jjb/cps/cps-ncmp-dmi-plugin.yaml
@@ -30,7 +30,7 @@
sign-artifacts: true
build-node: centos7-docker-8c-8g
maven-versions-plugin: true
- sbom-generator: true
+ sbom-generator: false
- gerrit-maven-docker-stage:
build-node: centos7-docker-8c-8g
maven-versions-plugin: true
diff --git a/jjb/cps/cps.yaml b/jjb/cps/cps.yaml
index d242d463f..6d7a3b96e 100644
--- a/jjb/cps/cps.yaml
+++ b/jjb/cps/cps.yaml
@@ -43,7 +43,7 @@
sign-artifacts: true
build-node: centos7-docker-8c-8g
maven-versions-plugin: true
- sbom-generator: true
+ sbom-generator: false
- gerrit-maven-docker-stage:
build-node: centos7-docker-8c-8g
maven-versions-plugin: true
diff --git a/jjb/dmaap/dmaap-buscontroller.yaml b/jjb/dmaap/dmaap-buscontroller.yaml
index b74439e86..6eee94392 100644
--- a/jjb/dmaap/dmaap-buscontroller.yaml
+++ b/jjb/dmaap/dmaap-buscontroller.yaml
@@ -22,8 +22,8 @@
stream:
- 'master':
branch: 'master'
- - 'jakarta':
- branch: 'jakarta'
+ - 'kohn':
+ branch: 'kohn'
mvn-settings: 'dmaap-buscontroller-settings'
files: '**'
archive-artifacts: ''
diff --git a/jjb/dmaap/dmaap-datarouter.yaml b/jjb/dmaap/dmaap-datarouter.yaml
index 530a7b2a7..f325ed1f7 100644
--- a/jjb/dmaap/dmaap-datarouter.yaml
+++ b/jjb/dmaap/dmaap-datarouter.yaml
@@ -17,8 +17,8 @@
stream:
- 'master':
branch: 'master'
- - 'jakarta':
- branch: 'jakarta'
+ - 'kohn':
+ branch: 'kohn'
mvn-settings: 'dmaap-datarouter-settings'
files: '**'
archive-artifacts: ''
diff --git a/jjb/dmaap/dmaap-messagerouter-dmaapclient.yaml b/jjb/dmaap/dmaap-messagerouter-dmaapclient.yaml
index 34fe57b47..0ac9a220d 100644
--- a/jjb/dmaap/dmaap-messagerouter-dmaapclient.yaml
+++ b/jjb/dmaap/dmaap-messagerouter-dmaapclient.yaml
@@ -15,8 +15,8 @@
stream:
- 'master':
branch: 'master'
- - 'jakarta':
- branch: 'jakarta'
+ - 'kohn':
+ branch: 'kohn'
mvn-settings: 'dmaap-messagerouter-dmaapclient-settings'
files: '**'
archive-artifacts: ''
diff --git a/jjb/dmaap/dmaap-messagerouter-messageservice.yaml b/jjb/dmaap/dmaap-messagerouter-messageservice.yaml
index a6796663c..c3755defa 100644
--- a/jjb/dmaap/dmaap-messagerouter-messageservice.yaml
+++ b/jjb/dmaap/dmaap-messagerouter-messageservice.yaml
@@ -17,8 +17,8 @@
stream:
- 'master':
branch: 'master'
- - 'jakarta':
- branch: 'jakarta'
+ - 'kohn':
+ branch: 'kohn'
mvn-settings: 'dmaap-messagerouter-messageservice-settings'
java-version: openjdk11
files: '**'
diff --git a/jjb/sdnc/sdnc-apps.yaml b/jjb/sdnc/sdnc-apps.yaml
index 85d4e78c5..5cdbeb3e3 100644
--- a/jjb/sdnc/sdnc-apps.yaml
+++ b/jjb/sdnc/sdnc-apps.yaml
@@ -22,7 +22,7 @@
sign-artifacts: true
mvn-params: '-Dmaven.test.skip=true'
cron: ''
- sbom-generator: true
+ sbom-generator: false
- gerrit-maven-docker-stage:
build-node: ubuntu1804-docker-8c-8g
container-public-registry: 'nexus3.onap.org:10001'
diff --git a/jjb/sdnc/sdnc-northbound.yaml b/jjb/sdnc/sdnc-northbound.yaml
index 75bf5e6e5..c2b08ec3a 100644
--- a/jjb/sdnc/sdnc-northbound.yaml
+++ b/jjb/sdnc/sdnc-northbound.yaml
@@ -10,7 +10,7 @@
sign-artifacts: true
build-node: centos7-builder-4c-4g
cron: ''
- sbom-generator: true
+ sbom-generator: false
- '{project-name}-gerrit-release-jobs':
build-node: centos7-docker-8c-8g
diff --git a/jjb/sdnc/sdnc-oam.yaml b/jjb/sdnc/sdnc-oam.yaml
index e277cdc7e..e2a3f1f15 100644
--- a/jjb/sdnc/sdnc-oam.yaml
+++ b/jjb/sdnc/sdnc-oam.yaml
@@ -13,7 +13,7 @@
sign-artifacts: true
mvn-params: '-Dmaven.test.skip=true'
cron: ''
- sbom-generator: true
+ sbom-generator: false
- gerrit-maven-docker-stage:
build-node: ubuntu1804-docker-8c-8g
container-public-registry: 'nexus3.onap.org:10001'
diff --git a/shell/onap-gerrit-review-wrapper.sh b/shell/onap-gerrit-review-wrapper.sh
index 0195b8092..26a8dfb83 100755
--- a/shell/onap-gerrit-review-wrapper.sh
+++ b/shell/onap-gerrit-review-wrapper.sh
@@ -16,6 +16,16 @@
# limitations under the License.
# ============LICENSE_END=========================================================
+# Note that all arguments passed to this script are passed on to
+# onap-gerrit-review (OGR) tool
+
+# You can invoke this script with the -E flag to give a non-blocking report.
+# You can also pass in arguments to turn off certain messages using the -m option, such as:
+# -m text-before-copyright -m misnamed-license-txt
+
+# These options can be included in project job templates where the wrapper script
+# is being invoked under pre-build-script hooks
+
set -eu
echo "--> onap-gerrit-review-wrapper.sh"
@@ -32,7 +42,4 @@ rm -Rf /tmp/ogr
export PATH=$PATH:/tmp/ogr/onap-gerrit-review/bin
# Execute OGR
-onap-gerrit-review -S git pull "https://gerrit.onap.org/r/$GERRIT_PROJECT" "$GERRIT_REFSPEC"
-# Use -E flag for non-blocking report
-# onap-gerrit-review -S -E git pull "https://gerrit.onap.org/r/$GERRIT_PROJECT" "$GERRIT_REFSPEC"
-
+onap-gerrit-review -S -G "$@"