Remove references to Gerrit or plugins v3.11 builds Gerrit v3.11 is now EOL, therefore any reference to it in the build scripts can be removed. Change-Id: I630925ab42fbdc6634cd4b887996c71392249bed
diff --git a/jenkins/gerrit-bazel-build-plugin-branch.sh b/jenkins/gerrit-bazel-build-plugin-branch.sh index 713a972..0740ad9 100644 --- a/jenkins/gerrit-bazel-build-plugin-branch.sh +++ b/jenkins/gerrit-bazel-build-plugin-branch.sh
@@ -72,11 +72,6 @@ bazelisk version -if [ "{gerrit-branch}" == "stable-3.11" ]; then - BAZEL_OPTS="$BAZEL_OPTS --config=java21" - echo -e "Build against Gerrit stable-3.11 on java21. BAZEL_OPTS = $BAZEL_OPTS" -fi - ./polygerrit-ui/app/api/publish.sh --pack bazelisk build $BAZEL_OPTS $TARGETS
diff --git a/jenkins/gerrit-bazel-build-plugin.sh b/jenkins/gerrit-bazel-build-plugin.sh index 7740ad2..be4ddd6 100644 --- a/jenkins/gerrit-bazel-build-plugin.sh +++ b/jenkins/gerrit-bazel-build-plugin.sh
@@ -71,11 +71,6 @@ bash -c "{setup}" fi -if [ "{branch}" == "stable-3.11" ]; then - BAZEL_OPTS="$BAZEL_OPTS --config=java21" - echo -e "Build stable-3.11 on java21. BAZEL_OPTS = $BAZEL_OPTS" -fi - ./polygerrit-ui/app/api/publish.sh --pack bazelisk build $BAZEL_OPTS $TARGETS bazelisk test $BAZEL_OPTS --test_env DOCKER_HOST=$DOCKER_HOST //tools/bzl:always_pass_test plugins/{name}/...
diff --git a/jenkins/gerrit-bazel-verifier-test.sh b/jenkins/gerrit-bazel-verifier-test.sh index 0b8de27..4f3cc97 100755 --- a/jenkins/gerrit-bazel-verifier-test.sh +++ b/jenkins/gerrit-bazel-verifier-test.sh
@@ -8,11 +8,11 @@ echo '----------------------------------------------' case $TARGET_BRANCH$MODE in - masterrbe|stable-3.11rbe|stable-3.12rbe|stable-3.13rbe|stable-3.14rbe) + masterrbe|stable-3.12rbe|stable-3.13rbe|stable-3.14rbe) TEST_TAG_FILTER="-flaky,-elastic,-no_rbe,-lucene" BAZEL_OPTS="$BAZEL_OPTS --config=remote_bb --jobs=50 --remote_header=x-buildbuddy-api-key=$BB_API_KEY" ;; - masternotedb|stable-3.11notedb|stable-3.12notedb|stable-3.13notedb|stable-3.14notedb) + masternotedb|stable-3.12notedb|stable-3.13notedb|stable-3.14notedb) TEST_TAG_FILTER="-flaky,elastic,no_rbe" ;; *)
diff --git a/vars/gerritPipeline.groovy b/vars/gerritPipeline.groovy index da9549a..aa342d6 100644 --- a/vars/gerritPipeline.groovy +++ b/vars/gerritPipeline.groovy
@@ -130,7 +130,7 @@ def collectBuildModes() { Builds.modes = [] - if (env.GERRIT_BRANCH == "master" || env.GERRIT_BRANCH ==~ /stable-3.1[0-4]/) { + if (env.GERRIT_BRANCH == "master" || env.GERRIT_BRANCH ==~ /stable-3.1[2-4]/) { Builds.modes = ["notedb", "rbe"] } else { throw new Exception("Unsupported branch ${env.GERRIT_BRANCH}")