X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=blobdiff_plain;f=jjb%2Flf-maven-jobs.yaml;h=f20dbe97fa5396152520a3502797929be3d5680f;hb=6a3a8fd3c9430a90f3b8c0c85e7e20b8a318eb8f;hp=ce03f0c22c06663f18cc09f3278139c28dd000be;hpb=356637f0d3d4091aecde9889c1bc9ec758a33336;p=releng%2Fglobal-jjb.git

diff --git a/jjb/lf-maven-jobs.yaml b/jjb/lf-maven-jobs.yaml
index ce03f0c2..f20dbe97 100644
--- a/jjb/lf-maven-jobs.yaml
+++ b/jjb/lf-maven-jobs.yaml
@@ -1,53 +1,6 @@
 ---
 # This file contains job templates for Maven projects.
 
-- job-group:
-    name: '{project-name}-maven-jobs'
-
-    # This job group contains all the recommended jobs that should be deployed
-    # for any project ci.
-
-    # TODO: Add Maven Merge job to this list once it's been fully tested.
-    jobs:
-      - gerrit-maven-clm
-      - gerrit-maven-merge
-      - gerrit-maven-release
-      - gerrit-maven-verify
-      - gerrit-maven-verify-dependencies
-
-- job-group:
-    name: '{project-name}-github-maven-jobs'
-
-    # This job group contains all the recommended jobs that should be deployed
-    # for any project ci that is using github.
-
-    # TODO: Add Maven Merge job to this list once it's been fully tested.
-    jobs:
-      - github-maven-clm
-      - github-maven-merge
-      - github-maven-release
-      - github-maven-verify
-
-- job-group:
-    name: '{project-name}-maven-javadoc-jobs'
-
-    # This job group contains all the recommended jobs that should be deployed
-    # for any project ci.
-
-    jobs:
-      - gerrit-maven-javadoc-publish
-      - gerrit-maven-javadoc-verify
-
-- job-group:
-    name: '{project-name}-github-maven-javadoc-jobs'
-
-    # This job group contains all the recommended jobs that should be deployed
-    # for any project ci.
-
-    jobs:
-      - github-maven-javadoc-publish
-      - github-maven-javadoc-verify
-
 ##########
 # Macros #
 ##########
@@ -71,10 +24,16 @@
 - builder:
     name: lf-maven-stage
     builders:
+      - lf-provide-maven-settings:
+          global-settings-file: '{mvn-global-settings}'
+          settings-file: '{mvn-settings}'
+      - lf-infra-create-netrc:
+          server-id: '{mvn-staging-id}'
       # include-raw-escape fails due to JJB bug
-      - shell: !include-raw:
+      - shell: !include-raw-escape:
           - ../shell/common-variables.sh
           - ../shell/maven-stage.sh
+      - lf-provide-maven-settings-cleanup
 
 - builder:
     name: lf-update-java-alternatives
@@ -123,13 +82,10 @@
           project: '{project}'
           branch: '{branch}'
           stream: '{stream}'
-          lftools-version: '{lftools-version}'
       - lf-infra-maven-parameters:
           mvn-opts: '{mvn-opts}'
           mvn-params: '{mvn-params}'
           mvn-version: '{mvn-version}'
-          # Staging repos do not make sense for CLM jobs so set it blank.
-          staging-profile-id: '{staging-profile-id}'
       - string:
           name: ARCHIVE_ARTIFACTS
           default: '{archive-artifacts}'
@@ -161,6 +117,7 @@
     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: openjdk8
@@ -168,10 +125,11 @@
     mvn-opts: ''
     mvn-params: ''
     mvn-version: mvn35
+    nexus-iq-namespace: ''  # Recommend a trailing dash when set. Example: odl-
     nexus-iq-stage: 'build'
-    staging-profile-id: ''  # Unused in this job
     stream: master
     submodule-recursive: true
+    submodule-timeout: 10
 
     nexus_iq_scan_patterns:
       - '**/*.ear'
@@ -189,13 +147,10 @@
           project: '{project}'
           branch: '{branch}'
           stream: '{stream}'
