From f2d509dec375118ad366e929930b0716132850c3 Mon Sep 17 00:00:00 2001 From: Jeremy Phelps Date: Wed, 18 Oct 2017 12:55:14 -0500 Subject: [PATCH] Add npmrc config file to lf-infra-wrappers Change-Id: I2bafb9a9787f6820243e1ee19861fb8fc45670d7 Signed-off-by: Jeremy Phelps --- .../expected-xml/gerrit-ciman-gerrit-branch-lock-master | 9 +++++++++ .jjb-test/expected-xml/gerrit-ciman-jjb-deploy-job | 9 +++++++++ .jjb-test/expected-xml/gerrit-ciman-jjb-merge | 9 +++++++++ .jjb-test/expected-xml/gerrit-ciman-jjb-verify | 9 +++++++++ .../gerrit-ciman-packer-merge-centos-java-builder | 9 +++++++++ .../expected-xml/gerrit-ciman-packer-merge-centos-mininet | 9 +++++++++ .../gerrit-ciman-packer-merge-ubuntu1604-java-builder | 9 +++++++++ .../gerrit-ciman-packer-merge-ubuntu1604-mininet | 9 +++++++++ .jjb-test/expected-xml/gerrit-ciman-packer-verify | 9 +++++++++ .jjb-test/expected-xml/gerrit-maven-maven-clm-master | 9 +++++++++ .../expected-xml/gerrit-maven-maven-javadoc-publish-master | 9 +++++++++ .../expected-xml/gerrit-maven-maven-javadoc-verify-master | 9 +++++++++ .jjb-test/expected-xml/gerrit-maven-maven-release-master | 9 +++++++++ .../gerrit-maven-maven-verify-deps-master-mvn33-openjdk8 | 9 +++++++++ .../gerrit-maven-maven-verify-master-mvn33-openjdk8 | 9 +++++++++ .jjb-test/expected-xml/gerrit-maven-sonar | 9 +++++++++ .jjb-test/expected-xml/gerrit-node-node-verify-master | 9 +++++++++ .jjb-test/expected-xml/gerrit-python-tox-verify-master | 9 +++++++++ .jjb-test/expected-xml/gerrit-rtd-rtd-merge-master | 9 +++++++++ .jjb-test/expected-xml/gerrit-rtd-rtd-verify-master | 9 +++++++++ .jjb-test/expected-xml/github-ciman-jjb-deploy-job | 9 +++++++++ .jjb-test/expected-xml/github-ciman-jjb-merge | 9 +++++++++ .jjb-test/expected-xml/github-ciman-jjb-verify | 9 +++++++++ .../github-ciman-packer-merge-centos-java-builder | 9 +++++++++ .../expected-xml/github-ciman-packer-merge-centos-mininet | 9 +++++++++ .../github-ciman-packer-merge-ubuntu1604-java-builder | 9 +++++++++ .../github-ciman-packer-merge-ubuntu1604-mininet | 9 +++++++++ .jjb-test/expected-xml/github-ciman-packer-verify | 9 +++++++++ .jjb-test/expected-xml/github-maven-maven-clm-master | 9 +++++++++ .../expected-xml/github-maven-maven-javadoc-publish-master | 9 +++++++++ .../expected-xml/github-maven-maven-javadoc-verify-master | 9 +++++++++ .jjb-test/expected-xml/github-maven-maven-release-master | 9 +++++++++ .../github-maven-maven-verify-master-mvn33-openjdk8 | 9 +++++++++ .jjb-test/expected-xml/github-maven-sonar | 9 +++++++++ .jjb-test/expected-xml/github-node-node-verify-master | 9 +++++++++ .jjb-test/expected-xml/github-python-tox-verify-master | 9 +++++++++ .jjb-test/expected-xml/github-rtd-rtd-merge-master | 9 +++++++++ .jjb-test/expected-xml/github-rtd-rtd-verify-master | 9 +++++++++ docs/jjb/lf-macros.rst | 12 ++++++++++++ jjb/lf-macros.yaml | 4 ++++ 40 files changed, 358 insertions(+) diff --git a/.jjb-test/expected-xml/gerrit-ciman-gerrit-branch-lock-master b/.jjb-test/expected-xml/gerrit-ciman-gerrit-branch-lock-master index f998ddd4..409fdea7 100644 --- a/.jjb-test/expected-xml/gerrit-ciman-gerrit-branch-lock-master +++ b/.jjb-test/expected-xml/gerrit-ciman-gerrit-branch-lock-master @@ -513,5 +513,14 @@ rm ~/.netrc test-credential + + + + npmrc + $HOME/.npmrc + + + + diff --git a/.jjb-test/expected-xml/gerrit-ciman-jjb-deploy-job b/.jjb-test/expected-xml/gerrit-ciman-jjb-deploy-job index 9b854241..39e19a14 100644 --- a/.jjb-test/expected-xml/gerrit-ciman-jjb-deploy-job +++ b/.jjb-test/expected-xml/gerrit-ciman-jjb-deploy-job @@ -535,5 +535,14 @@ rm ~/.netrc test-credential + + + + npmrc + $HOME/.npmrc + + + + diff --git a/.jjb-test/expected-xml/gerrit-ciman-jjb-merge b/.jjb-test/expected-xml/gerrit-ciman-jjb-merge index 894845b0..331a63e5 100644 --- a/.jjb-test/expected-xml/gerrit-ciman-jjb-merge +++ b/.jjb-test/expected-xml/gerrit-ciman-jjb-merge @@ -519,5 +519,14 @@ rm ~/.netrc test-credential + + + + npmrc + $HOME/.npmrc + + + + diff --git a/.jjb-test/expected-xml/gerrit-ciman-jjb-verify b/.jjb-test/expected-xml/gerrit-ciman-jjb-verify index 9b1b0169..6eaafdc2 100644 --- a/.jjb-test/expected-xml/gerrit-ciman-jjb-verify +++ b/.jjb-test/expected-xml/gerrit-ciman-jjb-verify @@ -612,5 +612,14 @@ rm ~/.netrc test-credential + + + + npmrc + $HOME/.npmrc + + + + diff --git a/.jjb-test/expected-xml/gerrit-ciman-packer-merge-centos-java-builder b/.jjb-test/expected-xml/gerrit-ciman-packer-merge-centos-java-builder index 9a20567f..33f7fa44 100644 --- a/.jjb-test/expected-xml/gerrit-ciman-packer-merge-centos-java-builder +++ b/.jjb-test/expected-xml/gerrit-ciman-packer-merge-centos-java-builder @@ -692,5 +692,14 @@ rm ~/.netrc test-credential + + + + npmrc + $HOME/.npmrc + + + + diff --git a/.jjb-test/expected-xml/gerrit-ciman-packer-merge-centos-mininet b/.jjb-test/expected-xml/gerrit-ciman-packer-merge-centos-mininet index 9048101d..dbf71106 100644 --- a/.jjb-test/expected-xml/gerrit-ciman-packer-merge-centos-mininet +++ b/.jjb-test/expected-xml/gerrit-ciman-packer-merge-centos-mininet @@ -692,5 +692,14 @@ rm ~/.netrc test-credential + + + + npmrc + $HOME/.npmrc + + + + diff --git a/.jjb-test/expected-xml/gerrit-ciman-packer-merge-ubuntu1604-java-builder b/.jjb-test/expected-xml/gerrit-ciman-packer-merge-ubuntu1604-java-builder index 2e2b8c80..4172fb6d 100644 --- a/.jjb-test/expected-xml/gerrit-ciman-packer-merge-ubuntu1604-java-builder +++ b/.jjb-test/expected-xml/gerrit-ciman-packer-merge-ubuntu1604-java-builder @@ -692,5 +692,14 @@ rm ~/.netrc test-credential + + + + npmrc + $HOME/.npmrc + + + + diff --git a/.jjb-test/expected-xml/gerrit-ciman-packer-merge-ubuntu1604-mininet b/.jjb-test/expected-xml/gerrit-ciman-packer-merge-ubuntu1604-mininet index a1272aa8..2ae79f6e 100644 --- a/.jjb-test/expected-xml/gerrit-ciman-packer-merge-ubuntu1604-mininet +++ b/.jjb-test/expected-xml/gerrit-ciman-packer-merge-ubuntu1604-mininet @@ -692,5 +692,14 @@ rm ~/.netrc test-credential + + + + npmrc + $HOME/.npmrc + + + + diff --git a/.jjb-test/expected-xml/gerrit-ciman-packer-verify b/.jjb-test/expected-xml/gerrit-ciman-packer-verify index 4c36a20a..9ae4fa2c 100644 --- a/.jjb-test/expected-xml/gerrit-ciman-packer-verify +++ b/.jjb-test/expected-xml/gerrit-ciman-packer-verify @@ -582,5 +582,14 @@ rm ~/.netrc test-credential + + + + npmrc + $HOME/.npmrc + + + + diff --git a/.jjb-test/expected-xml/gerrit-maven-maven-clm-master b/.jjb-test/expected-xml/gerrit-maven-maven-clm-master index afecea1e..c1934551 100644 --- a/.jjb-test/expected-xml/gerrit-maven-maven-clm-master +++ b/.jjb-test/expected-xml/gerrit-maven-maven-clm-master @@ -547,5 +547,14 @@ rm ~/.netrc test-credential + + + + npmrc + $HOME/.npmrc + + + + diff --git a/.jjb-test/expected-xml/gerrit-maven-maven-javadoc-publish-master b/.jjb-test/expected-xml/gerrit-maven-maven-javadoc-publish-master index 23fbcb8e..00ccd3ff 100644 --- a/.jjb-test/expected-xml/gerrit-maven-maven-javadoc-publish-master +++ b/.jjb-test/expected-xml/gerrit-maven-maven-javadoc-publish-master @@ -726,5 +726,14 @@ rm ~/.netrc test-credential + + + + npmrc + $HOME/.npmrc + + + + diff --git a/.jjb-test/expected-xml/gerrit-maven-maven-javadoc-verify-master b/.jjb-test/expected-xml/gerrit-maven-maven-javadoc-verify-master index 8f16a851..5967d963 100644 --- a/.jjb-test/expected-xml/gerrit-maven-maven-javadoc-verify-master +++ b/.jjb-test/expected-xml/gerrit-maven-maven-javadoc-verify-master @@ -580,5 +580,14 @@ rm ~/.netrc test-credential + + + + npmrc + $HOME/.npmrc + + + + diff --git a/.jjb-test/expected-xml/gerrit-maven-maven-release-master b/.jjb-test/expected-xml/gerrit-maven-maven-release-master index d59ba51d..e8b47a16 100644 --- a/.jjb-test/expected-xml/gerrit-maven-maven-release-master +++ b/.jjb-test/expected-xml/gerrit-maven-maven-release-master @@ -756,5 +756,14 @@ rm ~/.netrc test-credential + + + + npmrc + $HOME/.npmrc + + + + diff --git a/.jjb-test/expected-xml/gerrit-maven-maven-verify-deps-master-mvn33-openjdk8 b/.jjb-test/expected-xml/gerrit-maven-maven-verify-deps-master-mvn33-openjdk8 index 7672c45f..c9f38b13 100644 --- a/.jjb-test/expected-xml/gerrit-maven-maven-verify-deps-master-mvn33-openjdk8 +++ b/.jjb-test/expected-xml/gerrit-maven-maven-verify-deps-master-mvn33-openjdk8 @@ -741,5 +741,14 @@ rm ~/.netrc test-credential + + + + npmrc + $HOME/.npmrc + + + + diff --git a/.jjb-test/expected-xml/gerrit-maven-maven-verify-master-mvn33-openjdk8 b/.jjb-test/expected-xml/gerrit-maven-maven-verify-master-mvn33-openjdk8 index 5476c090..451ed716 100644 --- a/.jjb-test/expected-xml/gerrit-maven-maven-verify-master-mvn33-openjdk8 +++ b/.jjb-test/expected-xml/gerrit-maven-maven-verify-master-mvn33-openjdk8 @@ -712,5 +712,14 @@ rm ~/.netrc test-credential + + + + npmrc + $HOME/.npmrc + + + + diff --git a/.jjb-test/expected-xml/gerrit-maven-sonar b/.jjb-test/expected-xml/gerrit-maven-sonar index 0044c7e4..b6b20e58 100644 --- a/.jjb-test/expected-xml/gerrit-maven-sonar +++ b/.jjb-test/expected-xml/gerrit-maven-sonar @@ -631,5 +631,14 @@ rm ~/.netrc test-credential + + + + npmrc + $HOME/.npmrc + + + + diff --git a/.jjb-test/expected-xml/gerrit-node-node-verify-master b/.jjb-test/expected-xml/gerrit-node-node-verify-master index 894cfa06..62c71e7f 100644 --- a/.jjb-test/expected-xml/gerrit-node-node-verify-master +++ b/.jjb-test/expected-xml/gerrit-node-node-verify-master @@ -518,5 +518,14 @@ rm ~/.netrc test-credential + + + + npmrc + $HOME/.npmrc + + + + diff --git a/.jjb-test/expected-xml/gerrit-python-tox-verify-master b/.jjb-test/expected-xml/gerrit-python-tox-verify-master index 7fe44e71..1fbb5263 100644 --- a/.jjb-test/expected-xml/gerrit-python-tox-verify-master +++ b/.jjb-test/expected-xml/gerrit-python-tox-verify-master @@ -641,5 +641,14 @@ rm ~/.netrc test-credential + + + + npmrc + $HOME/.npmrc + + + + diff --git a/.jjb-test/expected-xml/gerrit-rtd-rtd-merge-master b/.jjb-test/expected-xml/gerrit-rtd-rtd-merge-master index 89c99efb..3e7afb57 100644 --- a/.jjb-test/expected-xml/gerrit-rtd-rtd-merge-master +++ b/.jjb-test/expected-xml/gerrit-rtd-rtd-merge-master @@ -441,5 +441,14 @@ rm ~/.netrc test-credential + + + + npmrc + $HOME/.npmrc + + + + diff --git a/.jjb-test/expected-xml/gerrit-rtd-rtd-verify-master b/.jjb-test/expected-xml/gerrit-rtd-rtd-verify-master index e712ab45..8b9a99ca 100644 --- a/.jjb-test/expected-xml/gerrit-rtd-rtd-verify-master +++ b/.jjb-test/expected-xml/gerrit-rtd-rtd-verify-master @@ -525,5 +525,14 @@ rm ~/.netrc test-credential + + + + npmrc + $HOME/.npmrc + + + + diff --git a/.jjb-test/expected-xml/github-ciman-jjb-deploy-job b/.jjb-test/expected-xml/github-ciman-jjb-deploy-job index a2490721..40e9a485 100644 --- a/.jjb-test/expected-xml/github-ciman-jjb-deploy-job +++ b/.jjb-test/expected-xml/github-ciman-jjb-deploy-job @@ -503,5 +503,14 @@ rm ~/.netrc test-credential + + + + npmrc + $HOME/.npmrc + + + + diff --git a/.jjb-test/expected-xml/github-ciman-jjb-merge b/.jjb-test/expected-xml/github-ciman-jjb-merge index e749b946..0f839da3 100644 --- a/.jjb-test/expected-xml/github-ciman-jjb-merge +++ b/.jjb-test/expected-xml/github-ciman-jjb-merge @@ -481,5 +481,14 @@ rm ~/.netrc test-credential + + + + npmrc + $HOME/.npmrc + + + + diff --git a/.jjb-test/expected-xml/github-ciman-jjb-verify b/.jjb-test/expected-xml/github-ciman-jjb-verify index 48371536..814174dc 100644 --- a/.jjb-test/expected-xml/github-ciman-jjb-verify +++ b/.jjb-test/expected-xml/github-ciman-jjb-verify @@ -560,5 +560,14 @@ rm ~/.netrc test-credential + + + + npmrc + $HOME/.npmrc + + + + diff --git a/.jjb-test/expected-xml/github-ciman-packer-merge-centos-java-builder b/.jjb-test/expected-xml/github-ciman-packer-merge-centos-java-builder index 6eea21c4..145268d5 100644 --- a/.jjb-test/expected-xml/github-ciman-packer-merge-centos-java-builder +++ b/.jjb-test/expected-xml/github-ciman-packer-merge-centos-java-builder @@ -650,5 +650,14 @@ rm ~/.netrc test-credential + + + + npmrc + $HOME/.npmrc + + + + diff --git a/.jjb-test/expected-xml/github-ciman-packer-merge-centos-mininet b/.jjb-test/expected-xml/github-ciman-packer-merge-centos-mininet index 705cc016..0ce69465 100644 --- a/.jjb-test/expected-xml/github-ciman-packer-merge-centos-mininet +++ b/.jjb-test/expected-xml/github-ciman-packer-merge-centos-mininet @@ -650,5 +650,14 @@ rm ~/.netrc test-credential + + + + npmrc + $HOME/.npmrc + + + + diff --git a/.jjb-test/expected-xml/github-ciman-packer-merge-ubuntu1604-java-builder b/.jjb-test/expected-xml/github-ciman-packer-merge-ubuntu1604-java-builder index 3efa2d67..f4ed55c4 100644 --- a/.jjb-test/expected-xml/github-ciman-packer-merge-ubuntu1604-java-builder +++ b/.jjb-test/expected-xml/github-ciman-packer-merge-ubuntu1604-java-builder @@ -650,5 +650,14 @@ rm ~/.netrc test-credential + + + + npmrc + $HOME/.npmrc + + + + diff --git a/.jjb-test/expected-xml/github-ciman-packer-merge-ubuntu1604-mininet b/.jjb-test/expected-xml/github-ciman-packer-merge-ubuntu1604-mininet index de4012e6..99a2cb7e 100644 --- a/.jjb-test/expected-xml/github-ciman-packer-merge-ubuntu1604-mininet +++ b/.jjb-test/expected-xml/github-ciman-packer-merge-ubuntu1604-mininet @@ -650,5 +650,14 @@ rm ~/.netrc test-credential + + + + npmrc + $HOME/.npmrc + + + + diff --git a/.jjb-test/expected-xml/github-ciman-packer-verify b/.jjb-test/expected-xml/github-ciman-packer-verify index df45f685..e773bdfd 100644 --- a/.jjb-test/expected-xml/github-ciman-packer-verify +++ b/.jjb-test/expected-xml/github-ciman-packer-verify @@ -526,5 +526,14 @@ rm ~/.netrc test-credential + + + + npmrc + $HOME/.npmrc + + + + diff --git a/.jjb-test/expected-xml/github-maven-maven-clm-master b/.jjb-test/expected-xml/github-maven-maven-clm-master index 898fe59d..a22d038e 100644 --- a/.jjb-test/expected-xml/github-maven-maven-clm-master +++ b/.jjb-test/expected-xml/github-maven-maven-clm-master @@ -542,5 +542,14 @@ rm ~/.netrc test-credential + + + + npmrc + $HOME/.npmrc + + + + diff --git a/.jjb-test/expected-xml/github-maven-maven-javadoc-publish-master b/.jjb-test/expected-xml/github-maven-maven-javadoc-publish-master index b899d3eb..90f85525 100644 --- a/.jjb-test/expected-xml/github-maven-maven-javadoc-publish-master +++ b/.jjb-test/expected-xml/github-maven-maven-javadoc-publish-master @@ -702,5 +702,14 @@ rm ~/.netrc test-credential + + + + npmrc + $HOME/.npmrc + + + + diff --git a/.jjb-test/expected-xml/github-maven-maven-javadoc-verify-master b/.jjb-test/expected-xml/github-maven-maven-javadoc-verify-master index 63b64e2d..31770fe1 100644 --- a/.jjb-test/expected-xml/github-maven-maven-javadoc-verify-master +++ b/.jjb-test/expected-xml/github-maven-maven-javadoc-verify-master @@ -542,5 +542,14 @@ rm ~/.netrc test-credential + + + + npmrc + $HOME/.npmrc + + + + diff --git a/.jjb-test/expected-xml/github-maven-maven-release-master b/.jjb-test/expected-xml/github-maven-maven-release-master index e8975696..f2d892f1 100644 --- a/.jjb-test/expected-xml/github-maven-maven-release-master +++ b/.jjb-test/expected-xml/github-maven-maven-release-master @@ -724,5 +724,14 @@ rm ~/.netrc test-credential + + + + npmrc + $HOME/.npmrc + + + + diff --git a/.jjb-test/expected-xml/github-maven-maven-verify-master-mvn33-openjdk8 b/.jjb-test/expected-xml/github-maven-maven-verify-master-mvn33-openjdk8 index 8a191e3b..c255a3f0 100644 --- a/.jjb-test/expected-xml/github-maven-maven-verify-master-mvn33-openjdk8 +++ b/.jjb-test/expected-xml/github-maven-maven-verify-master-mvn33-openjdk8 @@ -668,5 +668,14 @@ rm ~/.netrc test-credential + + + + npmrc + $HOME/.npmrc + + + + diff --git a/.jjb-test/expected-xml/github-maven-sonar b/.jjb-test/expected-xml/github-maven-sonar index 138ce0b9..f4550c4d 100644 --- a/.jjb-test/expected-xml/github-maven-sonar +++ b/.jjb-test/expected-xml/github-maven-sonar @@ -596,5 +596,14 @@ rm ~/.netrc test-credential + + + + npmrc + $HOME/.npmrc + + + + diff --git a/.jjb-test/expected-xml/github-node-node-verify-master b/.jjb-test/expected-xml/github-node-node-verify-master index 957fd07f..af297b2c 100644 --- a/.jjb-test/expected-xml/github-node-node-verify-master +++ b/.jjb-test/expected-xml/github-node-node-verify-master @@ -474,5 +474,14 @@ rm ~/.netrc test-credential + + + + npmrc + $HOME/.npmrc + + + + diff --git a/.jjb-test/expected-xml/github-python-tox-verify-master b/.jjb-test/expected-xml/github-python-tox-verify-master index a60bb79b..03e98934 100644 --- a/.jjb-test/expected-xml/github-python-tox-verify-master +++ b/.jjb-test/expected-xml/github-python-tox-verify-master @@ -603,5 +603,14 @@ rm ~/.netrc test-credential + + + + npmrc + $HOME/.npmrc + + + + diff --git a/.jjb-test/expected-xml/github-rtd-rtd-merge-master b/.jjb-test/expected-xml/github-rtd-rtd-merge-master index c2fa1813..98f20726 100644 --- a/.jjb-test/expected-xml/github-rtd-rtd-merge-master +++ b/.jjb-test/expected-xml/github-rtd-rtd-merge-master @@ -401,5 +401,14 @@ rm ~/.netrc test-credential + + + + npmrc + $HOME/.npmrc + + + + diff --git a/.jjb-test/expected-xml/github-rtd-rtd-verify-master b/.jjb-test/expected-xml/github-rtd-rtd-verify-master index 8b1c6ff2..50af5e83 100644 --- a/.jjb-test/expected-xml/github-rtd-rtd-verify-master +++ b/.jjb-test/expected-xml/github-rtd-rtd-verify-master @@ -477,5 +477,14 @@ rm ~/.netrc test-credential + + + + npmrc + $HOME/.npmrc + + + + diff --git a/docs/jjb/lf-macros.rst b/docs/jjb/lf-macros.rst index d6e5f143..a3cdc90a 100644 --- a/docs/jjb/lf-macros.rst +++ b/docs/jjb/lf-macros.rst @@ -223,3 +223,15 @@ lf-infra-wrappers Provides lf-infra recommended wrappers which should be used in every job-template. + +This wrapper requires that a managed file called `npmrc` exists in the Jenkins. The main use +case here is to point to a npm proxy, on Nexus for example. +The type of the file should be "Custom file". You can set various npmrc settings in it. +Documentation on npm configuration can be found at https://docs.npmjs.com/files/npmrc. +If you are not using npm then it is fine for the file to be empty. + +Example npmrc: + +.. code-block:: bash + + registry=https://nexus3.onap.org/repository/npm.public/ diff --git a/jjb/lf-macros.yaml b/jjb/lf-macros.yaml index 6e213e4a..5480f031 100644 --- a/jjb/lf-macros.yaml +++ b/jjb/lf-macros.yaml @@ -435,3 +435,7 @@ - '{jenkins-ssh-credential}' - openstack: single-use: true + - config-file-provider: + files: + - file-id: npmrc + target: '$HOME/.npmrc' -- 2.16.6