X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=blobdiff_plain;f=jjb%2Flf-python-jobs.yaml;h=18268ebc3cb9fc69c102c6f4f196abcee4476f0a;hb=766dbef8a63d824d6e551d4f179806521be95d13;hp=0f5391a57b9ddcc13cf812753452582adf1882b8;hpb=4082e0a566179aa25ea50e870d077e2b8318995e;p=releng%2Fglobal-jjb.git

diff --git a/jjb/lf-python-jobs.yaml b/jjb/lf-python-jobs.yaml
index 0f5391a5..18268ebc 100644
--- a/jjb/lf-python-jobs.yaml
+++ b/jjb/lf-python-jobs.yaml
@@ -30,7 +30,7 @@
 # COMMON FUNCTIONS #
 ####################
 
-- lf_python_common: &lf_python_common
+- _lf_python_common: &lf_python_common
     name: lf-python-common
 
     ######################
@@ -69,7 +69,7 @@
 # Tox Nexus IQ CLM #
 ####################
 
-- lf_tox_nexus_iq_clm: &lf_tox_nexus_iq_clm
+- _lf_tox_nexus_iq_clm: &lf_tox_nexus_iq_clm
     name: lf-tox-nexus-iq-clm
 
     ######################
@@ -227,11 +227,157 @@
           white-list-target-branches:
             - "{branch}"
 
+###################
+# Python Snyk CLI #
+###################
+
+- _lf_python_snyk_cli: &lf_python_snyk_cli
+    name: lf-python-snyk_cli
+
+    ######################
+    # Default parameters #
+    ######################
+
+    branch: master
+    build-days-to-keep: 30 # 30 days for troubleshooting purposes
+    build-timeout: 60
+    disable-job: false
+    git-url: "$GIT_URL/$PROJECT"
+    github-url: "https://github.com"
+    java-version: openjdk11
+    parallel: false
+    pre-build-script: "# pre-build script goes here"
+    python-version: python3
+    snyk-cli-options: ""
+    snyk-token-credential-id: snyk-token
+    snyk-org-credential-id: snyk-org
+    stream: master
+    submodule-recursive: true
+    submodule-timeout: 10
+    submodule-disable: false
+    tox-dir: "."
+    tox-envs: ""
+
+    gerrit_snyk_triggers:
+      - comment-added-contains-event:
+          comment-contains-value: '^Patch Set\s+\d+:\s+run-snyk\s*$'
+
+    parameters:
+      - lf-infra-parameters:
+          project: "{project}"
+          branch: "{branch}"
+          stream: "{stream}"
+      - string:
+          name: SNYK_CLI_OPTIONS
+          default: "{snyk-cli-options}"
+          description: Additional Snyk CLI commands and options
+      - lf-infra-tox-parameters:
+          tox-dir: "{tox-dir}"
+          tox-envs: "{tox-envs}"
+
+    wrappers:
+      - credentials-binding:
+          - text:
+              credential-id: "{snyk-token-credential-id}"
+              variable: SNYK_TOKEN
+          - text:
+              credential-id: "{snyk-org-credential-id}"
+              variable: SNYK_ORG
+
+    #####################
+    # Job Configuration #
+    #####################
+
+    disabled: "{disable-job}"
+
+    builders:
+      - lf-infra-pre-build
+      - lf-infra-tox-install:
+          python-version: "{python-version}"
+      - shell: "{pre-build-script}"
+      - lf-infra-tox-run:
+          parallel: "{parallel}"
+      - lf-infra-snyk-cli-scanner
+
+- job-template:
+    name: "{project-name}-python-snyk-cli-{stream}"
+    id: gerrit-python-snyk-cli
+    # yamllint disable-line rule:key-duplicates
+    <<: *lf_python_snyk_cli
+
+    scm:
+      - lf-infra-gerrit-scm:
+          jenkins-ssh-credential: "{jenkins-ssh-credential}"
+          git-url: "{git-url}"
+          refspec: "$GERRIT_REFSPEC"
+          branch: "$GERRIT_BRANCH"
+          submodule-recursive: "{submodule-recursive}"
+          submodule-timeout: "{submodule-timeout}"
+          submodule-disable: "{submodule-disable}"
+          choosing-strategy: default
+
+    triggers:
+      # Build weekly on Saturdays
+      - timed: "H H * * 6"
+      - gerrit:
+          server-name: "{gerrit-server-name}"
+          trigger-on: "{obj:gerrit_snyk_triggers}"
+          projects:
+            - project-compare-type: ANT
+              project-pattern: "{project}"
+              branches:
+                - branch-compare-type: ANT
+                  branch-pattern: "**/{branch}"
+          skip-vote:
+            successful: true
+            failed: true
+            unstable: true
+            notbuilt: true
+
+- job-template:
+    name: "{project-name}-python-snyk-cli-{stream}"
+    id: github-python-snyk-cli
+    # yamllint disable-line rule:key-duplicates
+    <<: *lf_python_snyk_cli
+
+    properties:
+      - lf-infra-properties:
+          build-days-to-keep: "{build-days-to-keep}"
+      - github:
+          url: "{github-url}/{github-org}/{project}"
+
+    scm:
+      - lf-infra-github-scm:
+          url: "{git-clone-url}{github-org}/{project}"
+          refspec: ""
+          branch: "refs/heads/{branch}"
+          submodule-recursive: "{submodule-recursive}"
+          submodule-timeout: "{submodule-timeout}"
+          submodule-disable: "{submodule-disable}"
+          choosing-strategy: default
+          jenkins-ssh-credential: "{jenkins-ssh-credential}"
+
+    triggers:
+      # Build weekly on Saturdays
+      - timed: "H H * * 6"
+      - github-pull-request:
+          trigger-phrase: "^run-snyk$"
+          only-trigger-phrase: true
+          status-context: "SNYK scan"
+          permit-all: true
+          github-hooks: true
+          org-list:
+            - "{github-org}"
+          white-list: "{obj:github_pr_allowlist}"
+          admin-list: "{obj:github_pr_admin_list}"
+          white-list-target-branches:
+            - "{branch}"
+
 #########################
 # Python Sonar with CLI #
 #########################
 
-- lf_cli_sonar: &lf_cli_sonar
+- _lf_cli_sonar: &lf_cli_sonar
     name: lf-cli-sonar
 
     ######################
@@ -397,7 +543,7 @@
 # Python Sonar with Tox #
 #########################
 
-- lf_tox_sonar: &lf_tox_sonar
+- _lf_tox_sonar: &lf_tox_sonar
     name: lf-tox-sonar
 
     ######################
@@ -416,7 +562,7 @@
     mvn-goals: validate
     mvn-opts: ""
     mvn-params: ""
-    mvn-settings: "{mvn-settings}"
+    mvn-settings: ""
     mvn-version: mvn35
     parallel: true
     pre-build-script: "# pre-build script goes here"
@@ -425,11 +571,10 @@
     sonarcloud: false
     sonarcloud-project-key: ""
     sonarcloud-project-organization: ""
-    sonarcloud-api-token: ""
+    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
@@ -483,6 +628,12 @@
             however to use a specific version of the sonar-maven-plugin we
             can call "org.codehaus.mojo:sonar-maven-plugin:3.3.0.603:sonar".
 
+    wrappers:
+      - credentials-binding:
+          - text:
+              credential-id: "{sonarcloud-api-token-cred-id}"
+              variable: API_TOKEN
+
     builders:
       - lf-infra-pre-build
       - lf-infra-tox-install:
@@ -507,7 +658,6 @@
                 sonarcloud-project-key: "{sonarcloud-project-key}"
                 # yamllint disable-line rule:line-length
                 sonarcloud-project-organization: "{sonarcloud-project-organization}"
-                sonarcloud-api-token: "{sonarcloud-api-token}"
                 sonarcloud-java-version: "{sonarcloud-java-version}"
                 sonarcloud-qualitygate-wait: "{sonarcloud-qualitygate-wait}"
                 scan-dev-branch: "{scan-dev-branch}"
@@ -613,7 +763,7 @@
 # Tox SonarQube #
 #################
 
-- lf_tox_sonarqube: &lf_tox_sonarqube
+- _lf_tox_sonarqube: &lf_tox_sonarqube
     name: lf-tox-sonarqube
 
     ######################
@@ -629,6 +779,7 @@
     disable-job: false
     git-url: "$GIT_URL/$PROJECT"
     github-url: "https://github.com"
+    java-version: openjdk17
     parallel: false
     pre-build-script: "# pre-build script goes here"
     python-version: python3
@@ -644,6 +795,7 @@
     sonar-project-file: "sonar-project.properties"
     sonar-properties: ""
     sonar-task: ""
+    sonar-jdk: openjdk17
 
     #####################
     # Job Configuration #
@@ -677,6 +829,8 @@
 
     builders:
       - lf-infra-pre-build
+      - lf-update-java-alternatives:
+          java-version: "{java-version}"
       - lf-infra-tox-install:
           python-version: "{python-version}"
       - shell: "{pre-build-script}"
@@ -688,6 +842,7 @@
           sonar-properties: "{sonar-properties}"
           sonar-java-opts: "{sonar-java-opts}"
           sonar-additional-args: "{sonar-additional-args}"
+          sonar-jdk: "{sonar-jdk}"
 
     publishers:
       - lf-infra-publish
@@ -760,7 +915,7 @@
 # Tox Common #
 ##############
 
-- lf_tox_common: &lf_tox_common
+- _lf_tox_common: &lf_tox_common
     name: lf-tox-common
 
     ######################
@@ -1000,7 +1155,7 @@
 # PyPI #
 ########
 
-- lf_pypi_common: &lf_pypi_common
+- _lf_pypi_common: &lf_pypi_common
     name: lf-pypi-common
 
     ######################
@@ -1071,7 +1226,7 @@
     publishers:
       - lf-infra-publish
 
-- lf_pypi_verify_builders: &lf_pypi_verify_builders
+- _lf_pypi_verify_builders: &lf_pypi_verify_builders
     name: lf-pypi-verify-builders
 
     builders:
@@ -1083,7 +1238,7 @@
           parallel: "{parallel}"
       - shell: !include-raw-escape: ../shell/pypi-dist-build.sh
 
-- lf_pypi_publish_builders: &lf_pypi_publish_builders
+- _lf_pypi_publish_builders: &lf_pypi_publish_builders
     name: lf-pypi-publish-builders
 
     builders: