forked from cockroachdb/cockroach
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
roachtest: remove direct references to cockroach.service from tests
After cockroachdb#111064, we started naming the systemd unit for cockroach processes differently, since we now might have multiple cockroach processes in the same VM in the context of SQL server processes and cluster virtualization. That change broke a few tests that directly referenced the `cockroach.service` unit. In this change, we create a util function that is reponsible for encapsulating that name and replace direct references to the systemd unit name with calls to this new function. Fixes: cockroachdb#111902 Release note: None
- Loading branch information
1 parent
65ed616
commit d4df32b
Showing
5 changed files
with
31 additions
and
7 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,19 @@ | ||
// Copyright 2023 The Cockroach Authors. | ||
// | ||
// Use of this software is governed by the Business Source License | ||
// included in the file licenses/BSL.txt. | ||
// | ||
// As of the Change Date specified in that file, in accordance with | ||
// the Business Source License, use of this software will be governed | ||
// by the Apache License, Version 2.0, included in the file | ||
// licenses/APL.txt. | ||
|
||
package roachtestutil | ||
|
||
import "github.com/cockroachdb/cockroach/pkg/roachprod/install" | ||
|
||
// SystemInterfaceSystemdUnitName is a convenience function that | ||
// returns the systemd unit name for the system interface | ||
func SystemInterfaceSystemdUnitName() string { | ||
return install.VirtualClusterLabel(install.SystemInterfaceName, 0) | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters