Merge "Refactor staging-profile-id out of mvn-parameters"

diff --combined jjb/lf-macros.yaml
index 6f77339,9db7dc3..16cd33c
--- 1/jjb/lf-macros.yaml
--- 2/jjb/lf-macros.yaml
+++ b/jjb/lf-macros.yaml
@@@ -181,7 -181,7 +181,7 @@@
                variable: SIGUL_PASSWORD
              - file-id: sigul-pki
                variable: SIGUL_PKI
 -      - shell: !include-raw-escape: ../shell/sigul-configuration.sh
 +      - shell: !include-raw: ../shell/sigul-configuration.sh
  
  - builder:
      name: lf-pip-install
@@@ -211,7 -211,7 +211,7 @@@
      name: lf-provide-sigul-configuration-cleanup
      # Clear sigul configuration files after we're done using them
      builders:
 -      - shell: !include-raw-escape: ../shell/sigul-configuration-cleanup.sh
 +      - shell: !include-raw: ../shell/sigul-configuration-cleanup.sh
  
  - builder:
      name: lf-rtd-trigger-build
@@@ -235,8 -235,8 +235,8 @@@
      name: lf-sigul-install
      # Requires that Jenkins be configured with SIGUL_BRIDGE_IP as a global
      # Environment variable
 -    builder:
 -      - shell: !include-raw-escape: ../shell/sigul-install.sh
 +    builders:
 +      - shell: !include-raw: ../shell/sigul-install.sh
  
  - builder:
      name: lf-infra-provide-docker-cleanup
@@@ -310,12 -310,6 +310,6 @@@
            # yamllint disable-line rule:line-length
            default: '/w/tools/hudson.tasks.Maven_MavenInstallation/{mvn-version}/bin/mvn'
            description: 'Maven selector to be used by shell scripts'
-       - string:
-           name: STAGING_PROFILE_ID
-           default: '{staging-profile-id}'
-           description: |
-               Nexus staging profile ID.
- 
  
  - parameter:
      name: lf-infra-openstack-parameters

diff --combined jjb/lf-maven-jobs.yaml
index 0c02f3d,0b2a20d..61fc2b9
--- 1/jjb/lf-maven-jobs.yaml
--- 2/jjb/lf-maven-jobs.yaml
+++ b/jjb/lf-maven-jobs.yaml
@@@ -128,8 -128,6 +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}'
@@@ -169,7 -167,6 +167,6 @@@
      mvn-params: ''
      mvn-version: mvn35
      nexus-iq-stage: 'build'
-     staging-profile-id: ''  # Unused in this job
      stream: master
      submodule-recursive: true
  
@@@ -194,8 -191,6 +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}'
@@@ -320,7 -315,6 +315,6 @@@
      mvn-opts: ''
      mvn-params: ''
      mvn-version: mvn35
-     staging-profile-id: ''  # Unused by the javadoc jobs
      stream: master
      submodule-recursive: true
  
@@@ -441,7 -435,6 +435,6 @@@
      mvn-opts: ''
      mvn-params: ''
      mvn-version: mvn35
-     staging-profile-id: ''  # Unused by the javadoc jobs
      stream: master
      submodule-recursive: true
  
@@@ -546,7 -539,7 +539,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
@@@ -556,7 -549,6 +549,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
  
@@@ -660,7 -652,6 +652,7 @@@
            jenkins-ssh-credential: '{jenkins-ssh-credential}'
  
      triggers:
 +      - timed: '{obj:cron}'
        - github
        - pollscm:
            cron: ''
@@@ -692,7 -683,7 +684,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
@@@ -712,6 -703,26 +704,26 @@@
      # 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:
@@@ -815,7 -826,6 +827,6 @@@
      mvn-params: ''
      mvn-version: mvn35
      sonar-mvn-goal: 'sonar:sonar'
-     staging-profile-id: ''  # Unused in this job
      stream: master
      submodule-recursive: true
  
@@@ -837,8 -847,6 +848,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}'
@@@ -968,7 -976,6 +977,6 @@@
      mvn-opts: ''
      mvn-params: '-Dstream=$STREAM'
      mvn-version: mvn35
-     staging-profile-id: ''  # Unused in this job
      stream: master
      submodule-recursive: true
  
@@@ -1098,7 -1105,6 +1106,6 @@@
      mvn-opts: ''
      mvn-params: '-Dstream=$STREAM'
      mvn-version: mvn35
-     staging-profile-id: ''  # Unused by this job
      stream: master
      submodule-recursive: true