X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=blobdiff_plain;f=jjb%2Flf-python-jobs.yaml;h=c29dd5d8daf1f7a4df6276245f7978dc6000a4b3;hb=89213a114af3775da43b5f97c3584db516d49987;hp=606d5ec1de17bc58a4eea89d01770574121d1d15;hpb=c53e11db14ab7abede74c74801bec9ca381c8cc6;p=releng%2Fglobal-jjb.git

diff --git a/jjb/lf-python-jobs.yaml b/jjb/lf-python-jobs.yaml
index 606d5ec1..c29dd5d8 100644
--- a/jjb/lf-python-jobs.yaml
+++ b/jjb/lf-python-jobs.yaml
@@ -4,11 +4,13 @@
 ##########
 
 - builder:
-    name: lf-infra-clm-python
+    name: lf-infra-nexus-iq-python-cli
     builders:
       - inject:
-          properties-content: "CLM_PROJECT_NAME={clm-project-name}"
-      - shell: !include-raw-escape: ../shell/nexus-iq-cli.sh
+          properties-content: |
+            NEXUS_IQ_PROJECT_NAME={nexus-iq-project-name}
+            REQUIREMENTS_FILE={requirements-file}
+      - shell: !include-raw-escape: ../shell/nexus-iq-python-cli.sh
 
 - builder:
     name: lf-infra-tox-install
@@ -63,39 +65,36 @@
     publishers:
       - lf-infra-publish
 
-#################
-# Python XC CLM #
-#################
+####################
+# Tox Nexus IQ CLM #
+####################
 
-- lf_python_clm_xc: &lf_python_xc_clm
-    name: lf-python-xc-clm
+- lf_tox_nexus_iq_clm: &lf_tox_nexus_iq_clm
+    name: lf-tox-nexus-iq-clm
 
     ######################
     # Default parameters #
     ######################
 
     branch: master
-    build-days-to-keep: 30 # 30 days for troubleshooting purposes
-    build-timeout: 60
+    build-days-to-keep: 7
+    build-timeout: 15
+    cron: "@weekly"
     disable-job: false
     git-url: "$GIT_URL/$PROJECT"
     github-url: "https://github.com"
-    java-version: openjdk8
-    nexus-iq-cli-version: 1.44.0-01
+    java-version: openjdk8 # Scanner is a jar
+    nexus-iq-cli-version: 1.89.0-02
     nexus-iq-namespace: "" # Recommend a trailing dash when set. Example: odl-
-    pre-build-script: "  # pre-build script goes here"
+    pre-build-script: "# pre-build script goes here"
+    python-version: python3
+    requirements-file: requirements.txt
     stream: master
     submodule-recursive: true
     submodule-timeout: 10
     submodule-disable: false
-
-    gerrit_trigger_file_paths:
-      - compare-type: ANT
-        pattern: ".*"
-
-    # github_included_regions MUST match gerrit_trigger_file_paths
-    github_included_regions:
-      - ".*"
+    tox-dir: "."
+    tox-envs: "clm"
 
     #####################
     # Job Configuration #
@@ -108,35 +107,52 @@
           project: "{project}"
           branch: "{branch}"
           stream: "{stream}"
+      - lf-infra-tox-parameters:
+          tox-dir: "{tox-dir}"
+          tox-envs: "{tox-envs}"
+      - string:
+          name: ARCHIVE_ARTIFACTS
+          default: "{archive-artifacts}"
+          description: Artifacts to archive to the logs server.
       - string:
           name: NEXUS_IQ_CLI_VERSION
           default: "{nexus-iq-cli-version}"
-          description: Nexus IQ CLI package to download and use.
+          description: Nexus IQ CLI jar to download and run.
 
     wrappers:
+      - lf-infra-wrappers:
+          build-timeout: "{build-timeout}"
+          jenkins-ssh-credential: "{jenkins-ssh-credential}"
       - credentials-binding:
           - username-password-separated:
               credential-id: nexus-iq-xc-clm
-              username: CLM_USER
-              password: CLM_PASSWORD
+              username: NEXUS_IQ_USER
+              password: NEXUS_IQ_PASSWORD
+
     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}"
