Use ToT's local manifest for stable branch

config.txt

@@ -1,13 +1,13 @@
 user_password=casper
-working_dir=fw_nissa_768
+working_dir=stable_b
-repo_branch=firmware-nissa-15217.768.B
+repo_branch=stable
 chrome_board_name=nissa
 chrome_project_name=joxer
 chipset_name=adln
 is_repo_sync=true
 is_setup_board=true
 is_build_packages=false
-is_build_firmware=true
+is_build_firmware=false
 is_build_image=false
 is_install_image=false
 dut_ip_addr=192.168.1.2

cros_cp_localmanifest.sh

@@ -25,6 +25,13 @@ then
     echo "INFO: copy local manifests, No branch specified"
     cp -R ${SCRIPT_DIR}/local_manifests ${_working_full_path}/.repo/
 else
+
+    if [ $2 = "stable" ]; then
+        rm -fr ${_working_full_path}/.repo/local_manifests
+        echo "INFO: rm -fr ${_working_full_path}/.repo/local_manifests"
+        echo "INFO: copy local manifests, stable branch is specified, using ToT's manifests"
+        cp -R ${SCRIPT_DIR}/local_manifests ${_working_full_path}/.repo/
+    else
         rm -fr ${_working_full_path}/.repo/local_manifests
         echo "INFO: rm -fr ${_working_full_path}/.repo/local_manifests"
         echo "INFO: copy $2 local manifests"
@@ -32,6 +39,7 @@ else
         cp -R ${SCRIPT_DIR}/${local_manifest_dir} ${_working_full_path}/.repo
         mv ${_working_full_path}/.repo/${local_manifest_dir} ${_working_full_path}/.repo/local_manifests
     fi
+fi
 
 echo "INFO: ls ${_working_full_path}/.repo"
 ls ${_working_full_path}/.repo 

firmware-nissa-15217.B_local_manifests/adln_chipset.xml

@@ -1,73 +0,0 @@
-<manifest>
-  <remote name="cros-internal"
-          fetch="https://chrome-internal.googlesource.com"
-          review="https://chrome-internal-review.googlesource.com" />
-  <project name="chromeos/overlays/project-cheets-private"
-	   path="src/private-overlays/project-cheets-private"
-	   remote="cros-internal"
-	   groups="minilayout" revision="refs/heads/firmware-nissa-15217.B" />
-  <project name="chromeos/autotest-cheets"
-	   path="src/third_party/autotest-tests-cheets"
-	   remote="cros-internal"
-	   groups="minilayout" revision="refs/heads/firmware-nissa-15217.B" />
-  <project name="chromeos/overlays/chromeos-partner-overlay"
-	   path="src/private-overlays/chromeos-partner-overlay"
-	   remote="cros-internal"
-	   groups="minilayout" revision="refs/heads/firmware-nissa-15217.B" />
-  <project remote="cros-internal"
-	   path="src/private-overlays/chipset-adln-private"
-	   groups="minilayout"
-	   name="chromeos/overlays/chipset-adln-private" revision="refs/heads/firmware-nissa-15217.B" />
-  <project path="src/third_party/fsp/adln/edk2-platforms/branch1-private"
-           remote="cros-internal"
-           name="chromeos/third_party/intel-fsp/edk2-platforms"
-           revision="refs/heads/firmware-nissa-15217.B-chromeos-adl-n-branch1-private"
-           groups="minilayout" />
-  <project path="src/third_party/fsp/adln/edk2/branch1-private"
-           remote="cros-internal"
-           name="chromeos/third_party/intel-fsp/edk2"
-           revision="refs/heads/firmware-nissa-15217.B-chromeos-adl-n-branch1-private"
-           groups="minilayout" />
-  <project path="src/third_party/fsp/adln/fsp"
-           remote="cros-internal"
-           name="chromeos/third_party/intel-fsp/adl-n"
-           revision="refs/heads/firmware-nissa-15217.B"
-           groups="minilayout" />
-  <project path="src/third_party/fsp/twl/edk2-platforms/branch1-private"
-           remote="cros-internal"
-           name="chromeos/third_party/intel-fsp/edk2-platforms-intelcollab"
-           revision="refs/heads/firmware-nissa-15217.B-chromeos-twl-branch1-private"
-           groups="minilayout" />
-  <project path="src/third_party/fsp/twl/edk2/branch1-private"
-           remote="cros-internal"
-           name="chromeos/third_party/intel-fsp/edk2-intelcollab"
-           revision="refs/heads/firmware-nissa-15217.B-chromeos-twl-branch1-private"
-           groups="minilayout" />
-  <project path="src/third_party/fsp/twl/fsp"
-           remote="cros-internal"
-           name="chromeos/third_party/intel-fsp/twl"
-           revision="refs/heads/firmware-nissa-15217.B"
-           groups="minilayout" />
-
-  <!-- Example program galaxy, its projects, and overlay -->
-  <project remote="cros-internal"
-           path="src/program/galaxy"
-           name="chromeos/program/galaxy"
-           groups="partner-config" revision="refs/heads/firmware-nissa-15217.B" />
-  <project remote="cros-internal"
-           path="src/project/galaxy/andromeda"
-           name="chromeos/project/galaxy/andromeda"
-           groups="partner-config" revision="refs/heads/firmware-nissa-15217.B" />
-  <project remote="cros-internal"
-           path="src/project/galaxy/milkyway"
-           name="chromeos/project/galaxy/milkyway"
-           groups="partner-config" revision="refs/heads/firmware-nissa-15217.B" />
-  <project remote="cros-internal"
-           path="src/project/galaxy/sombrero"
-           name="chromeos/project/galaxy/sombrero"
-           groups="partner-config" revision="refs/heads/firmware-nissa-15217.B" />
-  <project name="chromeos/overlays/overlay-galaxy-private"
-           path="src/private-overlays/overlay-galaxy-private"
-           remote="cros-internal"
-           groups="minilayout" revision="refs/heads/firmware-nissa-15217.B" />
-</manifest>