-          lftools-version: '{lftools-version}'
       - lf-infra-maven-parameters:
           mvn-opts: '{mvn-opts}'
           mvn-params: '{mvn-params}'
           mvn-version: '{mvn-version}'
-          # Staging repos do not make sense for CLM jobs so set it blank.
-          staging-profile-id: '{staging-profile-id}'
       - string:
           name: ARCHIVE_ARTIFACTS
           default: '{archive-artifacts}'
@@ -207,7 +162,10 @@
     # Job Configuration #
     #####################
 
+    disabled: '{disable-job}'
+
     builders:
+      - lf-infra-pre-build
       - lf-maven-install:
           mvn-version: '{mvn-version}'
       - lf-update-java-alternatives:
@@ -223,7 +181,7 @@
       - nexus-iq-policy-evaluator:
           stage: '{nexus-iq-stage}'
           application-type: 'manual'
-          application-id: '{project-name}'
+          application-id: '{nexus-iq-namespace}{project-name}'
           scan-patterns: '{obj:nexus_iq_scan_patterns}'
           fail-build-network-error: true
 
@@ -241,6 +199,7 @@
           refspec: '$GERRIT_REFSPEC'
           branch: '$GERRIT_BRANCH'
           submodule-recursive: '{submodule-recursive}'
+          submodule-timeout: '{submodule-timeout}'
           choosing-strategy: default
 
     triggers:
@@ -280,6 +239,7 @@
           refspec: ''
           branch: 'refs/heads/{branch}'
           submodule-recursive: '{submodule-recursive}'
+          submodule-timeout: '{submodule-timeout}'
           choosing-strategy: default
           jenkins-ssh-credential: '{jenkins-ssh-credential}'
 
@@ -288,7 +248,7 @@
       - timed: 'H H * * 6'
       - github-pull-request:
           trigger-phrase: '^run-clm$'
-          only-trigger-phrase: false
+          only-trigger-phrase: true
           status-context: 'CLM'
           permit-all: true
           github-hooks: true
@@ -313,6 +273,7 @@
     branch: master
     build-days-to-keep: 30  # 30 days in case a release takes long to get approved.
     build-timeout: 60
+    disable-job: false
     git-url: '$GIT_URL/$PROJECT'
     github-url: 'https://github.com'
     java-version: openjdk8
@@ -320,9 +281,9 @@
     mvn-opts: ''
     mvn-params: ''
     mvn-version: mvn35
-    staging-profile-id: ''  # Unused by the javadoc jobs
     stream: master
     submodule-recursive: true
+    submodule-timeout: 10
 
     gerrit_merge_triggers:
       - change-merged-event
@@ -333,7 +294,10 @@
     # Job Configuration #
     #####################
 
+    disabled: '{disable-job}'
+
     builders:
+      - lf-infra-pre-build
       - lf-maven-install:
           mvn-version: '{mvn-version}'
       - lf-update-java-alternatives:
@@ -348,12 +312,11 @@
       - shell: !include-raw-escape:
           - ../shell/common-variables.sh
           - ../shell/maven-javadoc-generate.sh
-          - ../shell/lftools-install.sh
           - ../shell/maven-javadoc-publish.sh
       - lf-provide-maven-settings-cleanup
 
 - job-template:
-    name: '{project-name}-maven-javadoc-publish-{stream}'
+    name: '{project-name}-maven-javadoc-publish-{stream}-{java-version}'
     id: gerrit-maven-javadoc-publish
     <<: *lf_maven_common
     # yamllint disable-line rule:key-duplicates
@@ -367,6 +330,7 @@
           refspec: ''
           branch: '{branch}'
           submodule-recursive: '{submodule-recursive}'
+          submodule-timeout: '{submodule-timeout}'
           choosing-strategy: default
           jenkins-ssh-credential: '{jenkins-ssh-credential}'
 
@@ -382,7 +346,7 @@
                   branch-pattern: '**/{branch}'
 
 - job-template:
-    name: '{project-name}-maven-javadoc-publish-{stream}'
+    name: '{project-name}-maven-javadoc-publish-{stream}-{java-version}'
     id: github-maven-javadoc-publish
     <<: *lf_maven_common
     # yamllint disable-line rule:key-duplicates
