From fb6c63eac293087b5050c3aa574abe132a1838d6 Mon Sep 17 00:00:00 2001 From: Sean McGinnis Date: Wed, 22 Nov 2017 09:47:56 -0600 Subject: [PATCH] Update upload-npm credentials secret This job was using npm_info as the name for the credentials secrets, but it is actually named npm_credentials. Updating all references to use the correct variable name. Change-Id: I2959ec788ffa39e32e66caf3a3a16c2441636a51 --- roles/upload-npm/README.rst | 2 +- roles/upload-npm/defaults/main.yaml | 2 +- roles/upload-npm/templates/.npmrc.j2 | 12 ++++++------ 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/roles/upload-npm/README.rst b/roles/upload-npm/README.rst index 2b0f00f0d..4d5260e84 100644 --- a/roles/upload-npm/README.rst +++ b/roles/upload-npm/README.rst @@ -2,7 +2,7 @@ Upload javascript packages to npm **Role Variables** -.. zuul:rolevar:: npm_info +.. zuul:rolevar:: npm_credentials Complex argument which contains the information about the npm server as well as the authentication information needed. diff --git a/roles/upload-npm/defaults/main.yaml b/roles/upload-npm/defaults/main.yaml index 49998a283..f94df3885 100644 --- a/roles/upload-npm/defaults/main.yaml +++ b/roles/upload-npm/defaults/main.yaml @@ -1 +1 @@ -npm_registry_url: "{{ npm_info.registry_url|default('//registry.npmjs.org') }}" +npm_registry_url: "{{ npm_credentials.registry_url|default('//registry.npmjs.org') }}" diff --git a/roles/upload-npm/templates/.npmrc.j2 b/roles/upload-npm/templates/.npmrc.j2 index 01ed2e2da..572273211 100644 --- a/roles/upload-npm/templates/.npmrc.j2 +++ b/roles/upload-npm/templates/.npmrc.j2 @@ -1,10 +1,10 @@ -init.author.name={{ npm_info.author_name }} -init.author.email={{ npm_info.author_email }} -init.author.url={{ npm_info.author_url }} +init.author.name={{ npm_credentials.author_name }} +init.author.email={{ npm_credentials.author_email }} +init.author.url={{ npm_credentials.author_url }} tag-version-prefix= sign-git-tag=true -//registry.npmjs.org/:username={{ npm_info.username }} -//registry.npmjs.org/:_password={{ npm_info.password }} +//registry.npmjs.org/:username={{ npm_credentials.username }} +//registry.npmjs.org/:_password={{ npm_credentials.password }} -//registry.npmjs.org/:email={{ npm_info.author_email }} +//registry.npmjs.org/:email={{ npm_credentials.author_email }}