Skip to content

Commit

Permalink
workflows: make local roachtest jobs mandatory in GitHub Actions
Browse files Browse the repository at this point in the history
Also disable the corresponding TC jobs plus the Linux build jobs, which
are no longer necessary with this change.

Epic: CRDB-8308
Release note: None
  • Loading branch information
rickystewart committed Apr 8, 2024
1 parent 04b6830 commit 814c65f
Show file tree
Hide file tree
Showing 8 changed files with 14 additions and 146 deletions.
2 changes: 2 additions & 0 deletions .github/bors.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@ status = [
"linux_amd64_build",
"linux_amd64_fips_build",
"linux_arm64_build",
"local_roachtest",
"local_roachtest_fips",
"macos_amd64_build",
"macos_arm64_build",
"windows_build",
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/github-actions-essential-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ jobs:
- name: clean up
run: ./build/github/cleanup-engflow-keys.sh
if: always()
EXPERIMENTAL_local_roachtest:
local_roachtest:
runs-on: [self-hosted, basic_big_runner_group]
steps:
- uses: actions/checkout@v4
Expand All @@ -159,7 +159,7 @@ jobs:
- name: clean up
run: ./build/github/cleanup-engflow-keys.sh
if: always()
EXPERIMENTAL_local_roachtest_fips:
local_roachtest_fips:
runs-on: [self-hosted, basic_runner_group_fips]
steps:
- uses: actions/checkout@v4
Expand Down
63 changes: 0 additions & 63 deletions build/teamcity/cockroach/ci/builds/build_linux_x86_64.sh

This file was deleted.

12 changes: 0 additions & 12 deletions build/teamcity/cockroach/ci/builds/build_linux_x86_64_fips.sh

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,5 +1,13 @@
#!/usr/bin/env bash

set -euo pipefail
set -exuo pipefail

source build/teamcity/cockroach/ci/tests/local_roachtest.sh
dir="$(dirname $(dirname $(dirname $(dirname $(dirname "${0}")))))"

source "$dir/teamcity-support.sh" # For $root
source "$dir/teamcity-bazel-support.sh" # For run_bazel

tc_start_block "Run local roachtests"
BAZEL_SUPPORT_EXTRA_DOCKER_ARGS="-e LITERAL_ARTIFACTS_DIR=$root/artifacts -e COCKROACH_DEV_LICENSE -e BUILD_VCS_NUMBER -e TC_BUILD_ID -e TC_BUILD_BRANCH" \
run_bazel build/teamcity/cockroach/ci/tests/local_roachtest_impl.sh
tc_end_block "Run local roachtests"
13 changes: 0 additions & 13 deletions build/teamcity/cockroach/ci/tests/local_roachtest.sh

This file was deleted.

13 changes: 0 additions & 13 deletions build/teamcity/cockroach/ci/tests/local_roachtest_fips.sh

This file was deleted.

41 changes: 0 additions & 41 deletions build/teamcity/cockroach/ci/tests/local_roachtest_fips_impl.sh

This file was deleted.

0 comments on commit 814c65f

Please sign in to comment.