Adapt output artifact directory for Bazel 0.25
Bazel 0.25 flipped the bit for incompatible_merge_genfiles_directory.
Bug: Issue 10665
Change-Id: If191cc3accb40f1efa7d83de434a8628afa65281
diff --git a/jenkins/gerrit-bazel-build-account-plugin.sh b/jenkins/gerrit-bazel-build-account-plugin.sh
index c7b7e71..b532a22 100644
--- a/jenkins/gerrit-bazel-build-account-plugin.sh
+++ b/jenkins/gerrit-bazel-build-account-plugin.sh
@@ -30,12 +30,12 @@
bazel test --test_env DOCKER_HOST=$DOCKER_HOST plugins/account:$TEST_TARGET
fi
-for JAR in $(find bazel-genfiles/plugins/account -name account*.jar)
+for JAR in $(find bazel-bin/plugins/account -name account*.jar)
do
PLUGIN_VERSION=$(git describe --always origin/stable-2.16)
echo -e "Implementation-Version: $PLUGIN_VERSION" > MANIFEST.MF
jar ufm $JAR MANIFEST.MF && rm MANIFEST.MF
- DEST_JAR=bazel-genfiles/plugins/account/$(basename $JAR)
+ DEST_JAR=bazel-bin/plugins/account/$(basename $JAR)
[ "$JAR" -ef "$DEST_JAR" ] || mv $JAR $DEST_JAR
- echo "$PLUGIN_VERSION" > bazel-genfiles/plugins/account/$(basename $JAR-version)
+ echo "$PLUGIN_VERSION" > bazel-bin/plugins/account/$(basename $JAR-version)
done
diff --git a/jenkins/gerrit-bazel-build-its-plugin-branch.sh b/jenkins/gerrit-bazel-build-its-plugin-branch.sh
index 31776a5..40d7031 100644
--- a/jenkins/gerrit-bazel-build-its-plugin-branch.sh
+++ b/jenkins/gerrit-bazel-build-its-plugin-branch.sh
@@ -10,7 +10,7 @@
# Try first the Gerrit-specific branch of its-base and then fallback to the one of the plugin
git read-tree -u --prefix=plugins/its-base base/{gerrit-branch} || git read-tree -u --prefix=plugins/its-base base/{branch}
-rm -Rf bazel-genfiles
+rm -Rf bazel-bin
if [ -f plugins/its-{name}/external_plugin_deps.bzl ]
then
@@ -29,12 +29,12 @@
bazel test --test_env DOCKER_HOST=$DOCKER_HOST plugins/its-{name}:$TEST_TARGET
fi
-for JAR in $(find bazel-genfiles/plugins/its-{name} -name its-{name}*.jar)
+for JAR in $(find bazel-bin/plugins/its-{name} -name its-{name}*.jar)
do
PLUGIN_VERSION=$(git describe --always origin/{branch})
echo -e "Implementation-Version: $PLUGIN_VERSION" > MANIFEST.MF
jar ufm $JAR MANIFEST.MF && rm MANIFEST.MF
- DEST_JAR=bazel-genfiles/plugins/its-{name}/$(basename $JAR)
+ DEST_JAR=bazel-bin/plugins/its-{name}/$(basename $JAR)
[ "$JAR" -ef "$DEST_JAR" ] || mv $JAR $DEST_JAR
- echo "$PLUGIN_VERSION" > bazel-genfiles/plugins/its-{name}/$(basename $JAR-version)
+ echo "$PLUGIN_VERSION" > bazel-bin/plugins/its-{name}/$(basename $JAR-version)
done
diff --git a/jenkins/gerrit-bazel-build-its-plugin.sh b/jenkins/gerrit-bazel-build-its-plugin.sh
index bd4be8f..fb0744b 100644
--- a/jenkins/gerrit-bazel-build-its-plugin.sh
+++ b/jenkins/gerrit-bazel-build-its-plugin.sh
@@ -6,7 +6,7 @@
git read-tree -u --prefix=plugins/its-{name} origin/{branch}
git read-tree -u --prefix=plugins/its-base base/{branch}
-rm -Rf bazel-genfiles
+rm -Rf bazel-bin
if [ -f plugins/its-{name}/external_plugin_deps.bzl ]
then
@@ -25,13 +25,13 @@
bazel test --test_env DOCKER_HOST=$DOCKER_HOST plugins/its-{name}:$TEST_TARGET
fi
-for JAR in $(find bazel-genfiles/plugins/its-{name} -name its-{name}*.jar)
+for JAR in $(find bazel-bin/plugins/its-{name} -name its-{name}*.jar)
do
PLUGIN_VERSION=$(git describe --always origin/{branch})
echo -e "Implementation-Version: $PLUGIN_VERSION" > MANIFEST.MF
jar ufm $JAR MANIFEST.MF && rm MANIFEST.MF
- DEST_JAR=bazel-genfiles/plugins/its-{name}/$(basename $JAR)
+ DEST_JAR=bazel-bin/plugins/its-{name}/$(basename $JAR)
[ "$JAR" -ef "$DEST_JAR" ] || mv $JAR $DEST_JAR
- echo "$PLUGIN_VERSION" > bazel-genfiles/plugins/its-{name}/$(basename $JAR-version)
+ echo "$PLUGIN_VERSION" > bazel-bin/plugins/its-{name}/$(basename $JAR-version)
done
diff --git a/jenkins/gerrit-bazel-build-owners-plugin-branch.sh b/jenkins/gerrit-bazel-build-owners-plugin-branch.sh
index 3f5eac7..c9e0c43 100644
--- a/jenkins/gerrit-bazel-build-owners-plugin-branch.sh
+++ b/jenkins/gerrit-bazel-build-owners-plugin-branch.sh
@@ -16,12 +16,12 @@
bazel build --spawn_strategy=standalone --genrule_strategy=standalone $TARGETS
-for JAR in $(find bazel-genfiles/plugins/ -name {name}*.jar)
+for JAR in $(find bazel-bin/plugins/ -name {name}*.jar)
do
PLUGIN_VERSION=$(git describe --always origin/{branch})
echo -e "Implementation-Version: $PLUGIN_VERSION" > MANIFEST.MF
jar ufm $JAR MANIFEST.MF && rm MANIFEST.MF
- DEST_JAR=bazel-genfiles/plugins/{name}/$(basename $JAR)
+ DEST_JAR=bazel-bin/plugins/{name}/$(basename $JAR)
[ "$JAR" -ef "$DEST_JAR" ] || mv $JAR $DEST_JAR
- echo "$PLUGIN_VERSION" > bazel-genfiles/plugins/{name}/$(basename $JAR-version)
+ echo "$PLUGIN_VERSION" > bazel-bin/plugins/{name}/$(basename $JAR-version)
done
diff --git a/jenkins/gerrit-bazel-build-owners-plugin.sh b/jenkins/gerrit-bazel-build-owners-plugin.sh
index 5c98e42..02f2c89 100644
--- a/jenkins/gerrit-bazel-build-owners-plugin.sh
+++ b/jenkins/gerrit-bazel-build-owners-plugin.sh
@@ -16,12 +16,12 @@
bazel build --spawn_strategy=standalone --genrule_strategy=standalone $TARGETS
-for JAR in $(find bazel-genfiles/plugins/ -name {name}*.jar)
+for JAR in $(find bazel-bin/plugins/ -name {name}*.jar)
do
PLUGIN_VERSION=$(git describe --always origin/{branch})
echo -e "Implementation-Version: $PLUGIN_VERSION" > MANIFEST.MF
jar ufm $JAR MANIFEST.MF && rm MANIFEST.MF
- DEST_JAR=bazel-genfiles/plugins/{name}/$(basename $JAR)
+ DEST_JAR=bazel-bin/plugins/{name}/$(basename $JAR)
[ "$JAR" -ef "$DEST_JAR" ] || mv $JAR $DEST_JAR
- echo "$PLUGIN_VERSION" > bazel-genfiles/plugins/{name}/$(basename $JAR-version)
+ echo "$PLUGIN_VERSION" > bazel-bin/plugins/{name}/$(basename $JAR-version)
done
diff --git a/jenkins/gerrit-bazel-build-plugin-branch.sh b/jenkins/gerrit-bazel-build-plugin-branch.sh
index b7d52de..3ed7622 100644
--- a/jenkins/gerrit-bazel-build-plugin-branch.sh
+++ b/jenkins/gerrit-bazel-build-plugin-branch.sh
@@ -30,12 +30,12 @@
bazel test $BAZEL_OPTS $TEST_TARGETS
fi
-for JAR in $(find bazel-genfiles/plugins/{name} -name {name}*.jar)
+for JAR in $(find bazel-bin/plugins/{name} -name {name}*.jar)
do
PLUGIN_VERSION=$(git describe --always origin/{branch})
echo -e "Implementation-Version: $PLUGIN_VERSION" > MANIFEST.MF
jar ufm $JAR MANIFEST.MF && rm MANIFEST.MF
- DEST_JAR=bazel-genfiles/plugins/{name}/$(basename $JAR)
+ DEST_JAR=bazel-bin/plugins/{name}/$(basename $JAR)
[ "$JAR" -ef "$DEST_JAR" ] || mv $JAR $DEST_JAR
- echo "$PLUGIN_VERSION" > bazel-genfiles/plugins/{name}/$(basename $JAR-version)
+ echo "$PLUGIN_VERSION" > bazel-bin/plugins/{name}/$(basename $JAR-version)
done
diff --git a/jenkins/gerrit-bazel-build-plugin-manual.sh b/jenkins/gerrit-bazel-build-plugin-manual.sh
index e9b8409..76eaa63 100644
--- a/jenkins/gerrit-bazel-build-plugin-manual.sh
+++ b/jenkins/gerrit-bazel-build-plugin-manual.sh
@@ -16,13 +16,13 @@
bazel build --spawn_strategy=standalone --genrule_strategy=standalone $TARGETS
-for JAR in $(find bazel-genfiles/plugins/{name} -name {name}*.jar)
+for JAR in $(find bazel-bin/plugins/{name} -name {name}*.jar)
do
PLUGIN_VERSION=$(git describe --always origin/{branch})
echo -e "Implementation-Version: $PLUGIN_VERSION" > MANIFEST.MF
jar ufm $JAR MANIFEST.MF && rm MANIFEST.MF
- DEST_JAR=bazel-genfiles/plugins/{name}/$(basename $JAR)
+ DEST_JAR=bazel-bin/plugins/{name}/$(basename $JAR)
[ "$JAR" -ef "$DEST_JAR" ] || mv $JAR $DEST_JAR
- echo "$PLUGIN_VERSION" > bazel-genfiles/plugins/{name}/$(basename $JAR-version)
+ echo "$PLUGIN_VERSION" > bazel-bin/plugins/{name}/$(basename $JAR-version)
done
diff --git a/jenkins/gerrit-bazel-build-plugin.sh b/jenkins/gerrit-bazel-build-plugin.sh
index 78c7f1c..9cb9bc7 100644
--- a/jenkins/gerrit-bazel-build-plugin.sh
+++ b/jenkins/gerrit-bazel-build-plugin.sh
@@ -21,12 +21,12 @@
bazel test --test_env DOCKER_HOST=$DOCKER_HOST plugins/{name}:$TEST_TARGET
fi
-for JAR in $(find bazel-genfiles/plugins/{name} -name {name}*.jar)
+for JAR in $(find bazel-bin/plugins/{name} -name {name}*.jar)
do
PLUGIN_VERSION=$(git describe --always origin/{branch})
echo -e "Implementation-Version: $PLUGIN_VERSION" > MANIFEST.MF
jar ufm $JAR MANIFEST.MF && rm MANIFEST.MF
- DEST_JAR=bazel-genfiles/plugins/{name}/$(basename $JAR)
+ DEST_JAR=bazel-bin/plugins/{name}/$(basename $JAR)
[ "$JAR" -ef "$DEST_JAR" ] || mv $JAR $DEST_JAR
- echo "$PLUGIN_VERSION" > bazel-genfiles/plugins/{name}/$(basename $JAR-version)
+ echo "$PLUGIN_VERSION" > bazel-bin/plugins/{name}/$(basename $JAR-version)
done
diff --git a/jenkins/gerrit-bazel-get-its-plugin-info.sh b/jenkins/gerrit-bazel-get-its-plugin-info.sh
index f9681e5..574b902 100755
--- a/jenkins/gerrit-bazel-get-its-plugin-info.sh
+++ b/jenkins/gerrit-bazel-get-its-plugin-info.sh
@@ -1,5 +1,5 @@
#!/bin/bash -e
curl -L https://gerrit-review.googlesource.com/projects/plugins%2Fits-{name}/config | \
- tail -n +2 > bazel-genfiles/plugins/its-{name}/its-{name}.json
+ tail -n +2 > bazel-bin/plugins/its-{name}/its-{name}.json
diff --git a/jenkins/gerrit-bazel-get-project-info.sh b/jenkins/gerrit-bazel-get-project-info.sh
index 2a547cc..0d73696 100755
--- a/jenkins/gerrit-bazel-get-project-info.sh
+++ b/jenkins/gerrit-bazel-get-project-info.sh
@@ -1,5 +1,5 @@
#!/bin/bash -e
curl -L https://gerrit-review.googlesource.com/projects/{class}%2F{name}/config | \
- tail -n +2 > bazel-genfiles/plugins/{name}/{name}.json
+ tail -n +2 > bazel-bin/plugins/{name}/{name}.json
diff --git a/jenkins/gerrit-bazel-get-scripting-plugin-info.sh b/jenkins/gerrit-bazel-get-scripting-plugin-info.sh
index 973301d..d928dd4 100755
--- a/jenkins/gerrit-bazel-get-scripting-plugin-info.sh
+++ b/jenkins/gerrit-bazel-get-scripting-plugin-info.sh
@@ -1,5 +1,5 @@
#!/bin/bash -e
curl -L https://gerrit-review.googlesource.com/projects/plugins%2Fscripting%2F{name}/config | \
- tail -n +2 > bazel-genfiles/plugins/{name}/{name}.json
+ tail -n +2 > bazel-bin/plugins/{name}/{name}.json
diff --git a/jenkins/gerrit-bazel-gh-get-plugin-info.sh b/jenkins/gerrit-bazel-gh-get-plugin-info.sh
index c3cd151..f5f06f0 100755
--- a/jenkins/gerrit-bazel-gh-get-plugin-info.sh
+++ b/jenkins/gerrit-bazel-gh-get-plugin-info.sh
@@ -1,5 +1,5 @@
#!/bin/bash -e
curl -L https://api.github.com/repos/{organization}/{name} \
- > bazel-genfiles/plugins/{name}/{name}.json
+ > bazel-bin/plugins/{name}/{name}.json
diff --git a/jenkins/gerrit-bazel-plugin-account.yaml b/jenkins/gerrit-bazel-plugin-account.yaml
index cadb03c..88eaf30 100644
--- a/jenkins/gerrit-bazel-plugin-account.yaml
+++ b/jenkins/gerrit-bazel-plugin-account.yaml
@@ -13,7 +13,7 @@
publishers:
- archive:
artifacts: >
- bazel-genfiles/plugins/account/account.jar*,bazel-genfiles/plugins/account/account.json
+ bazel-bin/plugins/account/account.jar*,bazel-bin/plugins/account/account.json
- project:
name: account
diff --git a/jenkins/gerrit-bazel-plugin-template.yaml b/jenkins/gerrit-bazel-plugin-template.yaml
index 43f1171..6aec2ed 100644
--- a/jenkins/gerrit-bazel-plugin-template.yaml
+++ b/jenkins/gerrit-bazel-plugin-template.yaml
@@ -45,7 +45,7 @@
publishers:
- archive:
artifacts: >
- bazel-genfiles/plugins/{name}/*{name}*.jar*, bazel-genfiles/plugins/{name}/{name}.json
+ bazel-bin/plugins/{name}/*{name}*.jar*, bazel-bin/plugins/{name}/{name}.json
- job-template:
name: 'module-{name}-bazel-{branch}-{gerrit-branch}'
@@ -69,7 +69,7 @@
publishers:
- archive:
artifacts: >
- bazel-genfiles/plugins/{name}/*{name}*.jar*, bazel-genfiles/plugins/{name}/{name}.json
+ bazel-bin/plugins/{name}/*{name}*.jar*, bazel-bin/plugins/{name}/{name}.json
- job-template:
name: 'module-{name}-bazel-{branch}'
@@ -95,4 +95,4 @@
publishers:
- archive:
artifacts: >
- bazel-genfiles/plugins/{name}/*{name}*.jar*, bazel-genfiles/plugins/{name}/{name}.json
+ bazel-bin/plugins/{name}/*{name}*.jar*, bazel-bin/plugins/{name}/{name}.json
diff --git a/jenkins/gerrit-buck-bazel-plugin-gh-template.yaml b/jenkins/gerrit-buck-bazel-plugin-gh-template.yaml
index 2af73a7..88412a1 100644
--- a/jenkins/gerrit-buck-bazel-plugin-gh-template.yaml
+++ b/jenkins/gerrit-buck-bazel-plugin-gh-template.yaml
@@ -58,4 +58,4 @@
publishers:
- archive:
artifacts: >
- bazel-genfiles/plugins/{name}/{name}.jar*,bazel-genfiles/plugins/{name}/{name}.json
+ bazel-bin/plugins/{name}/{name}.jar*,bazel-bin/plugins/{name}/{name}.json
diff --git a/jenkins/gerrit-buck-bazel-plugin-gitblit.yaml b/jenkins/gerrit-buck-bazel-plugin-gitblit.yaml
index e5b11cb..53746d8 100644
--- a/jenkins/gerrit-buck-bazel-plugin-gitblit.yaml
+++ b/jenkins/gerrit-buck-bazel-plugin-gitblit.yaml
@@ -80,7 +80,7 @@
!include-raw: gerrit-bazel-get-project-info.sh
publishers:
- archive:
- artifacts: 'bazel-genfiles/plugins/gitblit/*gitblit*.jar*,bazel-genfiles/plugins/gitblit/*gitblit*.json'
+ artifacts: 'bazel-bin/plugins/gitblit/*gitblit*.jar*,bazel-bin/plugins/gitblit/*gitblit*.json'
- project:
diff --git a/jenkins/gerrit-buck-bazel-plugin-its-template.yaml b/jenkins/gerrit-buck-bazel-plugin-its-template.yaml
index 41f4c9c..97a7bee 100644
--- a/jenkins/gerrit-buck-bazel-plugin-its-template.yaml
+++ b/jenkins/gerrit-buck-bazel-plugin-its-template.yaml
@@ -61,7 +61,7 @@
publishers:
- archive:
artifacts: >
- bazel-genfiles/plugins/its-{name}/its-{name}.jar*, bazel-genfiles/plugins/its-{name}/its-{name}.json
+ bazel-bin/plugins/its-{name}/its-{name}.jar*, bazel-bin/plugins/its-{name}/its-{name}.json
- job-template:
name: 'plugin-its-{name}-bazel-{branch}-{gerrit-branch}'
@@ -86,4 +86,4 @@
publishers:
- archive:
artifacts: >
- bazel-genfiles/plugins/its-{name}/its-{name}.jar*, bazel-genfiles/plugins/its-{name}/its-{name}.json
+ bazel-bin/plugins/its-{name}/its-{name}.jar*, bazel-bin/plugins/its-{name}/its-{name}.json
diff --git a/jenkins/gerrit-buck-bazel-plugin-javamelody.yaml b/jenkins/gerrit-buck-bazel-plugin-javamelody.yaml
index afd214b..4636b80 100644
--- a/jenkins/gerrit-buck-bazel-plugin-javamelody.yaml
+++ b/jenkins/gerrit-buck-bazel-plugin-javamelody.yaml
@@ -8,7 +8,7 @@
publishers:
- archive:
artifacts: >
- bazel-genfiles/plugins/javamelody/javamelody.jar*,bazel-bin/plugins/javamelody/javamelody-deps_deploy.jar
+ bazel-bin/plugins/javamelody/javamelody.jar*,bazel-bin/plugins/javamelody/javamelody-deps_deploy.jar
- project:
name: javamelody
diff --git a/jenkins/gerrit-buck-bazel-plugin-manual-template.yaml b/jenkins/gerrit-buck-bazel-plugin-manual-template.yaml
index cd38e3b..526a186 100644
--- a/jenkins/gerrit-buck-bazel-plugin-manual-template.yaml
+++ b/jenkins/gerrit-buck-bazel-plugin-manual-template.yaml
@@ -62,4 +62,4 @@
publishers:
- archive:
artifacts: >
- bazel-genfiles/plugins/{name}/*{name}*.jar*
+ bazel-bin/plugins/{name}/*{name}*.jar*
diff --git a/jenkins/gerrit-buck-bazel-plugin-owners.yaml b/jenkins/gerrit-buck-bazel-plugin-owners.yaml
index 3e6d2cc..f01e375 100644
--- a/jenkins/gerrit-buck-bazel-plugin-owners.yaml
+++ b/jenkins/gerrit-buck-bazel-plugin-owners.yaml
@@ -8,7 +8,7 @@
publishers:
- archive:
artifacts: >
- bazel-genfiles/plugins/owners/owners.jar*,bazel-genfiles/plugins/owners/owners-autoassign.jar*
+ bazel-bin/plugins/owners/owners.jar*,bazel-bin/plugins/owners/owners-autoassign.jar*
- job-template:
name: 'plugin-owners-bazel-{branch}-{gerrit-branch}'
@@ -24,7 +24,7 @@
publishers:
- archive:
artifacts: >
- bazel-genfiles/plugins/owners/owners.jar*,bazel-genfiles/plugins/owners/owners-autoassign.jar*
+ bazel-bin/plugins/owners/owners.jar*,bazel-bin/plugins/owners/owners-autoassign.jar*
- job-template:
name: 'plugin-owners-{branch}'
diff --git a/jenkins/gerrit-buck-bazel-plugin-scripting-template.yaml b/jenkins/gerrit-buck-bazel-plugin-scripting-template.yaml
index 38e82f9..a847ba4 100644
--- a/jenkins/gerrit-buck-bazel-plugin-scripting-template.yaml
+++ b/jenkins/gerrit-buck-bazel-plugin-scripting-template.yaml
@@ -68,7 +68,7 @@
publishers:
- archive:
artifacts: >
- bazel-genfiles/plugins/{name}/{name}.jar*,bazel-genfiles/plugins/{name}/{name}.json
+ bazel-bin/plugins/{name}/{name}.jar*,bazel-bin/plugins/{name}/{name}.json
- job-template:
name: 'plugin-scripting-{name}-bazel-{branch}-{gerrit-branch}'
@@ -90,4 +90,4 @@
publishers:
- archive:
artifacts: >
- bazel-genfiles/plugins/{name}/{name}.jar*,bazel-genfiles/plugins/{name}/{name}.json
+ bazel-bin/plugins/{name}/{name}.jar*,bazel-bin/plugins/{name}/{name}.json
diff --git a/jenkins/gerrit-buck-bazel-plugin-template.yaml b/jenkins/gerrit-buck-bazel-plugin-template.yaml
index 7d60a7a..1a83c8b 100644
--- a/jenkins/gerrit-buck-bazel-plugin-template.yaml
+++ b/jenkins/gerrit-buck-bazel-plugin-template.yaml
@@ -62,7 +62,7 @@
publishers:
- archive:
artifacts: >
- bazel-genfiles/plugins/{name}/*{name}*.jar*,bazel-genfiles/plugins/{name}/{name}.json
+ bazel-bin/plugins/{name}/*{name}*.jar*,bazel-bin/plugins/{name}/{name}.json
- view-template:
name: 'Plugins-{branch}'
diff --git a/jenkins/gerrit-buck-bazel-template.yaml b/jenkins/gerrit-buck-bazel-template.yaml
index aa3445d..a751d51 100644
--- a/jenkins/gerrit-buck-bazel-template.yaml
+++ b/jenkins/gerrit-buck-bazel-template.yaml
@@ -162,11 +162,11 @@
publishers:
- archive:
artifacts: >
- gerrit/bazel-bin/*.war,gerrit/bazel-genfiles/plugins/*/*.jar,
- gerrit/bazel-genfiles/*api/*api.jar,
- gerrit/bazel-genfiles/gerrit-acceptance-framework/*.jar
+ gerrit/bazel-bin/*.war,gerrit/bazel-bin/plugins/*/*.jar,
+ gerrit/bazel-bin/*api/*api.jar,
+ gerrit/bazel-bin/gerrit-acceptance-framework/*.jar
- excludes: 'gerrit/bazel-genfiles/plugins/core*/**/*.jar'
+ excludes: 'gerrit/bazel-bin/plugins/core*/**/*.jar'
- project:
name: Gerrit-buck
diff --git a/jenkins/gerrit-plugin-high-availability-gerritforge.yaml b/jenkins/gerrit-plugin-high-availability-gerritforge.yaml
index 370d827..10b892d 100644
--- a/jenkins/gerrit-plugin-high-availability-gerritforge.yaml
+++ b/jenkins/gerrit-plugin-high-availability-gerritforge.yaml
@@ -7,7 +7,7 @@
publishers:
- archive:
artifacts: >
- bazel-genfiles/plugins/{name}/*{name}*.jar*, bazel-genfiles/plugins/{name}/{name}.json
+ bazel-bin/plugins/{name}/*{name}*.jar*, bazel-bin/plugins/{name}/{name}.json
- job-template:
name: 'plugin-{name}-gerritforge-{branch}'
diff --git a/jenkins/gerrit-verifier.yaml b/jenkins/gerrit-verifier.yaml
index 854b876..8e2664a 100644
--- a/jenkins/gerrit-verifier.yaml
+++ b/jenkins/gerrit-verifier.yaml
@@ -143,11 +143,11 @@
publishers:
- archive:
artifacts: >
- gerrit/bazel-bin/*.war,gerrit/bazel-genfiles/plugins/*/*.jar,
- gerrit/bazel-genfiles/*api/*api.jar,
- gerrit/bazel-genfiles/gerrit-acceptance-framework/*.jar
+ gerrit/bazel-bin/*.war,gerrit/bazel-bin/plugins/*/*.jar,
+ gerrit/bazel-bin/*api/*api.jar,
+ gerrit/bazel-bin/gerrit-acceptance-framework/*.jar
- excludes: 'gerrit/bazel-genfiles/plugins/core*/**/*.jar'
+ excludes: 'gerrit/bazel-bin/plugins/core*/**/*.jar'
- job:
name: Gerrit-codestyle
