Merge "Use npm mirrors in tox jobs"

.zuul.yaml

@@ -238,22 +238,20 @@
               - playbooks/zuul-migrate/.*
             nodeset: ubuntu-xenial
             timeout: 4800  # 80 minutes
-            vars:
+            vars: &zuul_tox_vars
                 test_setup_environment:
                     ZUUL_TEST_ROOT: /tmp/zuul-test
+                    YARN_REGISTRY: "https://{{ zuul_site_mirror_fqdn }}:4443/registry.npmjs"
                 tox_environment:
                     ZUUL_TEST_ROOT: /tmp/zuul-test
+                    YARN_REGISTRY: "https://{{ zuul_site_mirror_fqdn }}:4443/registry.npmjs"
         - tox-py38:
             irrelevant-files:
               - zuul/cmd/migrate.py
               - playbooks/zuul-migrate/.*
             timeout: 4800  # 80 minutes
             nodeset: ubuntu-bionic
-            vars:
+            vars: *zuul_tox_vars
-                test_setup_environment:
-                    ZUUL_TEST_ROOT: /tmp/zuul-test
-                tox_environment:
-                    ZUUL_TEST_ROOT: /tmp/zuul-test
         - zuul-build-dashboard-openstack-whitelabel
         - zuul-build-dashboard-software-factory
         - zuul-build-dashboard-opendev
@@ -290,22 +288,14 @@
               - playbooks/zuul-migrate/.*
             nodeset: ubuntu-xenial
             timeout: 4800  # 80 minutes
-            vars:
+            vars: *zuul_tox_vars
-                test_setup_environment:
-                    ZUUL_TEST_ROOT: /tmp/zuul-test
-                tox_environment:
-                    ZUUL_TEST_ROOT: /tmp/zuul-test
         - tox-py38:
             irrelevant-files:
               - zuul/cmd/migrate.py
               - playbooks/zuul-migrate/.*
             timeout: 4800  # 80 minutes
             nodeset: ubuntu-bionic
-            vars:
+            vars: *zuul_tox_vars
-                test_setup_environment:
-                    ZUUL_TEST_ROOT: /tmp/zuul-test
-                tox_environment:
-                    ZUUL_TEST_ROOT: /tmp/zuul-test
         - zuul-build-dashboard
         - nodejs-run-lint:
             vars:

tools/pip.sh

@@ -42,8 +42,18 @@ then
     mkdir -p zuul/web/static
     ln -sfn ../zuul/web/static web/build
     pushd web/
-        yarn install
+        if [[ -n "${YARN_REGISTRY}" ]]
+        then
+            echo "Using yarn registry: ${YARN_REGISTRY}"
+            sed -i "s#https://registry.yarnpkg.com#${YARN_REGISTRY}#" yarn.lock
+        fi
+        yarn install --verbose
         yarn build
+        if [[ -n "${YARN_REGISTRY}" ]]
+        then
+            echo "Resetting yarn registry"
+            sed -i "s#${YARN_REGISTRY}#https://registry.yarnpkg.com#" yarn.lock
+        fi
     popd
 fi
 pip install $*

tox.ini

@@ -23,6 +23,7 @@ passenv =
   OS_LOG_DEFAULTS
   OS_STDERR_CAPTURE
   OS_STDOUT_CAPTURE
+  YARN_REGISTRY
   ZUUL_MYSQL_HOST
   ZUUL_POSTGRES_HOST
   ZUUL_TEST_ROOT