firmware-nissa-15217.B_local_manifests/joxer_project.xml

@@ -1,10 +0,0 @@
-<manifest>
-  <remote  name="cros-internal"
-           fetch="https://chrome-internal.googlesource.com"
-           review="https://chrome-internal-review.googlesource.com" />
-  <!-- project repo-->
-  <project remote="cros-internal"
-           path="src/project/nissa/joxer"
-           name="chromeos/project/nissa/joxer"
-           groups="partner-config" revision="refs/heads/firmware-nissa-15217.B" />
-</manifest>

firmware-nissa-15217.B_local_manifests/nissa_program.xml

@@ -1,14 +0,0 @@
-<manifest>
-  <remote  name="cros-internal"
-           fetch="https://chrome-internal.googlesource.com"
-           review="https://chrome-internal-review.googlesource.com" />
-  <!-- Nissa Specific Repositories -->
-  <project remote="cros-internal"
-           path="src/private-overlays/overlay-nissa-private"
-           groups="minilayout,firmware"
-           name="chromeos/overlays/overlay-nissa-private" revision="refs/heads/firmware-nissa-15217.B" />
-  <project remote="cros-internal"
-           path="src/program/nissa"
-           name="chromeos/program/nissa"
-           groups="partner-config" revision="refs/heads/firmware-nissa-15217.B" />
-</manifest>

main_cros_reposync_build.sh

@@ -135,20 +135,19 @@ spawn ./cros_repoinit.sh ${working_dir} ${repo_branch}
 # send "y\r"
 expect "repo has been initialized"
 
-# # remove using the local manifest files when doing this on branch 
+# todo: search to check if branch supported 
-# # todo: search to check if branch supported 
+spawn ./cros_cp_localmanifest.sh ${working_dir} ${repo_branch}
-# spawn ./cros_cp_localmanifest.sh ${working_dir} ${repo_branch}
+expect "local_manifests"   
-# expect "local_manifests"   
 
-# if { $is_repo_sync } {
+if { $is_repo_sync } {
-#     send "repo forall -c \"git reset --hard\"\r"
+    send "repo forall -c \"git reset --hard\"\r"
 
-#     spawn ./cros_reposync.sh ${working_dir} ${reposync_thread}
+    spawn ./cros_reposync.sh ${working_dir} ${reposync_thread}
-#     expect "repo sync has finished successfully"
+    expect "repo sync has finished successfully"
-# } else {
+} else {
-#     send "ls -al\r"
+    send "ls -al\r"
-#     expect ".repo"
+    expect ".repo"
-# }
+}
 
 spawn ./cros_cp_utilities.sh ${working_dir}
 expect "dut_pty.sh" 
@@ -159,23 +158,23 @@ send "$user_password\r"
 
 expect "(cr)"
 
-if { $repo_branch eq "default" } {
+# if { $repo_branch eq "default" } {
-    puts "SEND branch is default, use local_manifests folder"
+#     puts "SEND branch is default, use local_manifests folder"
-} else {
+# } else {
-    puts "INFO: board name = ${chrome_board_name}"
+#     puts "INFO: board name = ${chrome_board_name}"
-    if { ${chrome_board_name} eq "nissa" } {
+#     if { ${chrome_board_name} eq "nissa" } {
-        puts "INFO: chrome_chipset_name = adln"
+#         puts "INFO: chrome_chipset_name = adln"
-        set chrome_chipset_name  "adln"
+#         set chrome_chipset_name  "adln"
-    }
+#     }
 
-    puts "SEND: ../config/setup_project.sh --chipset ${chrome_chipset_name} --program=${chrome_board_name} --project=${chrome_project_name} --branch=${repo_branch}"
+#     puts "SEND: ../config/setup_project.sh --chipset ${chrome_chipset_name} --program=${chrome_board_name} --project=${chrome_project_name} --branch=${repo_branch}"
-    send "../config/setup_project.sh --chipset ${chrome_chipset_name} --program=${chrome_board_name} --project=${chrome_project_name} --branch=${repo_branch}\r"
+#     send "../config/setup_project.sh --chipset ${chrome_chipset_name} --program=${chrome_board_name} --project=${chrome_project_name} --branch=${repo_branch}\r"
 
-    expect "Local manifest setup complete"
+#     expect "Local manifest setup complete"
-    puts "SNED: repo sync --force-sync -j48"
+#     puts "SNED: repo sync --force-sync -j48"
-    send "repo sync --force-sync -j48\r"
+#     send "repo sync --force-sync -j48\r"
-    expect "successfully"
+#     expect "successfully"
-}
+# }
 
 set setup_board_log_file_name "${chrome_board_name}_${chrome_project_name}_dailybuild_setup_board_${date}.log"
 set build_package_log_file_name "${chrome_board_name}_${chrome_project_name}_dailybuild_build_package_${date}.log"
@@ -259,7 +258,7 @@ expect "(cr)"
 
 if { $is_build_image } {
     if { $is_kernel_tty_enable } {
-        send "cros build-images --board=${chrome_board_name} test | tee ${build_image_log_file_name}\r" 
+        send "./build_image --board=${chrome_board_name} --noenable_rootfs_verification test | tee ${build_image_log_file_name}\r" 
 
     } else {
         send "./build_image --enable_serial='ttyS0,115200n8' --board=${chrome_board_name} --noenable_rootfs_verification test | tee ${build_image_log_file_name}\r"