@@ -400,6 +364,7 @@
           refspec: ''
           branch: '{branch}'
           submodule-recursive: '{submodule-recursive}'
+          submodule-timeout: '{submodule-timeout}'
           choosing-strategy: default
           jenkins-ssh-credential: '{jenkins-ssh-credential}'
 
@@ -411,7 +376,7 @@
           trigger-phrase: '^remerge$'
           only-trigger-phrase: true
           status-context: 'Maven Javadoc Publish'
-          permit-all: false
+          permit-all: true
           github-hooks: true
           org-list:
             - '{github-org}'
@@ -434,6 +399,7 @@
     branch: master
     build-days-to-keep: 30  # 30 days in case a release takes long to get approved.
     build-timeout: 60
+    disable-job: false
     git-url: '$GIT_URL/$PROJECT'
     github-url: 'https://github.com'
     java-version: openjdk8
@@ -441,9 +407,9 @@
     mvn-opts: ''
     mvn-params: ''
     mvn-version: mvn35
-    staging-profile-id: ''  # Unused by the javadoc jobs
     stream: master
     submodule-recursive: true
+    submodule-timeout: 10
 
     gerrit_verify_triggers:
       - patchset-created-event:
@@ -459,8 +425,10 @@
     #####################
 
     concurrent: true
+    disabled: '{disable-job}'
 
     builders:
+      - lf-infra-pre-build
       - lf-maven-install:
           mvn-version: '{mvn-version}'
       - lf-update-java-alternatives:
@@ -474,7 +442,7 @@
       - lf-provide-maven-settings-cleanup
 
 - job-template:
-    name: '{project-name}-maven-javadoc-verify-{stream}'
+    name: '{project-name}-maven-javadoc-verify-{stream}-{java-version}'
     id: gerrit-maven-javadoc-verify
     <<: *lf_maven_common
     # yamllint disable-line rule:key-duplicates
@@ -487,6 +455,7 @@
           refspec: '$GERRIT_REFSPEC'
           branch: '$GERRIT_BRANCH'
           submodule-recursive: '{submodule-recursive}'
+          submodule-timeout: '{submodule-timeout}'
           choosing-strategy: gerrit
 
     triggers:
@@ -501,7 +470,7 @@
                   branch-pattern: '**/{branch}'
 
 - job-template:
-    name: '{project-name}-maven-javadoc-verify-{stream}'
+    name: '{project-name}-maven-javadoc-verify-{stream}-{java-version}'
     id: github-maven-javadoc-verify
     <<: *lf_maven_common
     # yamllint disable-line rule:key-duplicates
@@ -519,6 +488,7 @@
           refspec: '+refs/pull/*:refs/remotes/origin/pr/*'
           branch: '$sha1'
           submodule-recursive: '{submodule-recursive}'
+          submodule-timeout: '{submodule-timeout}'
           choosing-strategy: default
           jenkins-ssh-credential: '{jenkins-ssh-credential}'
 
@@ -546,7 +516,8 @@
     branch: master
     build-days-to-keep: 30  # 30 days in case we need to troubleshoot
     build-timeout: 60
-    cron: 'H H * * 0'  # push fresh snapshot weekly
+    cron: '@daily'
+    disable-job: false
     git-url: '$GIT_URL/$PROJECT'
     github-url: 'https://github.com'
     java-version: openjdk8
@@ -556,9 +527,9 @@
     mvn-params: '-Dmerge'
     mvn-version: mvn35
     nexus-cut-dirs: 6  # Number of dirs in the Nexus path to remove for wget -r.
-    staging-profile-id: ''  # Unused by this job.
     stream: master
     submodule-recursive: true
+    submodule-timeout: 10
 
     gerrit_merge_triggers:
       - change-merged-event
@@ -579,7 +550,10 @@
     # Job Configuration #
     #####################
 
+    disabled: '{disable-job}'
+
     builders:
+      - lf-infra-pre-build
       - lf-jacoco-nojava-workaround
       - lf-maven-install:
           mvn-version: '{mvn-version}'
@@ -594,9 +568,7 @@
           properties-content: |
               NEXUS_CUT_DIRS={nexus-cut-dirs}
               NEXUS_REPO={nexus-snapshot-repo}
