Merge "DO NOT hardcode mvn staging server id"

diff --combined .jjb-test/expected-xml/gerrit-maven-maven-release-master
index 20d417a,dd64963..4e72be7
--- 1/.jjb-test/expected-xml/gerrit-maven-maven-release-master
--- 2/.jjb-test/expected-xml/gerrit-maven-maven-release-master
+++ b/.jjb-test/expected-xml/gerrit-maven-maven-release-master
@@@ -144,9 -144,6 +144,9 @@@ For example '<1.0.0' or '>=1.0.0,
      </extensions>
    </scm>
    <triggers class="vector">
 +    <hudson.triggers.TimerTrigger>
 +      <spec/>
 +    </hudson.triggers.TimerTrigger>
      <com.sonyericsson.hudson.plugins.gerrit.trigger.hudsontrigger.GerritTrigger>
        <spec/>
        <gerritProjects>
@@@ -227,7 -224,7 +227,7 @@@
      </org.jenkinsci.plugins.configfiles.builder.ConfigFileBuildStep>
      <EnvInjectBuilder>
        <info>
-         <propertiesContent>SERVER_ID=opendaylight-staging</propertiesContent>
+         <propertiesContent>SERVER_ID=project-staging</propertiesContent>
        </info>
      </EnvInjectBuilder>
      <hudson.tasks.Shell>

diff --combined .jjb-test/expected-xml/github-maven-maven-release-master
index 401a1bf,ca84180..d36ee34
--- 1/.jjb-test/expected-xml/github-maven-maven-release-master
--- 2/.jjb-test/expected-xml/github-maven-maven-release-master
+++ b/.jjb-test/expected-xml/github-maven-maven-release-master
@@@ -139,9 -139,6 +139,9 @@@ For example '<1.0.0' or '>=1.0.0,
      </extensions>
    </scm>
    <triggers class="vector">
 +    <hudson.triggers.TimerTrigger>
 +      <spec/>
 +    </hudson.triggers.TimerTrigger>
      <org.jenkinsci.plugins.ghprb.GhprbTrigger>
        <spec/>
        <adminlist/>
@@@ -195,7 -192,7 +195,7 @@@
      </org.jenkinsci.plugins.configfiles.builder.ConfigFileBuildStep>
      <EnvInjectBuilder>
        <info>
-         <propertiesContent>SERVER_ID=opendaylight-staging</propertiesContent>
+         <propertiesContent>SERVER_ID=project-staging</propertiesContent>
        </info>
      </EnvInjectBuilder>
      <hudson.tasks.Shell>

diff --combined jjb/lf-maven-jobs.yaml
index be9004e,452b839..66ce41d
--- 1/jjb/lf-maven-jobs.yaml
--- 2/jjb/lf-maven-jobs.yaml
+++ b/jjb/lf-maven-jobs.yaml
@@@ -473,20 -473,19 +473,22 @@@
      # directory can then be reused later to deploy to Nexus.
      #
      # Required parameters:
-     #     build-node:    The node to run build on.
-     #     jenkins-ssh-credential: Credential to use for SSH. (Generally should
-     #                             be configured in defaults.yaml)
-     #     mvn-settings: The name of settings file containing credentials for
-     #                   the project.
-     #     staging-profile-id: Profile ID of the project's Nexus staging profile.
+     #     :build-node: The node to run build on.
+     #     :jenkins-ssh-credential: Credential to use for SSH. (Generally should
+     #                              be configured in defaults.yaml)
+     #     :mvn-settings: The name of settings file containing credentials for
+     #                    the project.
+     #     :mvn-staging-id: Maven Server ID from settings.xml to pull credentials from.
+     #         (Note: This setting should be configured in defaults.yaml.)
+     #     :staging-profile-id: Profile ID of the project's Nexus staging profile.
      #
      # Optional parameters:
      #     :gerrit_verify_triggers: Override Gerrit Triggers.
      #     :mvn-global-settings: The name of the Maven global settings to use for
      #                           Maven configuration. (default: global-settings)
 +    #     :cron: Cron schedule when to trigger the job. This parameter also
 +    #         supports multiline input via YAML pipe | character in cases where
 +    #         one may want to provide more than 1 cron timer. (default: '')
  
      ######################
      # Default parameters #
@@@ -503,7 -502,6 +505,7 @@@
      mvn-version: mvn33
      stream: master
      submodule-recursive: true
 +    cron: ''
  
      gerrit_release_triggers:
        - comment-added-contains-event:
@@@ -521,7 -519,7 +523,7 @@@
            global-settings-file: '{mvn-global-settings}'
            settings-file: '{mvn-settings}'
        - lf-infra-create-netrc:
-           server-id: opendaylight-staging
+           server-id: '{mvn-staging-id}'
        - shell: !include-raw-escape:
            - ../shell/lftools-install.sh
            - ../shell/common-variables.sh
@@@ -547,7 -545,6 +549,7 @@@
            choosing-strategy: default
  
      triggers:
 +      - timed: '{obj:cron}'
        - gerrit:
            server-name: '{gerrit-server-name}'
            trigger-on: '{obj:gerrit_release_triggers}'
@@@ -579,7 -576,6 +581,7 @@@
            jenkins-ssh-credential: '{jenkins-ssh-credential}'
  
      triggers:
 +      - timed: '{obj:cron}'
        - lf-infra-github-pr-trigger:
            trigger-phrase: '^build release$'
            only-trigger-phrase: true