tequilaOS/platform_build_soong
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "support toggling compare mode for rbe actions" into main

Browse source
This commit is contained in:
Anas Sulaiman 2023-10-20 14:41:18 +00:00 committed by Gerrit Code Review
commit f76b3267d5
2 changed files with 16 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
java/droidstubs.go
View file

@ -19,6 +19,7 @@ import (
"path/filepath" "path/filepath"
"regexp" "regexp"
"sort" "sort"
"strconv"
"strings" "strings"
"github.com/google/blueprint/proptools" "github.com/google/blueprint/proptools"
@ -497,6 +498,7 @@ func metalavaCmd(ctx android.ModuleContext, rule *android.RuleBuilder, javaVersi
if metalavaUseRbe(ctx) { if metalavaUseRbe(ctx) {
rule.Remoteable(android.RemoteRuleSupports{RBE: true}) rule.Remoteable(android.RemoteRuleSupports{RBE: true})
execStrategy := ctx.Config().GetenvWithDefault("RBE_METALAVA_EXEC_STRATEGY", remoteexec.LocalExecStrategy) execStrategy := ctx.Config().GetenvWithDefault("RBE_METALAVA_EXEC_STRATEGY", remoteexec.LocalExecStrategy)
compare, _ := strconv.ParseBool(ctx.Config().GetenvWithDefault("RBE_METALAVA_COMPARE", "false"))
labels := map[string]string{"type": "tool", "name": "metalava"} labels := map[string]string{"type": "tool", "name": "metalava"}
// TODO: metalava pool rejects these jobs // TODO: metalava pool rejects these jobs
pool := ctx.Config().GetenvWithDefault("RBE_METALAVA_POOL", "java16") pool := ctx.Config().GetenvWithDefault("RBE_METALAVA_POOL", "java16")
@ -505,6 +507,9 @@ func metalavaCmd(ctx android.ModuleContext, rule *android.RuleBuilder, javaVersi
ExecStrategy: execStrategy, ExecStrategy: execStrategy,
ToolchainInputs: []string{config.JavaCmd(ctx).String()}, ToolchainInputs: []string{config.JavaCmd(ctx).String()},
Platform: map[string]string{remoteexec.PoolKey: pool}, Platform: map[string]string{remoteexec.PoolKey: pool},
Compare: compare,
NumLocalRuns: 1,
NumRemoteRuns: 1,
}) })
} }

11
remoteexec/remoteexec.go
View file

@ -15,6 +15,7 @@
package remoteexec package remoteexec
import ( import (
"fmt"
"sort" "sort"
"strings" "strings"
) )
@ -84,6 +85,12 @@ type REParams struct {
// EnvironmentVariables is a list of environment variables whose values should be passed through // EnvironmentVariables is a list of environment variables whose values should be passed through
// to the remote execution. // to the remote execution.
EnvironmentVariables []string EnvironmentVariables []string
// Boolean indicating whether to compare chosen exec strategy with local execution.
Compare bool
// Number of times the action should be rerun locally.
NumLocalRuns int
// Number of times the action should be rerun remotely.
NumRemoteRuns int
} }
func init() { func init() {
@ -135,6 +142,10 @@ func (r *REParams) wrapperArgs() string {
} }
args += " --exec_strategy=" + strategy args += " --exec_strategy=" + strategy
if r.Compare && r.NumLocalRuns >= 0 && r.NumRemoteRuns >= 0 {
args += fmt.Sprintf(" --compare=true --num_local_reruns=%d --num_remote_reruns=%d", r.NumLocalRuns, r.NumRemoteRuns)
}
if len(r.Inputs) > 0 { if len(r.Inputs) > 0 {
args += " --inputs=" + strings.Join(r.Inputs, ",") args += " --inputs=" + strings.Join(r.Inputs, ",")
} }