Fix external frontend plugin dependency collision
Since I7e313dd111 plugins/package.json is exposing typescript-api that
the plugins might depend on. Previously, the supported way to add custom
frontend plugin dependencies was to overwrite the plugins/package.json
in gerrit core with plugin specific version of package.json.
Given that some front end plugins provide package.json file and depend
in the plugins/package.json file in gerrit core, we have now collision
problem. To rectify, we rename the expected package.json with custom
plugin dependencies from package.json to external_package.json. This is
also similar to the naming convention for java specific dependencies:
external_plugin_deps.bzl.
Bug: Issue 15931
Change-Id: I7c9de28e5100c1480d6021416013535b09843165
diff --git a/jenkins/gerrit-bazel-build-account-plugin.sh b/jenkins/gerrit-bazel-build-account-plugin.sh
index 4ffd311..7d760e5 100644
--- a/jenkins/gerrit-bazel-build-account-plugin.sh
+++ b/jenkins/gerrit-bazel-build-account-plugin.sh
@@ -7,7 +7,7 @@
rm -rf plugins/account
git read-tree -u --prefix=plugins/account origin/{branch}
-for file in external_plugin_deps.bzl package.json
+for file in external_plugin_deps.bzl external_package.json
do
if [ -f plugins/account/$file ]
then
diff --git a/jenkins/gerrit-bazel-build-its-plugin-branch.sh b/jenkins/gerrit-bazel-build-its-plugin-branch.sh
index ce80e0a..ecb541a 100644
--- a/jenkins/gerrit-bazel-build-its-plugin-branch.sh
+++ b/jenkins/gerrit-bazel-build-its-plugin-branch.sh
@@ -16,7 +16,7 @@
rm -Rf bazel-bin
-for file in external_plugin_deps.bzl package.json
+for file in external_plugin_deps.bzl external_package.json
do
if [ -f plugins/its-{name}/$file ]
then
diff --git a/jenkins/gerrit-bazel-build-its-plugin.sh b/jenkins/gerrit-bazel-build-its-plugin.sh
index 26b086f..837beec 100644
--- a/jenkins/gerrit-bazel-build-its-plugin.sh
+++ b/jenkins/gerrit-bazel-build-its-plugin.sh
@@ -12,7 +12,7 @@
rm -Rf bazel-bin
-for file in external_plugin_deps.bzl package.json
+for file in external_plugin_deps.bzl external_package.json
do
if [ -f plugins/its-{name}/$file ]
then
diff --git a/jenkins/gerrit-bazel-build-owners-plugin-branch.sh b/jenkins/gerrit-bazel-build-owners-plugin-branch.sh
index bfa226b..ec65fef 100644
--- a/jenkins/gerrit-bazel-build-owners-plugin-branch.sh
+++ b/jenkins/gerrit-bazel-build-owners-plugin-branch.sh
@@ -9,7 +9,7 @@
ln -s plugins/{name}-plugin/owners-common .
pushd plugins && ln -s owners-plugin/owners owners-plugin/owners-a* . && popd
-for file in external_plugin_deps.bzl package.json
+for file in external_plugin_deps.bzl external_package.json
do
if [ -f plugins/{name}-plugin/$file ]
then
diff --git a/jenkins/gerrit-bazel-build-owners-plugin.sh b/jenkins/gerrit-bazel-build-owners-plugin.sh
index a755189..c137bf2 100644
--- a/jenkins/gerrit-bazel-build-owners-plugin.sh
+++ b/jenkins/gerrit-bazel-build-owners-plugin.sh
@@ -9,7 +9,7 @@
ln -s plugins/{name}-plugin/owners-common .
pushd plugins && ln -s owners-plugin/owners owners-plugin/owners-a* . && popd
-for file in external_plugin_deps.bzl package.json
+for file in external_plugin_deps.bzl external_package.json
do
if [ -f plugins/{name}-plugin/$file ]
then
diff --git a/jenkins/gerrit-bazel-build-plugin-branch.sh b/jenkins/gerrit-bazel-build-plugin-branch.sh
index 40dc647..a5cdfff 100644
--- a/jenkins/gerrit-bazel-build-plugin-branch.sh
+++ b/jenkins/gerrit-bazel-build-plugin-branch.sh
@@ -11,7 +11,7 @@
git read-tree -u --prefix=plugins/{name} origin/{branch}
git fetch --tags origin
-for file in external_plugin_deps.bzl package.json
+for file in external_plugin_deps.bzl external_package.json
do
if [ -f plugins/{name}/$file ]
then
diff --git a/jenkins/gerrit-bazel-build-plugin.sh b/jenkins/gerrit-bazel-build-plugin.sh
index a9aafd7..3876ff2 100644
--- a/jenkins/gerrit-bazel-build-plugin.sh
+++ b/jenkins/gerrit-bazel-build-plugin.sh
@@ -8,7 +8,7 @@
git read-tree -u --prefix=plugins/{name} origin/{branch}
git fetch --tags origin
-for file in external_plugin_deps.bzl package.json
+for file in external_plugin_deps.bzl external_package.json
do
if [ -f plugins/{name}/$file ]
then
diff --git a/vars/pluginPipeline.groovy b/vars/pluginPipeline.groovy
index 642a5f2..c8bd060 100644
--- a/vars/pluginPipeline.groovy
+++ b/vars/pluginPipeline.groovy
@@ -89,7 +89,7 @@
dir ('gerrit') {
sh "cd plugins && ln -s ../../${pluginName} ."
sh "if [ -f ../${pluginName}/external_plugin_deps.bzl ]; then cd plugins && ln -sf ../../${pluginName}/external_plugin_deps.bzl .; fi"
- sh "if [ -f ../${pluginName}/package.json ]; then cd plugins && ln -sf ../../${pluginName}/package.json .; fi"
+ sh "if [ -f ../${pluginName}/external_package.json ]; then cd plugins && ln -sf ../../${pluginName}/external_package.json package.json; fi"
sh "${bazeliskCmd} build plugins/${pluginName}"
sh "${bazeliskCmd} test --test_env DOCKER_HOST=" + '$DOCKER_HOST' + " plugins/${pluginName}/..."
}