-      - shell: !include-raw-escape:
-          - ../shell/lftools-install.sh
-          - ../shell/maven-fetch-metadata.sh
+      - shell: !include-raw-escape: ../shell/maven-fetch-metadata.sh
       - lf-maven-build:
           mvn-goals: '{mvn-goals}'
       - lf-maven-deploy
@@ -622,6 +594,7 @@
           refspec: '$GERRIT_REFSPEC'
           branch: '$GERRIT_BRANCH'
           submodule-recursive: '{submodule-recursive}'
+          submodule-timeout: '{submodule-timeout}'
           choosing-strategy: default
 
     triggers:
@@ -653,13 +626,15 @@
     scm:
       - lf-infra-github-scm:
           url: '{git-clone-url}{github-org}/{project}'
-          refspec: '+refs/pull/*:refs/remotes/origin/pr/*'
-          branch: '{branch}'
+          refspec: ''
+          branch: 'refs/heads/{branch}'
           submodule-recursive: '{submodule-recursive}'
+          submodule-timeout: '{submodule-timeout}'
           choosing-strategy: default
           jenkins-ssh-credential: '{jenkins-ssh-credential}'
 
     triggers:
+      - timed: '{obj:cron}'
       - github
       - pollscm:
           cron: ''
@@ -667,7 +642,7 @@
           trigger-phrase: '^remerge$'
           only-trigger-phrase: true
           status-context: 'Maven Merge'
-          permit-all: false
+          permit-all: true
           github-hooks: true
           org-list:
             - '{github-org}'
@@ -677,12 +652,12 @@
             - '{branch}'
           included-regions: '{obj:github_included_regions}'
 
-#################
-# Maven Release #
-#################
+###############
+# Maven Stage #
+###############
 
-- lf_maven_release: &lf_maven_release
-    name: lf-maven-release
+- lf_maven_stage: &lf_maven_stage
+    name: lf-maven-stage
 
     ######################
     # Default parameters #
@@ -691,27 +666,54 @@
     branch: master
     build-days-to-keep: 30  # 30 days in case a release takes long to get approved.
     build-timeout: 60
-    cron: ''
+    cron: '@daily'
+    disable-job: false
     git-url: '$GIT_URL/$PROJECT'
     github-url: 'https://github.com'
     java-version: openjdk8
+    mvn-central: false
     mvn-global-settings: global-settings
     mvn-goals: clean deploy
     mvn-opts: ''
     mvn-params: ''
     mvn-version: mvn35
+    ossrh-profile-id: ''
+    sign-artifacts: false
     stream: master
     submodule-recursive: true
+    submodule-timeout: 10
 
     gerrit_release_triggers:
       - comment-added-contains-event:
-          comment-contains-value: build release$
+          comment-contains-value: stage-release$
 
     #####################
     # Job Configuration #
     #####################
 
+    disabled: '{disable-job}'
+
+    parameters:
+      - lf-infra-parameters:
+          project: '{project}'
+          branch: '{branch}'
+          stream: '{stream}'
+      - lf-infra-maven-parameters:
+          mvn-opts: '{mvn-opts}'
+          mvn-params: '{mvn-params}'
+          mvn-version: '{mvn-version}'
+          staging-profile-id: '{staging-profile-id}'
+      - string:
+          name: ARCHIVE_ARTIFACTS
+          default: '{archive-artifacts}'
+          description: Artifacts to archive to the logs server.
+      - string:
+          name: STAGING_PROFILE_ID
+          default: '{staging-profile-id}'
+          description: Nexus staging profile ID.
+
     builders:
+      - lf-infra-pre-build
       - lf-jacoco-nojava-workaround
       - lf-maven-install:
           mvn-version: '{mvn-version}'
@@ -720,22 +722,29 @@
       - lf-provide-maven-settings:
           global-settings-file: '{mvn-global-settings}'
           settings-file: '{mvn-settings}'
-      - lf-infra-create-netrc:
-          server-id: '{mvn-staging-id}'
-      - shell: !include-raw-escape:
-          - ../shell/lftools-install.sh
-          - ../shell/maven-patch-release.sh
+      - shell: !include-raw-escape: ../shell/maven-patch-release.sh
       - lf-maven-build:
           mvn-goals: '{mvn-goals}'
