Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2c811552 authored by Kousik Kumar's avatar Kousik Kumar
Browse files

Revert "Add a warning message about missing gcert at the end of the build" 

This reverts commit b018b836.

Reason for revert: Builds will start failing now since the gcert change is about to go in.

Change-Id: I81d36ce6bf4f7a9bc120b34d411f2cb4ec64e5eb
parent b018b836

ui/build/config.go

+0 −15
Original line number Diff line number Diff line
@@ -1205,21 +1205,6 @@ func (c *configImpl) rbeAuth() (string, string) { 
	return "RBE_use_application_default_credentials", "true"

}



func (c *configImpl) IsGooglerEnvironment() bool {

	cf := "ANDROID_BUILD_ENVIRONMENT_CONFIG"

	if v, ok := c.environ.Get(cf); ok {

		return v == "googler"

	}

	return false

}



func (c *configImpl) GoogleProdCredsExist() bool {

	if _, err := exec.Command("/usr/bin/prodcertstatus", "--simple_output", "--nocheck_loas").Output(); err != nil {

		return false

	}

	return true

}



func (c *configImpl) UseRemoteBuild() bool {

	return c.UseGoma() || c.UseRBE()

}

ui/build/rbe.go

+0 −10
Original line number Diff line number Diff line
@@ -119,7 +119,6 @@ func startRBE(ctx Context, config Config) { 
}



func stopRBE(ctx Context, config Config) {

	defer checkProdCreds(ctx, config)

	cmd := Command(ctx, config, "stopRBE bootstrap", rbeCommand(ctx, config, bootstrapCmd), "-shutdown")

	output, err := cmd.CombinedOutput()

	if err != nil {
@@ -132,15 +131,6 @@ func stopRBE(ctx Context, config Config) { 
	}

}



func checkProdCreds(ctx Context, config Config) {

	if !config.IsGooglerEnvironment() || config.GoogleProdCredsExist() {

		return

	}

	fmt.Fprintln(ctx.Writer, "")

	fmt.Fprintln(ctx.Writer, "\033[33mWARNING: Missing LOAS credentials, please run `gcert`. This will result in failing RBE builds in the future, see go/build-fast#authentication.\033[0m")

	fmt.Fprintln(ctx.Writer, "")

}



// DumpRBEMetrics creates a metrics protobuf file containing RBE related metrics.

// The protobuf file is created if RBE is enabled and the proxy service has

// started. The proxy service is shutdown in order to dump the RBE metrics to the