build

fix merge conflict #15218

Job	Run time
set-product-version	6s
generate-metadata-file	24s
product-metadata	25s
verify-product-metadata	3s
Go 1.23.3 linux arm build	6m 16s
Go 1.23.3 darwin amd64 build	7m 7s
Go 1.23.3 darwin arm64 build	7m 26s
Go 1.23.3 linux arm64 build	3m 31s
Go 1.23.3 linux 386 build	6m 11s
Go 1.23.3 freebsd 386 build	5m 43s
Go 1.23.3 linux amd64 build	6m 25s
Go 1.23.3 freebsd amd64 build	6m 14s
Go 1.23.3 freebsd arm build	5m 45s
Go 1.23.3 windows 386 build	5m 52s
Go 1.23.3 windows amd64 build	6m 20s
Go 1.23.3 netbsd 386 build	2m 50s
Go 1.23.3 netbsd amd64 build	3m 28s
Go 1.23.3 netbsd arm build	3m 10s
Go 1.23.3 openbsd 386 build	6m 4s
Go 1.23.3 openbsd amd64 build	6m 20s
Go 1.23.3 openbsd arm build	5m 46s
Go 1.23.3 solaris amd64 build	6m 13s
Docker arm build	58s
Docker arm64 build	58s
Docker 386 build	48s
Docker amd64 build	49s
bats / CLI tests	13m 39s
Enos / setup	40s
Enos / Integration (e2e_aws builder:crt ip_version:4)	13m 44s
Enos / Integration (e2e_database)	5m 37s
Enos / Integration (e2e_docker_base builder:crt)	20m 33s
Enos / Integration (e2e_docker_base_plus builder:crt)	9m 14s
Enos / Integration (e2e_docker_base_with_gcp builder:crt)	6m 51s
Enos / Integration (e2e_docker_base_with_vault builder:crt)	5m 11s
Enos / Integration (e2e_docker_base_with_worker builder:crt)	3m 50s
Enos / Integration (e2e_docker_worker_registration_controller_led builder:crt)	5m 10s
Enos / Integration (e2e_docker_worker_registration_worker_led builder:crt)	3m 53s
	3h 13m 34s

Provide feedback