Merge #61099 #61125

61099: TeamCity: pin go version to 1.15 r=jlinder a=rail

Installing `golang-go` brings the latest version of go, what may be
unwanted. In this case the acceptance test fails with go 1.16.

Additionally, pinning the go version makes the toolchain more
predictable.

One of the downsides of installing `golang-X.Y-go` is that we need to
add system-wide symlinks manually, because the package itself doesn't do
that, leaving that functionality to the `golang-go` package.

Release justification: non-production code changes
Release note: None

61125: kvserver: skip some rangefeed tests under race r=aayushshah15 a=aayushshah15

These tests are causing the `kvserver` package to timeout on CI under
race:
`TestReplicaRangefeedPushesTransactions`
`TestReplicaRangefeedNudgeSlowClosedTimestamp`
`TestReplicaRangefeedRetryErrors`

Informs #61120

Release justification: skipping tests under race
Release note: None

Co-authored-by: Rail Aliiev <[email protected]>
Co-authored-by: Aayush Shah <[email protected]>

build/README.md

@@ -88,6 +88,8 @@ back to this document and perform these steps:
 * [ ] Bump the default installed version of Go in `bootstrap-debian.sh` ([source](./bootstrap/bootstrap-debian.sh#L40-42)).
 * [ ] Replace other mentions of the older version of go (grep for `golang:<old_version>` and `go<old_version>`).
 * [ ] Update the `builder.dockerImage` parameter in the TeamCity [`Cockroach`](https://teamcity.cockroachdb.com/admin/editProject.html?projectId=Cockroach&tab=projectParams) and [`Internal`](https://teamcity.cockroachdb.com/admin/editProject.html?projectId=Internal&tab=projectParams) projects.
+* [ ] Adjust `GO_VERSION` in the TeamCity agent image ([setup script](./packer/teamcity-agent.sh))
+  and ask the Developer Infrastructure team to deploy new images.
 
 You can test the new builder image in TeamCity by using the custom parameters
 UI (the "..." icon next to the "Run" button) to verify the image before

build/packer/teamcity-agent.sh

@@ -33,16 +33,26 @@ apt-get update --yes
 apt-get install --yes sudo
 
 # Install the necessary dependencies. Keep this list small!
+GO_VERSION=1.15
+
 apt-get install --yes \
   docker-ce \
   docker-compose \
   gnome-keyring \
   gnupg2 \
   git \
-  golang-go \
+  golang-${GO_VERSION}-go \
   openjdk-11-jre-headless \
   pass \
   unzip
+
+# golang-X.Y-go does not install system wide symlinks, it's only done by the
+# golang-go package which points to the latest version. Explicitly symlink the
+# pinned version to /usr/bin.
+for f in go gofm; do
+    ln -s /usr/lib/go-${GO_VERSION}/bin/$f /usr/bin
+done
+
 # Installing gnome-keyring prevents the error described in
 # https://github.com/moby/moby/issues/34048
 

pkg/kv/kvserver/replica_rangefeed_test.go

@@ -26,6 +26,7 @@ import (
 	"github.com/cockroachdb/cockroach/pkg/settings/cluster"
 	"github.com/cockroachdb/cockroach/pkg/sql"
 	"github.com/cockroachdb/cockroach/pkg/testutils"
+	"github.com/cockroachdb/cockroach/pkg/testutils/skip"
 	"github.com/cockroachdb/cockroach/pkg/testutils/sqlutils"
 	"github.com/cockroachdb/cockroach/pkg/testutils/testcluster"
 	"github.com/cockroachdb/cockroach/pkg/util/encoding"
@@ -368,6 +369,7 @@ func TestReplicaRangefeedExpiringLeaseError(t *testing.T) {
 func TestReplicaRangefeedRetryErrors(t *testing.T) {
 	defer leaktest.AfterTest(t)()
 	defer log.Scope(t).Close(t)
+	skip.UnderRaceWithIssue(t, 61120)
 
 	ctx := context.Background()
 	startKey := []byte("a")
@@ -773,6 +775,7 @@ func TestReplicaRangefeedRetryErrors(t *testing.T) {
 func TestReplicaRangefeedPushesTransactions(t *testing.T) {
 	defer leaktest.AfterTest(t)()
 	defer log.Scope(t).Close(t)
+	skip.UnderRaceWithIssue(t, 61120)
 
 	ctx := context.Background()
 	tc, db, desc := setupClusterForClosedTSTesting(ctx, t, testingTargetDuration,
@@ -887,6 +890,7 @@ func TestReplicaRangefeedPushesTransactions(t *testing.T) {
 func TestReplicaRangefeedNudgeSlowClosedTimestamp(t *testing.T) {
 	defer leaktest.AfterTest(t)()
 	defer log.Scope(t).Close(t)
+	skip.UnderRaceWithIssue(t, 61120)
 
 	ctx := context.Background()
 	tc, db, desc := setupClusterForClosedTSTesting(ctx, t, testingTargetDuration,