From 8f6f9fe4beef3c73cd124d2177423d7ef996224c Mon Sep 17 00:00:00 2001 From: Thanh Ha Date: Thu, 28 Sep 2017 13:34:36 -0400 Subject: [PATCH] DO NOT hardcode mvn staging server id This needs to be configured in defaults.yaml to get the right one. Change-Id: I8d54118999eb912c3074c4bb2f9b5237bea93ebe Signed-off-by: Thanh Ha --- .jjb-test/defaults.yaml | 1 + .jjb-test/expected-xml/gerrit-maven-maven-release-master | 2 +- .jjb-test/expected-xml/github-maven-maven-release-master | 2 +- README.md | 3 +++ jjb/lf-maven-jobs.yaml | 16 +++++++++------- 5 files changed, 15 insertions(+), 9 deletions(-) diff --git a/.jjb-test/defaults.yaml b/.jjb-test/defaults.yaml index 9991f8bf..4a7a3bb7 100644 --- a/.jjb-test/defaults.yaml +++ b/.jjb-test/defaults.yaml @@ -21,6 +21,7 @@ lftools-version: '<1.0.0' mvn-site-id: project-site + mvn-staging-id: project-staging # Common test config project: releng/ciman diff --git a/.jjb-test/expected-xml/gerrit-maven-maven-release-master b/.jjb-test/expected-xml/gerrit-maven-maven-release-master index 191c7810..dd64963c 100644 --- a/.jjb-test/expected-xml/gerrit-maven-maven-release-master +++ b/.jjb-test/expected-xml/gerrit-maven-maven-release-master @@ -224,7 +224,7 @@ For example '<1.0.0' or '>=1.0.0,<2.0.0'. - SERVER_ID=opendaylight-staging + SERVER_ID=project-staging diff --git a/.jjb-test/expected-xml/github-maven-maven-release-master b/.jjb-test/expected-xml/github-maven-maven-release-master index d41076e5..ca84180b 100644 --- a/.jjb-test/expected-xml/github-maven-maven-release-master +++ b/.jjb-test/expected-xml/github-maven-maven-release-master @@ -192,7 +192,7 @@ For example '<1.0.0' or '>=1.0.0,<2.0.0'. - SERVER_ID=opendaylight-staging + SERVER_ID=project-staging diff --git a/README.md b/README.md index 180c7e95..8745cf8a 100644 --- a/README.md +++ b/README.md @@ -113,6 +113,9 @@ For example `<1.0.0` or `>=1.0.0,<2.0.0`. **mvn-site-id**: Maven Server ID from settings.xml containing the credentials to push to a Maven site repository. +**mvn-staging-id**: Maven Server ID from settings.xml containing the credentials +to push to a Maven staging repository. + defaults.yaml: ``` diff --git a/jjb/lf-maven-jobs.yaml b/jjb/lf-maven-jobs.yaml index 247aaeb0..452b839c 100644 --- a/jjb/lf-maven-jobs.yaml +++ b/jjb/lf-maven-jobs.yaml @@ -473,12 +473,14 @@ # 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. @@ -517,7 +519,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 -- 2.16.6