Merge "Add Kohn branch to SDC jobs"

diff --git a/jjb/ccsdk/apps.yaml b/jjb/ccsdk/apps.yaml
index ab93326..d830dc5 100644 (file)
--- 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 75c02d9..74b88cc 100644 (file)
--- 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 2646caf..ea5066e 100644 (file)
--- 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 a119eb2..c47f21e 100644 (file)
--- 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 7ffdc36..40e5a8e 100644 (file)
--- 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 bbc8e2b..0673e14 100644 (file)
--- 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 26145f9..fff8890 100644 (file)
--- 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 edf6e3b..1633241 100644 (file)
--- 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 d242d46..6d7a3b9 100644 (file)
--- 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 b74439e..6eee943 100644 (file)
--- 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 530a7b2..f325ed1 100644 (file)
--- 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 34fe57b..0ac9a22 100644 (file)
--- 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 a679666..c3755de 100644 (file)
--- 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 85d4e78..5cdbeb3 100644 (file)
--- 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 75bf5e6..c2b08ec 100644 (file)
--- 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 e277cdc..e2a3f1f 100644 (file)
--- 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 0195b80..26a8dfb 100755 (executable)
--- 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 "$@"