X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=blobdiff_plain;f=jjb%2Flf-maven-jobs.yaml;h=61743770448ed19f6f9958642b19dd7301025a1b;hb=532e97b5b965cab5ace406d8ecc845afc98920ac;hp=73a4744f16e703092939559fcbe1fa8de5287a7d;hpb=5f32d861578702e12e8ac05e74b106df2d1a6e71;p=releng%2Fglobal-jjb.git

diff --git a/jjb/lf-maven-jobs.yaml b/jjb/lf-maven-jobs.yaml
index 73a4744f..61743770 100644
--- a/jjb/lf-maven-jobs.yaml
+++ b/jjb/lf-maven-jobs.yaml
@@ -17,7 +17,7 @@
 - builder:
     name: lf-maven-deploy
     builders:
-      - shell: !include-raw:
+      - shell: !include-raw-escape:
           - ../shell/common-variables.sh
           - ../shell/maven-deploy.sh
 
@@ -72,7 +72,7 @@
 # COMMON FUNCTIONS #
 ####################
 
-- lf_maven_common: &lf_maven_common
+- _lf_maven_common: &lf_maven_common
     name: lf-maven-common
 
     ######################
@@ -127,7 +127,7 @@
 # Maven CLM #
 #############
 
-- lf_maven_clm: &lf_maven_clm
+- _lf_maven_clm: &lf_maven_clm
     name: lf-maven-clm
 
     ######################
@@ -297,7 +297,7 @@
 # Maven Snyk CLI #
 ##################
 
-- lf_maven_snyk_cli: &lf_maven_snyk_cli
+- _lf_maven_snyk_cli: &lf_maven_snyk_cli
     name: lf-maven-snyk_cli
 
     ######################
@@ -316,6 +316,7 @@
     mvn-opts: ""
     mvn-params: ""
     mvn-version: mvn35
+    snyk-cli-options: ""
     snyk-token-credential-id: snyk-token
     snyk-org-credential-id: snyk-org
     stream: master
@@ -336,6 +337,10 @@
           mvn-opts: "{mvn-opts}"
           mvn-params: "{mvn-params}"
           mvn-version: "{mvn-version}"
+      - string:
+          name: SNYK_CLI_OPTIONS
+          default: "{snyk-cli-options}"
+          description: Additional Snyk CLI commands and options
       - string:
           name: ARCHIVE_ARTIFACTS
           default: "{archive-artifacts}"
@@ -458,7 +463,7 @@
 # Maven Javadoc Publish #
 #########################
 
-- lf_maven_javadoc_publish: &lf_maven_javadoc_publish
+- _lf_maven_javadoc_publish: &lf_maven_javadoc_publish
     name: lf-maven-javadoc-publish
 
     ######################
@@ -590,7 +595,7 @@
 # Maven Javadoc Verify #
 ########################
 
-- lf_maven_javadoc_verify: &lf_maven_javadoc_verify
+- _lf_maven_javadoc_verify: &lf_maven_javadoc_verify
     name: lf-maven-javadoc-verify
 
     ######################
@@ -714,7 +719,7 @@
 # Maven Merge #
 ###############
 
-- lf_maven_merge: &lf_maven_merge
+- _lf_maven_merge: &lf_maven_merge
     name: lf-maven-merge
 
     ######################
@@ -728,6 +733,11 @@
     disable-job: false
     git-url: "$GIT_URL/$PROJECT"
     github-url: "https://github.com"
