Merge "Disable CLM jobs by default"

diff --combined jjb/lf-maven-jobs.yaml
index 745423a,b1b4205..57cec94
--- 1/jjb/lf-maven-jobs.yaml
--- 2/jjb/lf-maven-jobs.yaml
+++ b/jjb/lf-maven-jobs.yaml
@@@ -11,7 -11,7 +11,7 @@@
      jobs:
        - gerrit-maven-clm
        - gerrit-maven-merge
 -      - gerrit-maven-release
 +      - gerrit-maven-stage
        - gerrit-maven-verify
        - gerrit-maven-verify-dependencies
  
@@@ -25,7 -25,7 +25,7 @@@
      jobs:
        - github-maven-clm
        - github-maven-merge
 -      - github-maven-release
 +      - github-maven-stage
        - github-maven-verify
  
  - job-group:
@@@ -128,6 -128,8 +128,6 @@@
            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}'
@@@ -167,6 -169,7 +167,6 @@@
      mvn-params: ''
      mvn-version: mvn35
      nexus-iq-stage: 'build'
 -    staging-profile-id: ''  # Unused in this job
      stream: master
      submodule-recursive: true
  
@@@ -191,6 -194,8 +191,6 @@@
            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}'
@@@ -229,6 -234,7 +229,7 @@@
      # yamllint disable-line rule:key-duplicates
      <<: *lf_maven_clm
  
+     disabled: true
      scm:
        - lf-infra-gerrit-scm:
            jenkins-ssh-credential: '{jenkins-ssh-credential}'
@@@ -263,6 -269,7 +264,7 @@@
      # yamllint disable-line rule:key-duplicates
      <<: *lf_maven_clm
  
+     disabled: true
      properties:
        - lf-infra-properties:
            build-days-to-keep: '{build-days-to-keep}'
@@@ -315,6 -322,7 +317,6 @@@
      mvn-opts: ''
      mvn-params: ''
      mvn-version: mvn35
 -    staging-profile-id: ''  # Unused by the javadoc jobs
      stream: master
      submodule-recursive: true
  
@@@ -405,7 -413,7 +407,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}'
@@@ -435,6 -443,7 +437,6 @@@
      mvn-opts: ''
      mvn-params: ''
      mvn-version: mvn35
 -    staging-profile-id: ''  # Unused by the javadoc jobs
      stream: master
      submodule-recursive: true
  
@@@ -539,7 -548,7 +541,7 @@@
      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'
      git-url: '$GIT_URL/$PROJECT'
      github-url: 'https://github.com'
      java-version: openjdk8
@@@ -549,6 -558,7 +551,6 @@@
      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
  
@@@ -652,7 -662,6 +654,7 @@@
            jenkins-ssh-credential: '{jenkins-ssh-credential}'
  
      triggers:
 +      - timed: '{obj:cron}'
        - github
        - pollscm:
            cron: ''
@@@ -660,7 -669,7 +662,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}'
@@@ -670,12 -679,12 +672,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 #
@@@ -684,7 -693,7 +686,7 @@@
      branch: master
      build-days-to-keep: 30  # 30 days in case a release takes long to get approved.
      build-timeout: 60
 -    cron: ''
 +    cron: '@daily'
      git-url: '$GIT_URL/$PROJECT'
      github-url: 'https://github.com'
      java-version: openjdk8
@@@ -698,32 -707,12 +700,32 @@@
  
      gerrit_release_triggers:
        - comment-added-contains-event:
 -          comment-contains-value: build release$
 +          comment-contains-value: stage-release$
  
      #####################
      # Job Configuration #
      #####################
  
 +    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-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-jacoco-nojava-workaround
        - lf-maven-install:
@@@ -744,11 -733,11 +746,11 @@@
        - 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:
@@@ -772,11 -761,11 +774,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:
@@@ -827,6 -816,7 +829,6 @@@
      mvn-params: ''
      mvn-version: mvn35
      sonar-mvn-goal: 'sonar:sonar'
 -    staging-profile-id: ''  # Unused in this job
      stream: master
      submodule-recursive: true
  
@@@ -848,6 -838,8 +850,6 @@@
            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}'
@@@ -977,6 -969,7 +979,6 @@@
      mvn-opts: ''
      mvn-params: '-Dstream=$STREAM'
      mvn-version: mvn35
 -    staging-profile-id: ''  # Unused in this job
      stream: master
      submodule-recursive: true
  
@@@ -1106,6 -1099,7 +1108,6 @@@
      mvn-opts: ''
      mvn-params: '-Dstream=$STREAM'
      mvn-version: mvn35
 -    staging-profile-id: ''  # Unused by this job
      stream: master
      submodule-recursive: true
  

diff --combined jjb/lf-python-jobs.yaml
index a191c09,c1fd50b..c5f67fe
--- 1/jjb/lf-python-jobs.yaml
--- 2/jjb/lf-python-jobs.yaml
+++ b/jjb/lf-python-jobs.yaml
@@@ -96,6 -96,7 +96,6 @@@
      github-url: 'https://github.com'
      java-version: openjdk8
      nexus-iq-cli-version: 1.44.0-01
 -    staging-profile-id: ''  # Unused in this job
      stream: master
      submodule-recursive: true
  
@@@ -141,6 -142,7 +141,7 @@@
      # yamllint disable-line rule:key-duplicates
      <<: *lf_python_xc_clm
  
+     disabled: true
      ######################
      # Default parameters #
      ######################
@@@ -188,6 -190,7 +189,7 @@@
      # yamllint disable-line rule:key-duplicates
      <<: *lf_python_xc_clm
  
+     disabled: true
      properties:
        - lf-infra-properties:
            build-days-to-keep: '{build-days-to-keep}'