-      - lf-infra-clm-python:
-          clm-project-name: "{nexus-iq-namespace}{project-name}"
+      - lf-infra-tox-run:
+          parallel: false
+      - lf-infra-nexus-iq-python-cli:
+          nexus-iq-project-name: "{nexus-iq-namespace}{project-name}"
+          requirements-file: "{requirements-file}"
 
 - job-template:
-    name: "{project-name}-python-clm-{stream}"
-    id: gerrit-python-xc-clm
+    name: "{project-name}-tox-nexus-iq-clm"
+    id: gerrit-tox-nexus-iq-clm
     <<: *lf_python_common
-    <<: *lf_python_xc_clm
+    <<: *lf_tox_nexus_iq_clm
 
     ######################
     # Default parameters #
     ######################
 
-    gerrit_clm_triggers:
+    gerrit_nexus_iq_triggers:
       - comment-added-contains-event:
           comment-contains-value: '^Patch Set\s+\d+:\s+run-clm\s*$'
 
@@ -156,18 +172,16 @@
           choosing-strategy: default
 
     triggers:
-      # Build weekly on Saturdays
-      - timed: "H H * * 6"
+      - timed: "{obj:cron}"
       - gerrit:
           server-name: "{gerrit-server-name}"
-          trigger-on: "{obj:gerrit_clm_triggers}"
+          trigger-on: "{obj:gerrit_nexus_iq_triggers}"
           projects:
             - project-compare-type: ANT
               project-pattern: "{project}"
               branches:
                 - branch-compare-type: ANT
                   branch-pattern: "**/{branch}"
-              file-paths: "{obj:gerrit_trigger_file_paths}"
           skip-vote:
             successful: true
             failed: true
@@ -175,10 +189,10 @@
             notbuilt: true
 
 - job-template:
-    name: "{project-name}-python-clm-{stream}"
-    id: github-python-xc-clm
+    name: "{project-name}-tox-nexus-iq"
+    id: github-tox-nexus-iq-clm
     <<: *lf_python_common
-    <<: *lf_python_xc_clm
+    <<: *lf_tox_nexus_iq_clm
 
     properties:
       - lf-infra-properties:
@@ -198,8 +212,7 @@
           jenkins-ssh-credential: "{jenkins-ssh-credential}"
 
     triggers:
-      # Build weekly on Saturdays
-      - timed: "H H * * 6"
+      - timed: "{obj:cron}"
       - github-pull-request:
           trigger-phrase: "^run-clm$"
           only-trigger-phrase: false
@@ -208,14 +221,13 @@
           github-hooks: true
           white-list-target-branches:
             - "{branch}"
-          included-regions: "{obj:github_included_regions}"
 
 #########################
 # Python Sonar with Tox #
 #########################
 
 - lf_tox_sonar: &lf_tox_sonar
-    name: lf-tox_sonar
+    name: lf-tox-sonar
 
     ######################
     # Default parameters #
@@ -231,6 +243,8 @@
     java-version: openjdk8
     mvn-global-settings: global-settings
     mvn-goals: validate
+    mvn-opts: ""
+    mvn-params: ""
     mvn-settings: "{mvn-settings}"
     mvn-version: mvn35
     parallel: true
@@ -267,6 +281,10 @@
           project: "{project}"
           branch: "{branch}"
           stream: "{stream}"
+      - lf-infra-maven-parameters:
+          mvn-opts: "{mvn-opts}"
+          mvn-params: "{mvn-params}"
+          mvn-version: "{mvn-version}"
       - lf-infra-tox-parameters:
           tox-dir: "{tox-dir}"
           tox-envs: "{tox-envs}"
@@ -412,6 +430,153 @@
             - "{branch}"
           included-regions: "{obj:github_included_regions}"
 