+    jacoco-exclude-pattern: >-
+      **/gen/**,
+      **/generated-sources/**,
+      **/yang-gen**,
+      **/pax/**,
     java-version: openjdk11
     mvn-global-settings: global-settings
     mvn-goals: clean deploy
@@ -789,7 +799,8 @@
 
     publishers:
       - findbugs
-      - lf-jacoco-report
+      - lf-jacoco-report:
+          exclude-pattern: "{jacoco-exclude-pattern}"
       - lf-infra-publish
       - trigger-parameterized-builds: "{obj:post_build_trigger}"
 
@@ -871,7 +882,7 @@
 # Maven Merge for Docker #
 ##########################
 
-- lf_maven_docker_merge: &lf_maven_docker_merge
+- _lf_maven_docker_merge: &lf_maven_docker_merge
     name: lf-maven-docker-merge
 
     builders:
@@ -982,7 +993,7 @@
 # Maven Stage #
 ###############
 
-- lf_maven_stage: &lf_maven_stage
+- _lf_maven_stage: &lf_maven_stage
     name: lf-maven-stage
 
     ######################
@@ -992,7 +1003,7 @@
     branch: master
     build-days-to-keep: 30 # 30 days in case a release takes long to get approved.
     build-timeout: 60
-    cron: "@daily"
+    cron: ""
     disable-job: false
     git-url: "$GIT_URL/$PROJECT"
     github-url: "https://github.com"
@@ -1180,7 +1191,7 @@
 # Maven Stage for Docker #
 ##########################
 
-- lf_maven_docker_stage: &lf_maven_docker_stage
+- _lf_maven_docker_stage: &lf_maven_docker_stage
     name: lf-maven-docker-stage
 
     builders:
@@ -1210,6 +1221,14 @@
             CONTAINER_PUSH_REGISTRY={container-staging-registry}
       - lf-maven-build:
           mvn-goals: "{mvn-goals}"
+      # With SBOM Generator
+      - conditional-step:
+          condition-kind: boolean-expression
+          condition-expression: "{sbom-generator}"
+          steps:
+            - shell: echo 'Running SBOM Generator'
+            - lf-infra-maven-sbom-generator:
+                sbom-flags: "{sbom-flags}"
       - lf-sigul-sign-dir:
           sign-artifacts: "{sign-artifacts}"
           sign-dir: "$WORKSPACE/m2repo"
@@ -1297,7 +1316,7 @@
 # Maven Sonar #
 ###############
 
-- lf_maven_sonar: &lf_maven_sonar
+- _lf_maven_sonar: &lf_maven_sonar
     name: lf-maven-sonar
 
     ######################
@@ -1311,6 +1330,11 @@
     disable-job: false
     git-url: "$GIT_URL/$PROJECT"
     github-url: "https://github.com"
+    jacoco-exclude-pattern: >-
+      **/gen/**,
+      **/generated-sources/**,
+      **/yang-gen**,
+      **/pax/**,
     java-version: openjdk11
     java-opts: ""
     mvn-global-settings: global-settings
@@ -1324,9 +1348,8 @@
     sonarcloud-project-organization: ""
     sonarcloud-api-token-cred-id: sonarcloud-api-token
     sonarcloud-qualitygate-wait: false
-    # SonarCloud scan using jdk8 will become deprecated by Oct, 2020
-    # Projects not compatible with jdk11 can set java-version to something else
-    sonarcloud-java-version: openjdk11
+    # Projects not compatible with jdk17 can set java-version to something else
+    sonarcloud-java-version: openjdk17
     stream: master
     submodule-recursive: true
     submodule-timeout: 10
@@ -1372,7 +1395,7 @@
     wrappers:
       - credentials-binding:
           - text:
-              credential-id: '{sonarcloud-api-token-cred-id}'
+              credential-id: "{sonarcloud-api-token-cred-id}"
               variable: API_TOKEN
 
     triggers:
@@ -1393,11 +1416,12 @@
             notbuilt: true
 
     publishers:
-      - lf-jacoco-report
+      - lf-jacoco-report:
+          exclude-pattern: "{jacoco-exclude-pattern}"
       - findbugs
       - lf-infra-publish
 
-- mvn_sonar_builders: &mvn_sonar_builders
+- _mvn_sonar_builders: &mvn_sonar_builders
     name: mvn-sonar-builders
     builders:
       - lf-infra-pre-build
@@ -1431,7 +1455,7 @@
                 mvn-settings: "{mvn-settings}"
                 mvn-version: "{mvn-version}"
 
-- mvn_sonar_builders_prescan_script: &mvn_sonar_builders_prescan_script
+- _mvn_sonar_builders_prescan_script: &mvn_sonar_builders_prescan_script
     name: mvn-sonar-builders-prescan-script
     builders:
       - shell: "{sonar-prescan-script}"
@@ -1692,7 +1716,7 @@
 # Maven Verify #
 ################
 
-- lf_maven_verify: &lf_maven_verify
+- _lf_maven_verify: &lf_maven_verify
     name: lf-maven-verify
 
     ######################
@@ -1705,6 +1729,11 @@
     disable-job: false
     git-url: "$GIT_URL/$PROJECT"
     github-url: "https://github.com"
+    jacoco-exclude-pattern: >-
+      **/gen/**,
+      **/generated-sources/**,
+      **/yang-gen**,
+      **/pax/**
     java-version: openjdk11
     mvn-global-settings: global-settings
     mvn-goals: clean deploy
@@ -1760,7 +1789,8 @@
 
     publishers:
       - findbugs
-      - lf-jacoco-report
+      - lf-jacoco-report:
+          exclude-pattern: "{jacoco-exclude-pattern}"
       - lf-infra-publish
 
 - job-template:
@@ -1832,7 +1862,7 @@
 # Maven Verify for Docker #
 ###########################
 
-- lf_maven_docker_verify: &lf_maven_docker_verify
+- _lf_maven_docker_verify: &lf_maven_docker_verify
     name: lf-maven-docker-verify
 
     # image push not allowed during verification
@@ -1932,7 +1962,7 @@
 # Maven Verify Dependencies #
 #############################
 
-- lf_maven_verify_dependencies: &lf_maven_verify_dependencies
+- _lf_maven_verify_dependencies: &lf_maven_verify_dependencies
     name: lf-maven-verify-dependencies
 
     ######################
@@ -1945,6 +1975,11 @@
     disable-job: false
     git-url: "$GIT_URL/$PROJECT"
     github-url: "https://github.com"
+    jacoco-exclude-pattern: >-
+      **/gen/**,
+      **/generated-sources/**,
+      **/yang-gen**,
+      **/pax/**
     java-version: openjdk11
     mvn-global-settings: global-settings
     mvn-goals: clean deploy
@@ -1990,7 +2025,8 @@
 
     publishers:
       - findbugs
-      - lf-jacoco-report
+      - lf-jacoco-report:
+          exclude-pattern: "{jacoco-exclude-pattern}"
       - lf-infra-publish
 
 - job-template: