Skip to content

Commit 3f03e60

Browse files
committed
build: remove FIPS builder image
This was used as a container in which to run local roachtests. In CI, we no longer run local roachtests in a container at all, so this is unused and can be deleted. Epic: none Release note: None
1 parent ffc9e28 commit 3f03e60

File tree

6 files changed

+4
-72
lines changed

6 files changed

+4
-72
lines changed

build/.bazelbuilderversion-fips

Lines changed: 0 additions & 1 deletion
This file was deleted.

build/README.md

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,6 @@ grants 4GB or more of RAM to containers. On some systems, the default
2424
configuration limits containers to 2GB memory usage and this can be insufficient
2525
to build/link a CockroachDB executable.
2626

27-
There is a FIPS analogue to this image as well.
28-
2927
### Deployment
3028

3129
The deploy image is a downsized image containing a minimal environment for
@@ -109,9 +107,8 @@ the following steps:
109107
- Edit `build/bazelbuilder/Dockerfile` as desired.
110108
- Build the image by triggering the `Build and Push Bazel Builder Image` build in TeamCity. The generated image will be published to `us-east1-docker.pkg.dev/crl-ci-images/cockroach/bazel`.
111109
- Update `build/.bazelbuilderversion` with the new tag and commit all your changes.
112-
- Build the FIPS image by triggering the `Build and Push FIPS Bazel Builder Image` build in TeamCity. The generated image will be published to `us-east1-docker.pkg.dev/crl-ci-images/cockroach/bazel-fips`.
113-
- Update `build/.bazelbuilderversion-fips` with the new tag and commit all your changes.
114-
- Ensure the "Bazel CI" job passes on your PR before merging.
110+
- In `build/toolchains/BUILD.bazel`, update the Docker image with the correct hashes for `x86_64` and `arm64` respectively. In the `container-image` for the `cross_linux` and `cross_linux_arm` `platform()`s in that file, update the SHA256 hashes to match whatever is in the manifest for the newly generated Docker image. You can check for the new hashes in the artifact registry in GCP ([example link](https://console.cloud.google.com/artifacts/docker/crl-ci-images/us-east1/cockroach/bazel/sha256:733f2353da58a9f910a397b1b9e367ef0a74f3bde4e80552bfcebf0e20f67954;tab=manifest?project=crl-ci-images) -- but make sure to check the manifest for the newly built image!)
111+
- Ensure the "GitHub Actions Essential CI" job passes on your PR before merging.
115112

116113
# Dependencies
117114

build/bazelbuilder/Dockerfile.fips

Lines changed: 0 additions & 5 deletions
This file was deleted.

build/teamcity-bazel-support.sh

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -56,10 +56,6 @@ run_bazel() {
5656
return $exit_status
5757
}
5858

59-
run_bazel_fips() {
60-
BAZEL_IMAGE="$(cat $root/build/.bazelbuilderversion-fips)" run_bazel "$@"
61-
}
62-
6359
# local copy of _tc_build_branch from teamcity-support.sh to avoid imports.
6460
_tc_build_branch() {
6561
echo "${TC_BUILD_BRANCH#refs/heads/}"

build/teamcity/internal/cockroach/build/ci/build-and-push-bazel-builder-image-fips.sh

Lines changed: 0 additions & 49 deletions
This file was deleted.

build/teamcity/internal/cockroach/build/ci/open-new-bazel-builder-image-pr.sh

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -38,14 +38,8 @@ git_ssh clone "ssh://[email protected]/cockroachdb/cockroach.git" "$WORKDIR/cockroa
3838

3939
# Push commit to fork.
4040
git checkout -b "$BRANCH"
41-
if [[ $VERSION == *"-fips:"* ]]; then
42-
IMG=bazel-fips
43-
echo -n "$VERSION" > build/.bazelbuilderversion-fips
44-
else
45-
IMG=bazel
46-
echo -n "$VERSION" > build/.bazelbuilderversion
47-
fi
48-
git commit -a -m "ci: update $IMG builder image
41+
echo -n "$VERSION" > build/.bazelbuilderversion
42+
git commit -a -m "ci: update bazel builder image
4943
5044
Release note: None
5145
Epic: None"

0 commit comments

Comments
 (0)