-      - lf-maven-stage
+      - lf-sigul-sign-dir:
+          sign-artifacts: '{sign-artifacts}'
+          sign-dir: '$WORKSPACE/m2repo'
+      - lf-maven-stage:
+          mvn-global-settings: '{mvn-global-settings}'
+          mvn-settings: '{mvn-settings}'
+          mvn-staging-id: '{mvn-staging-id}'
+      - lf-maven-central:
+          mvn-central: '{mvn-central}'
+          mvn-global-settings: '{mvn-global-settings}'
+          mvn-settings: '{mvn-settings}'
+          ossrh-profile-id: '{ossrh-profile-id}'
       - lf-provide-maven-settings-cleanup
 
 - job-template:
-    name: '{project-name}-maven-release-{stream}'
-    id: gerrit-maven-release
+    name: '{project-name}-maven-stage-{stream}'
+    id: gerrit-maven-stage
     <<: *lf_maven_common
     # yamllint disable-line rule:key-duplicates
-    <<: *lf_maven_release
+    <<: *lf_maven_stage
 
     scm:
       - lf-infra-gerrit-scm:
@@ -744,6 +753,7 @@
           refspec: '$GERRIT_REFSPEC'
           branch: '$GERRIT_BRANCH'
           submodule-recursive: '{submodule-recursive}'
+          submodule-timeout: '{submodule-timeout}'
           choosing-strategy: default
 
     triggers:
@@ -759,11 +769,11 @@
                   branch-pattern: '**/{branch}'
 
 - job-template:
-    name: '{project-name}-maven-release-{stream}'
-    id: github-maven-release
+    name: '{project-name}-maven-stage-{stream}'
+    id: github-maven-stage
     <<: *lf_maven_common
     # yamllint disable-line rule:key-duplicates
-    <<: *lf_maven_release
+    <<: *lf_maven_stage
 
     properties:
       - lf-infra-properties:
@@ -777,6 +787,7 @@
           refspec: '+refs/pull/*:refs/remotes/origin/pr/*'
           branch: '{branch}'
           submodule-recursive: '{submodule-recursive}'
+          submodule-timeout: '{submodule-timeout}'
           choosing-strategy: default
           jenkins-ssh-credential: '{jenkins-ssh-credential}'
 
@@ -806,6 +817,7 @@
     build-days-to-keep: 7
     build-timeout: 60
     cron: 'H H * * 6'  # run weekly
+    disable-job: false
     git-url: '$GIT_URL/$PROJECT'
     github-url: 'https://github.com'
     java-version: openjdk8
@@ -814,9 +826,9 @@
     mvn-params: ''
     mvn-version: mvn35
     sonar-mvn-goal: 'sonar:sonar'
-    staging-profile-id: ''  # Unused in this job
     stream: master
     submodule-recursive: true
+    submodule-timeout: 10
 
     gerrit_sonar_triggers:
       - comment-added-contains-event:
@@ -826,18 +838,17 @@
     # Job Configuration #
     #####################
 
+    disabled: '{disable-job}'
+
     parameters:
       - lf-infra-parameters:
           project: '{project}'
           branch: '{branch}'
           stream: '{stream}'
-          lftools-version: '{lftools-version}'
       - lf-infra-maven-parameters:
           mvn-opts: '{mvn-opts}'
           mvn-params: '{mvn-params}'
           mvn-version: '{mvn-version}'
-          # Staging repos do not make sense for Sonar jobs so set it blank.
-          staging-profile-id: ''
       - string:
           name: ARCHIVE_ARTIFACTS
           default: '{archive-artifacts}'
@@ -868,6 +879,7 @@
             notbuilt: true
 
     builders:
+      - lf-infra-pre-build
       - lf-infra-maven-sonar:
           java-version: '{java-version}'
           mvn-settings: '{mvn-settings}'
@@ -911,6 +923,7 @@
           refspec: $GERRIT_REFSPEC
           branch: $GERRIT_BRANCH
           submodule-recursive: '{submodule-recursive}'
