From 2d0e35ec2fdbca31583674345cf1b72bf20997d8 Mon Sep 17 00:00:00 2001 From: Andrew Grimberg Date: Wed, 31 May 2017 15:39:15 -0700 Subject: [PATCH] All macros should be namespaced to lf-infra- Fixes create-netrc and gpg-verify-git-signature to be namespaced into lf-infra- as all of the macros should be so that we can more easily bring over current macros that projects may have that make sense in a global sense without stomping on current definitions. This will allow us to more gradually migrate onto global macros when it makes sense. Change-Id: I419468cc5826490736b94d1f3f2041f11f0b9470 Signed-off-by: Andrew Grimberg --- jjb/lf-ci-jobs.yaml | 2 +- jjb/lf-macros.yaml | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/jjb/lf-ci-jobs.yaml b/jjb/lf-ci-jobs.yaml index 03db349c..0c9bbee5 100644 --- a/jjb/lf-ci-jobs.yaml +++ b/jjb/lf-ci-jobs.yaml @@ -60,7 +60,7 @@ - ../shell/jjb-install.sh - ../shell/jjb-verify-job.sh - ../shell/jjb-check-unicode.sh - - gpg-verify-git-signature + - lf-infra-gpg-verify-git-signature - parameter: name: lf-infra-jjb-parameters diff --git a/jjb/lf-macros.yaml b/jjb/lf-macros.yaml index e9b1b643..4c00ae38 100644 --- a/jjb/lf-macros.yaml +++ b/jjb/lf-macros.yaml @@ -1,6 +1,6 @@ --- - builder: - name: create-netrc + name: lf-infra-create-netrc # Macro to create a ~/.netrc file from a Maven settings.xml # Parameters: # {server-id} The id of a server as defined in settings.xml @@ -10,7 +10,7 @@ - shell: !include-raw-escape: ../shell/create-netrc.sh - builder: - name: gpg-verify-git-signature + name: lf-infra-gpg-verify-git-signature # Verify gpg signature of the latest commit message in $WORKSPACE # # This command assumes that $WORKSPACE is a git repo. @@ -29,7 +29,7 @@ files: - file-id: 'jenkins-log-archives-settings' variable: 'SETTINGS_FILE' - - create-netrc: + - lf-infra-create-netrc: server-id: logs - shell: !include-raw: - ../shell/lftools-install.sh -- 2.16.6