[HO] Fix aosp branch and target

google · Aug 25, 2023 · 4403f67 · 4403f67
1 parent 497d7f0
commit 4403f67
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 7 deletions.
diff --git a/docker/build-android-with-docker.sh b/docker/build-android-with-docker.sh
@@ -20,7 +20,7 @@ function multiline_helper {
 function get_default_lunch_target {
     local def_lunch_target=""
     case "$(uname -m)" in
-        x86_64|i386|x86|amd64) def_lunch_target="aosp_cf_x86_64_phone-userdebug" ;;
+        x86_64|i386|x86|amd64) def_lunch_target="aosp_cf_x86_64_phone-trunk_staging-userdebug" ;;
         aarch64|arm64) def_lunch_target="aosp_cf_arm64_phone-userdebug" ;;
         *)
             >&2 echo "unsupported architecture $(uname -m)"

diff --git a/docker/download-aosp.sh b/docker/download-aosp.sh
@@ -134,7 +134,7 @@ SKIP_USERDATA=""
 
 parse_opts $*
 
-URL=https://ci.android.com/builds/latest/branches/aosp-master${THROTTLED}/targets/aosp_cf_${ARCH}_phone-userdebug/view/BUILD_INFO
+URL=https://ci.android.com/builds/latest/branches/aosp-main${THROTTLED}/targets/aosp_cf_${ARCH}_phone-userdebug/view/BUILD_INFO
 RURL=$(curl -Ls -o /dev/null -w %{url_effective} ${URL})
 
 if [ "${DOWNLOAD_ANDROID}" -eq 1 ]; then

diff --git a/frontend/src/host_orchestrator/orchestrator/createcvdaction_test.go b/frontend/src/host_orchestrator/orchestrator/createcvdaction_test.go
@@ -41,7 +41,7 @@ func TestCreateCVDInvalidRequestsEmptyFields(t *testing.T) {
 					AndroidCIBuildSource: &apiv1.AndroidCIBuildSource{
 						MainBuild: &apiv1.AndroidCIBuild{
 							BuildID: "1234",
-							Target:  "aosp_cf_x86_64_phone-userdebug",
+							Target:  "aosp_cf_x86_64_phone-trunk_staging-userdebug",
 						},
 					},
 				},

diff --git a/frontend/src/host_orchestrator/orchestrator/instancemanager.go b/frontend/src/host_orchestrator/orchestrator/instancemanager.go
@@ -175,8 +175,8 @@ func HostBugReport(ctx cvd.CVDExecContext, paths IMPaths, out string) error {
 
 const (
 	// TODO(b/267525748): Make these values configurable.
-	mainBuildDefaultBranch = "aosp-master"
-	mainBuildDefaultTarget = "aosp_cf_x86_64_phone-userdebug"
+	mainBuildDefaultBranch = "aosp-main"
+	mainBuildDefaultTarget = "aosp_cf_x86_64_phone-trunk_staging-userdebug"
 )
 
 func defaultMainBuild() *apiv1.AndroidCIBuild {

diff --git a/frontend/src/liboperator/api/v1/messages.go b/frontend/src/liboperator/api/v1/messages.go
@@ -80,7 +80,7 @@ const (
 )
 
 type AndroidCIBundle struct {
-	// If omitted, defaults to branch "aosp-main" and target `aosp_cf_x86_64_phone-userdebug`.
+	// If omitted, defaults to branch "aosp-main" and target `aosp_cf_x86_64_phone-trunk_staging-userdebug`.
 	Build *AndroidCIBuild `json:"build,omitempty"`
 	// If omitted, it defaults to the `main` bundle type.
 	Type ArtifactsBundleType `json:"type"`
@@ -109,7 +109,7 @@ type AndroidCIBuild struct {
 }
 
 type AndroidCIBuildSource struct {
-	// Main build. If omitted, defaults to branch "aosp-master" and target `aosp_cf_x86_64_phone-userdebug`.
+	// Main build. If omitted, defaults to branch "aosp-main" and target `aosp_cf_x86_64_phone-trunk_staging-userdebug`.
 	MainBuild *AndroidCIBuild `json:"main_build,omitempty"`
 	// Uses this specific kernel build target if set.
 	KernelBuild *AndroidCIBuild `json:"kernel_build,omitempty"`