+          submodule-timeout: '{submodule-timeout}'
           choosing-strategy: default
 
 - job-template:
@@ -932,16 +945,22 @@
           refspec: '+refs/pull/*:refs/remotes/origin/pr/*'
           branch: '$sha1'
           submodule-recursive: '{submodule-recursive}'
+          submodule-timeout: '{submodule-timeout}'
           choosing-strategy: default
           jenkins-ssh-credential: '{jenkins-ssh-credential}'
 
     triggers:
+      - timed: '{obj:cron}'
       - github-pull-request:
           trigger-phrase: '^run-sonar$'
-          only-trigger-phrase: false
+          only-trigger-phrase: true
           status-context: 'Maven Sonar'
           permit-all: true
           github-hooks: true
+          org-list:
+            - '{github-org}'
+          white-list: '{obj:github_pr_whitelist}'
+          admin-list: '{obj:github_pr_admin_list}'
           white-list-target-branches:
             - '{branch}'
 
@@ -959,6 +978,7 @@
     branch: master
     build-days-to-keep: 7
     build-timeout: 60
+    disable-job: false
     git-url: '$GIT_URL/$PROJECT'
     github-url: 'https://github.com'
     java-version: openjdk8
@@ -967,9 +987,9 @@
     mvn-opts: ''
     mvn-params: '-Dstream=$STREAM'
     mvn-version: mvn35
-    staging-profile-id: ''  # Unused in this job
     stream: master
     submodule-recursive: true
+    submodule-timeout: 10
 
     gerrit_verify_triggers:
       - patchset-created-event:
@@ -993,8 +1013,10 @@
     #####################
 
     concurrent: true
+    disabled: '{disable-job}'
 
     builders:
+      - lf-infra-pre-build
       - lf-jacoco-nojava-workaround
       - lf-maven-install:
           mvn-version: '{mvn-version}'
@@ -1003,8 +1025,6 @@
       - lf-provide-maven-settings:
           global-settings-file: '{mvn-global-settings}'
           settings-file: '{mvn-settings}'
-      - shell: !include-raw-escape:
-          - ../shell/lftools-install.sh
       - lf-maven-build:
           mvn-goals: '{mvn-goals}'
       - lf-provide-maven-settings-cleanup
@@ -1028,6 +1048,7 @@
           refspec: '$GERRIT_REFSPEC'
           branch: '$GERRIT_BRANCH'
           submodule-recursive: '{submodule-recursive}'
+          submodule-timeout: '{submodule-timeout}'
           choosing-strategy: gerrit
 
     triggers:
@@ -1061,6 +1082,7 @@
           refspec: '+refs/pull/*:refs/remotes/origin/pr/*'
           branch: '$sha1'
           submodule-recursive: '{submodule-recursive}'
+          submodule-timeout: '{submodule-timeout}'
           choosing-strategy: default
           jenkins-ssh-credential: '{jenkins-ssh-credential}'
 
@@ -1089,6 +1111,7 @@
     branch: master
     build-days-to-keep: 7
     build-timeout: 60
+    disable-job: false
     git-url: '$GIT_URL/$PROJECT'
     github-url: 'https://github.com'
     java-version: openjdk8
@@ -1097,9 +1120,9 @@
     mvn-opts: ''
     mvn-params: '-Dstream=$STREAM'
     mvn-version: mvn35
-    staging-profile-id: ''  # Unused by this job
     stream: master
     submodule-recursive: true
+    submodule-timeout: 10
 
     gerrit_verify_triggers:
       - comment-added-contains-event:
@@ -1113,8 +1136,10 @@
     #####################
 
     concurrent: true
+    disabled: '{disable-job}'
 
     builders:
+      - lf-infra-pre-build
       - lf-jacoco-nojava-workaround
       - lf-maven-install:
           mvn-version: '{mvn-version}'
@@ -1150,6 +1175,7 @@
           refspec: '$GERRIT_REFSPEC'
           branch: '$GERRIT_BRANCH'
           submodule-recursive: '{submodule-recursive}'
+          submodule-timeout: '{submodule-timeout}'
           choosing-strategy: gerrit
 
     triggers: