Use plugin's package.json in plugin builds
Change-Id: I5de2e95b63a2875edc726a70df787848b0539ee0
diff --git a/jenkins/gerrit-bazel-build-account-plugin.sh b/jenkins/gerrit-bazel-build-account-plugin.sh
index 45d1ba2..7657a8b 100644
--- a/jenkins/gerrit-bazel-build-account-plugin.sh
+++ b/jenkins/gerrit-bazel-build-account-plugin.sh
@@ -5,10 +5,13 @@
rm -rf plugins/account
git read-tree -u --prefix=plugins/account origin/{branch}
-if [ -f plugins/account/external_plugin_deps.bzl ]
-then
- cp -f plugins/account/external_plugin_deps.bzl plugins/
-fi
+for file in external_plugin_deps.bzl package.json
+do
+ if [ -f plugins/account/$file ]
+ then
+ cp -f plugins/account/$file plugins/
+ fi
+done
TARGETS=$(echo "plugins/account:account" | sed -e 's/account/account/g')
diff --git a/jenkins/gerrit-bazel-build-its-plugin-branch.sh b/jenkins/gerrit-bazel-build-its-plugin-branch.sh
index a1d2cf5..dcfd9cf 100644
--- a/jenkins/gerrit-bazel-build-its-plugin-branch.sh
+++ b/jenkins/gerrit-bazel-build-its-plugin-branch.sh
@@ -14,10 +14,13 @@
rm -Rf bazel-bin
-if [ -f plugins/its-{name}/external_plugin_deps.bzl ]
-then
- cp -f plugins/its-{name}/external_plugin_deps.bzl plugins/
-fi
+for file in external_plugin_deps.bzl package.json
+do
+ if [ -f plugins/its-{name}/$file ]
+ then
+ cp -f plugins/its-{name}/$file plugins/
+ fi
+done
TARGETS=$(echo "{targets}" | sed -e 's/its-{{name}}/its-{name}/g')
diff --git a/jenkins/gerrit-bazel-build-its-plugin.sh b/jenkins/gerrit-bazel-build-its-plugin.sh
index e545573..ac9a187 100644
--- a/jenkins/gerrit-bazel-build-its-plugin.sh
+++ b/jenkins/gerrit-bazel-build-its-plugin.sh
@@ -10,10 +10,13 @@
rm -Rf bazel-bin
-if [ -f plugins/its-{name}/external_plugin_deps.bzl ]
-then
- cp -f plugins/its-{name}/external_plugin_deps.bzl plugins/
-fi
+for file in external_plugin_deps.bzl package.json
+do
+ if [ -f plugins/its-{name}/$file ]
+ then
+ cp -f plugins/its-{name}/$file plugins/
+ fi
+done
TARGETS=$(echo "{targets}" | sed -e 's/its-{{name}}/its-{name}/g')
diff --git a/jenkins/gerrit-bazel-build-owners-plugin-branch.sh b/jenkins/gerrit-bazel-build-owners-plugin-branch.sh
index 6f59757..0879d53 100644
--- a/jenkins/gerrit-bazel-build-owners-plugin-branch.sh
+++ b/jenkins/gerrit-bazel-build-owners-plugin-branch.sh
@@ -7,10 +7,13 @@
ln -s plugins/{name}-plugin/owners-common .
pushd plugins && ln -s owners-plugin/{{owners,owners-autoassign}} . && popd
-if [ -f plugins/{name}-plugin/external_plugin_deps.bzl ]
-then
- cp -f plugins/{name}-plugin/external_plugin_deps.bzl plugins/
-fi
+for file in external_plugin_deps.bzl package.json
+do
+ if [ -f plugins/{name}-plugin/$file ]
+ then
+ cp -f plugins/{name}-plugin/$file plugins/
+ fi
+done
TARGETS=$(echo "{targets}" | sed -e 's/{{name}}/{name}/g')
diff --git a/jenkins/gerrit-bazel-build-owners-plugin.sh b/jenkins/gerrit-bazel-build-owners-plugin.sh
index 2923150..aa27f15 100644
--- a/jenkins/gerrit-bazel-build-owners-plugin.sh
+++ b/jenkins/gerrit-bazel-build-owners-plugin.sh
@@ -7,10 +7,13 @@
ln -s plugins/{name}-plugin/owners-common .
pushd plugins && ln -s owners-plugin/{{owners,owners-autoassign}} . && popd
-if [ -f plugins/{name}-plugin/external_plugin_deps.bzl ]
-then
- cp -f plugins/{name}-plugin/external_plugin_deps.bzl plugins/
-fi
+for file in external_plugin_deps.bzl package.json
+do
+ if [ -f plugins/{name}-plugin/$file ]
+ then
+ cp -f plugins/{name}-plugin/$file plugins/
+ fi
+done
TARGETS=$(echo "{targets}" | sed -e 's/{{name}}/{name}/g')
diff --git a/jenkins/gerrit-bazel-build-plugin-branch.sh b/jenkins/gerrit-bazel-build-plugin-branch.sh
index f53f569..10274d1 100644
--- a/jenkins/gerrit-bazel-build-plugin-branch.sh
+++ b/jenkins/gerrit-bazel-build-plugin-branch.sh
@@ -11,10 +11,13 @@
git read-tree -u --prefix=plugins/{name} origin/{branch}
git fetch --tags origin
-if [ -f plugins/{name}/external_plugin_deps.bzl ]
-then
- cp -f plugins/{name}/external_plugin_deps.bzl plugins/
-fi
+for file in external_plugin_deps.bzl package.json
+do
+ if [ -f plugins/{name}/$file ]
+ then
+ cp -f plugins/{name}/$file plugins/
+ fi
+done
TARGETS=$(echo "{targets}" | sed -e 's/{{name}}/{name}/g')
java -fullversion
diff --git a/jenkins/gerrit-bazel-build-plugin-manual.sh b/jenkins/gerrit-bazel-build-plugin-manual.sh
index 7abae7d..b71c6cd 100644
--- a/jenkins/gerrit-bazel-build-plugin-manual.sh
+++ b/jenkins/gerrit-bazel-build-plugin-manual.sh
@@ -6,10 +6,13 @@
git fetch https://gerrit.googlesource.com/a/plugins/{name} $REFS_CHANGE
git read-tree -u --prefix=plugins/{name} FETCH_HEAD
-if [ -f plugins/{name}/external_plugin_deps.bzl ]
-then
- cp -f plugins/{name}/external_plugin_deps.bzl plugins/
-fi
+for file in external_plugin_deps.bzl package.json
+do
+ if [ -f plugins/{name}/$file ]
+ then
+ cp -f plugins/{name}/$file plugins/
+ fi
+done
TARGETS=$(echo "{targets}" | sed -e 's/{{name}}/{name}/g')
diff --git a/jenkins/gerrit-bazel-build-plugin.sh b/jenkins/gerrit-bazel-build-plugin.sh
index c5b781a..f867974 100644
--- a/jenkins/gerrit-bazel-build-plugin.sh
+++ b/jenkins/gerrit-bazel-build-plugin.sh
@@ -6,10 +6,13 @@
git read-tree -u --prefix=plugins/{name} origin/{branch}
git fetch --tags origin
-if [ -f plugins/{name}/external_plugin_deps.bzl ]
-then
- cp -f plugins/{name}/external_plugin_deps.bzl plugins/
-fi
+for file in external_plugin_deps.bzl package.json
+do
+ if [ -f plugins/{name}/$file ]
+ then
+ cp -f plugins/{name}/$file plugins/
+ fi
+done
TARGETS=$(echo "{targets}" | sed -e 's/{{name}}/{name}/g')
. set-java.sh 8
diff --git a/vars/pluginPipeline.groovy b/vars/pluginPipeline.groovy
index bd43a77..c663426 100644
--- a/vars/pluginPipeline.groovy
+++ b/vars/pluginPipeline.groovy
@@ -87,6 +87,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 "bazelisk build plugins/${pluginName}"
sh 'bazelisk test --test_env DOCKER_HOST=$DOCKER_HOST ' + "plugins/${pluginName}/..."
}
