Refine e2e script. (#3470)

Author: lina128

.gitignore

@@ -28,6 +28,8 @@ tfjs-layers/integration_tests/tfjs2keras/test-data/
 tfjs-layers/integration/typescript/yarn.lock
 e2e/integration_tests/create_save_predict_data
 e2e/integration_tests/convert_predict_data
+e2e/scripts/storage
+e2e/scripts/htpasswd
 tfjs-converter/python/tensorflowjs.egg-info
 tfjs-inference/binaries
 

e2e/scripts/local-registry.sh

@@ -27,21 +27,16 @@ function startLocalRegistry {
   # Wait for Verdaccio to boot
   grep -q 'http address' <(tail -f $tmp_registry_log)
 
+  # Login so we can publish packages
+  npx npm-cli-login -u user -p password -e [email protected] -r $custom_registry_url
+
   # Set registry to local registry
   npm set registry "$custom_registry_url"
   yarn config set registry "$custom_registry_url"
-
-  # Login so we can publish packages
-  (cd && npx [email protected] -u user -p password -e [email protected] -r "$custom_registry_url")
 }
 
 function stopLocalRegistry {
   # Restore the original NPM and Yarn registry URLs and stop Verdaccio
   npm set registry "$original_npm_registry_url"
   yarn config set registry "$original_yarn_registry_url"
 }
-
-function publishToLocalRegistry {
-  git clean -df
-  ./scripts/publish.sh prerelease --yes --force-publish=* --no-git-tag-version --no-commit-hooks --no-push --exact --dist-tag=latest
-}

e2e/scripts/publish.sh renamed to e2e/scripts/publish-monorepo-ci.sh

@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-# Copyright 2020 Google LLC. All Rights Reserved.
+# Copyright 2020 Google Inc. All Rights Reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -24,13 +24,10 @@ set -e
 set -x
 
 # Go to root
-cd ..
+cd ../../
 root_path=$PWD
 
-if [ -n "$(git status --porcelain)" ]; then
-  echo "Your git status is not clean. Aborting.";
-  exit 1;
-fi
+# Yarn in the top-level and in the directory,
+yarn
 
-# Publish to local registry
-# Todo(linazhao): Develop and use a one step for all release script.
+# Todo(linazhao): publish monorepo

e2e/scripts/start-verdaccio.sh

@@ -19,20 +19,56 @@
 # Start in scripts/ even if run from root directory
 cd "$(dirname "$0")"
 
-if [[ "$RELEASE" = true ]]; then
-  # Load functions for working with local NPM registry (Verdaccio)
-  source local-registry.sh
+# Load functions for working with local NPM registry (Verdaccio)
+source local-registry.sh
+
+function cleanup {
+  echo 'Cleaning up.'
+  # Restore the original NPM and Yarn registry URLs and stop Verdaccio
+  stopLocalRegistry
+}
+
+# Error messages are redirected to stderr
+function handle_error {
+  echo "$(basename $0): ERROR! An error was encountered executing line $1." 1>&2;
+  cleanup
+  echo 'Exiting with error.' 1>&2;
+  exit 1
+}
+
+function handle_exit {
+  cleanup
+  echo 'Exiting without error.' 1>&2;
+  exit
+}
+
+# Exit the script with a helpful error message when any error is encountered
+trap 'set +x; handle_error $LINENO $BASH_COMMAND' ERR
+
+# Cleanup before exit on any termination signal
+trap 'set +x; handle_exit' SIGQUIT SIGTERM SIGINT SIGKILL SIGHUP
+
+# Echo every command being executed
+set -x
 
+# Go to e2e root
+cd ..
+e2e_root_path=$PWD
+
+if [[ "$RELEASE" = true ]]; then
   # ****************************************************************************
   # First, publish the monorepo.
   # ****************************************************************************
 
   # Start the local NPM registry
-  startLocalRegistry verdaccio.yaml
+  startLocalRegistry "$e2e_root_path"/scripts/verdaccio.yaml
 
   # Publish the monorepo
-  publishToLocalRegistry
-fi
+  "$e2e_root_path"/scripts/publish-monorepo-ci.sh
 
-# Back to root
-cd ..
+  echo 'Installing package'
+  yarn
+
+  # Cleanup
+  cleanup
+fi

e2e/scripts/verdaccio.yaml

@@ -14,9 +14,12 @@ uplinks:
 packages:
   '@*/*':
     access: $all
-    publish: $authenticated
+    publish: $all
     proxy: npmjs
   '**':
+    access: $all
+    publish: $all
+    # if package is not available locally, proxy requests to 'npmjs' registry
     proxy: npmjs
 
 # log settings