Merge #148156 #148225

148156: roachtest: increase fixture timeout to account for fingerprinting r=msbutler a=kev-cao

Fixes: #147871

Release note: None

148225: aceeptance: add script to build and push the acceptance image r=rickystewart,fqazi a=rail

Previously, README.md contained instructions to build the acceptance image, but they were outdated.

This commit adds a script that can be used to build and push the acceptance image and adds the process instructions to README.md.

Additionally, updated the script that builds and pushes the GSS images.

Release note: none
Epic: none

Co-authored-by: Kevin Cao <[email protected]>
Co-authored-by: Rail Aliiev <[email protected]>

Author: 3 people

pkg/acceptance/compose/gss/build-push-gss.sh

@@ -9,10 +9,12 @@ set -xeuo pipefail
 
 TARGET=$1
 TAG=$(date +%Y%m%d-%H%M%S)
+REPO="us-east1-docker.pkg.dev/crl-ci-images/cockroach/acceptance-gss-$TARGET"
+
 if which podman; then
-  podman build --platform linux/amd64,linux/arm64 --manifest us-east1-docker.pkg.dev/crl-ci-images/cockroach/acceptance-gss-$TARGET:$TAG ./$TARGET
-  podman manifest push us-east1-docker.pkg.dev/crl-ci-images/cockroach/acceptance-gss-$TARGET:$TAG us-east1-docker.pkg.dev/crl-ci-images/cockroach/acceptance-gss-$TARGET:$TAG
+  podman build --platform linux/amd64,linux/arm64 --manifest $REPO:$TAG ./$TARGET
+  podman manifest push $REPO:$TAG $REPO:$TAG
 else
   docker buildx create --use
-  docker buildx build --push --platform linux/amd64,linux/arm64 -t us-east1-docker.pkg.dev/crl-ci-images/cockroach/acceptance-gss-$TARGET:$TAG ./$TARGET
+  docker buildx build --push --platform linux/amd64,linux/arm64 -t $REPO:$TAG ./$TARGET
 fi

pkg/acceptance/testdata/README.md

@@ -16,12 +16,10 @@ need to update the image.
 ## Updating the `acceptance` image
 
 - (One-time setup) Depending on how your Docker instance is configured, you may have to run `docker run --privileged --rm tonistiigi/binfmt --install all`. This will install `qemu` emulators on your system for platforms besides your native one.
-- Build the image for both platforms and publish the cross-platform manifest. Note that the non-native build for your image will be very slow since it will have to emulate.
-```
-    TAG=$(date +%Y%m%d-%H%M%S)
-    docker buildx create --use
-    docker buildx build --push --platform linux/amd64,linux/arm64 -t us-east1-docker.pkg.dev/crl-ci-images/cockroach/acceptance:$TAG .
-```
+- Ask someone from the Engineering Productivity team to build the image for
+  both platforms and publish the cross-platform manifest by running
+  `build-push-acceptance.sh`. Note that the non-native build for your image will
+  be very slow since it will have to emulate.
 
 No need to have your changes reviewed before you push an image, as we pin the
 container version to use in `../util_docker.go`. Once your changes are ready for

pkg/acceptance/testdata/build-push-acceptance.sh

@@ -0,0 +1,18 @@
+#!/bin/bash
+
+# Copyright 2022 The Cockroach Authors.
+#
+# Use of this software is governed by the CockroachDB Software License
+# included in the /LICENSE file.
+
+set -xeuo pipefail
+
+REPO=us-east1-docker.pkg.dev/crl-ci-images/cockroach/acceptance
+TAG=$(date +%Y%m%d-%H%M%S)
+if which podman; then
+  podman build --platform linux/amd64,linux/arm64 --manifest $REPO:$TAG ./
+  podman manifest push $REPO:$TAG $REPO:$TAG
+else
+  docker buildx create --use
+  docker buildx build --push --platform linux/amd64,linux/arm64 -t $REPO:$TAG ./
+fi

pkg/cmd/roachtest/tests/backup_fixtures.go

@@ -538,7 +538,9 @@ func registerBackupFixtures(r registry.Registry) {
 			hardware: makeHardwareSpecs(hardwareSpecs{
 				workloadNode: true,
 			}),
-			timeout: 2 * time.Hour,
+			// Fingerprinting is measured to take about 40 minutes on a 350 GB
+			// fixture on top of the allocated 2 hours for the test.
+			timeout: 3 * time.Hour,
 			suites:  registry.Suites(registry.Nightly),
 			clouds:  []spec.Cloud{spec.AWS, spec.GCE},
 		},