+#################
+# Tox SonarQube #
+#################
+
+- lf_tox_sonarqube: &lf_tox_sonarqube
+    name: lf-tox-sonarqube
+
+    ######################
+    # Default parameters #
+    ######################
+
+    archive-artifacts: >
+      **/*.log
+    branch: master # Sonar should always be run on master branch
+    build-days-to-keep: 7
+    build-timeout: 15
+    cron: "@weekly"
+    disable-job: false
+    git-url: "$GIT_URL/$PROJECT"
+    github-url: "https://github.com"
+    parallel: false
+    pre-build-script: "# pre-build script goes here"
+    python-version: python3
+    stream: master
+    submodule-recursive: true
+    submodule-timeout: 10
+    submodule-disable: false
+    tox-dir: "."
+    tox-envs: ""
+    # Sonar properties
+    sonar-additional-args: ""
+    sonar-java-opts: ""
+    sonar-project-file: "sonar-project.properties"
+    sonar-properties: ""
+    sonar-task: ""
+
+    #####################
+    # Job Configuration #
+    #####################
+
+    project-type: freestyle
+    node: "{build-node}"
+    disabled: "{disable-job}"
+
+    properties:
+      - lf-infra-properties:
+          build-days-to-keep: "{build-days-to-keep}"
+
+    wrappers:
+      - lf-infra-wrappers:
+          build-timeout: "{build-timeout}"
+          jenkins-ssh-credential: "{jenkins-ssh-credential}"
+
+    parameters:
+      - lf-infra-parameters:
+          project: "{project}"
+          branch: "{branch}"
+          stream: "{stream}"
+      - lf-infra-tox-parameters:
+          tox-dir: "{tox-dir}"
+          tox-envs: "{tox-envs}"
+      - string:
+          name: ARCHIVE_ARTIFACTS
+          default: "{archive-artifacts}"
+          description: Artifacts to archive to the logs server.
+
+    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-sonar:
+          sonar-task: "{sonar-task}"
+          sonar-project-file: "{sonar-project-file}"
+          sonar-properties: "{sonar-properties}"
+          sonar-java-opts: "{sonar-java-opts}"
+          sonar-additional-args: "{sonar-additional-args}"
+
+    publishers:
+      - lf-infra-publish
+
+- job-template:
+    name: "{project-name}-tox-sonarqube"
+    id: gerrit-tox-sonarqube
+    concurrent: false
+    <<: *lf_tox_sonarqube
+
+    ######################
+    # Default parameters #
+    ######################
+
+    gerrit_sonar_triggers:
+      - comment-added-contains-event:
+          comment-contains-value: '^Patch Set\s+\d+:\s+run-sonar\s*$'
+
+    scm:
+      - lf-infra-gerrit-scm:
+          branch: "$GERRIT_BRANCH"
+          jenkins-ssh-credential: "{jenkins-ssh-credential}"
+          git-url: "{git-url}"
+          refspec: "$GERRIT_REFSPEC"
+          submodule-recursive: "{submodule-recursive}"
+          submodule-timeout: "{submodule-timeout}"
+          submodule-disable: "{submodule-disable}"
+          choosing-strategy: default
+
+    triggers:
+      - timed: "{obj:cron}"
+      - gerrit:
+          server-name: "{gerrit-server-name}"
+          trigger-on: "{obj:gerrit_sonar_triggers}"
+          projects:
+            - project-compare-type: "ANT"
+              project-pattern: "{project}"
+              branches:
+                - branch-compare-type: "ANT"
+                  branch-pattern: "**/{branch}"
+
+- job-template:
+    name: "{project-name}-tox-sonarqube"
+    id: github-tox-sonarqube
+    concurrent: false
+    <<: *lf_tox_sonarqube
+
+    scm:
+      - lf-infra-github-scm:
+          branch: "$sha1"
+          jenkins-ssh-credential: "{jenkins-ssh-credential}"
+          url: "{git-clone-url}{github-org}/{project}"
+          refspec: "+refs/pull/*:refs/remotes/origin/pr/*"
+          submodule-recursive: "{submodule-recursive}"
+          submodule-timeout: "{submodule-timeout}"
+          submodule-disable: "{submodule-disable}"
+          choosing-strategy: default
+
+    triggers:
+      - github-pull-request:
+          trigger-phrase: "^run-sonar$"
+          only-trigger-phrase: false
+          status-context: "Tox Sonarqube"
+          permit-all: true
+          github-hooks: true
+          white-list-target-branches:
+            - "{branch}"
+
 ##############
 # Tox Common #
 ##############
@@ -599,7 +764,8 @@
           submodule-recursive: "{submodule-recursive}"
           submodule-timeout: "{submodule-timeout}"
           submodule-disable: "{submodule-disable}"
-          choosing-strategy: gerrit
+          # merge jobs always build from tip
+          choosing-strategy: default
 
     triggers:
       - gerrit:
@@ -682,7 +848,7 @@
     tox-envs: ""
 
     gerrit_trigger_file_paths:
-      - compare-type: ANT
+      - compare-type: REG_EXP
         pattern: ".*"
 
     # github_included_regions MUST match gerrit_trigger_file_paths
@@ -738,8 +904,8 @@
           parallel: "{parallel}"
       - shell: !include-raw-escape: ../shell/pypi-dist-build.sh
 
-- lf_pypi_merge_builders: &lf_pypi_merge_builders
-    name: lf-pypi-merge-builders
+- lf_pypi_publish_builders: &lf_pypi_publish_builders
+    name: lf-pypi-publish-builders
 
     builders:
       - lf-infra-pre-build
@@ -830,9 +996,9 @@
     name: "{project-name}-pypi-merge-{stream}"
     id: gerrit-pypi-merge
     <<: *lf_pypi_common
-    <<: *lf_pypi_merge_builders
+    <<: *lf_pypi_publish_builders
 
-    cron: ""
+    cron: "" # avoid for pypi which rejects duplicates
     pypi-repo: pypi-test
 
     scm:
@@ -844,7 +1010,8 @@
           submodule-recursive: "{submodule-recursive}"
           submodule-timeout: "{submodule-timeout}"
           submodule-disable: "{submodule-disable}"
-          choosing-strategy: gerrit
+          # merge jobs always build from tip
+          choosing-strategy: default
 
     triggers:
       - timed: "{obj:cron}"
@@ -866,7 +1033,7 @@
     name: "{project-name}-pypi-merge-{stream}"
     id: github-pypi-merge
     <<: *lf_pypi_common
-    <<: *lf_pypi_merge_builders
+    <<: *lf_pypi_publish_builders
 
     cron: ""
     pypi-repo: pypi-test
@@ -901,3 +1068,77 @@
           white-list-target-branches:
             - "{branch}"
           included-regions: "{obj:github_included_regions}"
+
+- job-template:
+    name: "{project-name}-pypi-stage-{stream}"
+    id: gerrit-pypi-stage
+    <<: *lf_pypi_common
+    <<: *lf_pypi_publish_builders
+
+    cron: ""
+    pypi-repo: pypi-test
+
+    gerrit_stage_triggers:
+      - comment-added-contains-event:
+          comment-contains-value: '^Patch Set\s+\d+:\s+stage-release\s*$'
+
+    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}"
+          # stage jobs always build from tip
+          choosing-strategy: default
+
+    triggers:
+      - timed: "{obj:cron}"
+      - gerrit:
+          server-name: "{gerrit-server-name}"
+          trigger-on: "{obj:gerrit_stage_triggers}"
+          projects:
+            - project-compare-type: ANT
+              project-pattern: "{project}"
+              branches:
+                - branch-compare-type: ANT
+                  branch-pattern: "**/{branch}"
+              file-paths: "{obj:gerrit_trigger_file_paths}"
+
+- job-template:
+    name: "{project-name}-pypi-stage-{stream}"
+    id: github-pypi-stage
+    <<: *lf_pypi_common
+    <<: *lf_pypi_publish_builders
+
+    cron: ""
+    pypi-repo: pypi-test
+
+    properties:
+      - 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:
+      - timed: "{obj:cron}"
+      - github-pull-request:
+          trigger-phrase: "^stage-release$"
+          only-trigger-phrase: true
+          status-context: "Release"
+          permit-all: true
+          github-hooks: true
+          white-list-target-branches:
+            - "{branch}"
+          included-regions: "{obj:github_included_regions}"