dev_container_util.sh: Use the shflags group instead of the default flag

The build_image script invokes the create_dev_container function, and passes the `FLAGS_group` as param. Use the param, to generate the binhost URL instead of using the DEFAULT_GROUP which stays as developer always. Fixes: flatcar/Flatcar#298 Signed-off-by: Sayan Chowdhury <[email protected]>
flatcar · Dec 14, 2020 · 70e827d · 70e827d
1 parent bed73e2
commit 70e827d
Showing 1 changed file with 8 additions and 6 deletions.
diff --git a/build_library/dev_container_util.sh b/build_library/dev_container_util.sh
@@ -3,10 +3,12 @@
 # found in the LICENSE file.
 
 get_binhost_url() {
-	if [ "${DEFAULT_GROUP}" == "developer" ]; then
-		echo "https://storage.googleapis.com/flatcar-jenkins/${DEFAULT_GROUP}/boards/${BOARD}/${FLATCAR_VERSION}/$1"
+	local image_group=$1
+	local image_path=$2
+	if [ "${image_group}" == "developer" ]; then
+		echo "https://storage.googleapis.com/flatcar-jenkins/${image_group}/boards/${BOARD}/${FLATCAR_VERSION}/${image_path}"
 	else
-		echo "https://storage.googleapis.com/flatcar-jenkins/boards/${BOARD}/${FLATCAR_VERSION_ID}/$1"
+		echo "https://storage.googleapis.com/flatcar-jenkins/boards/${BOARD}/${FLATCAR_VERSION_ID}/${image_path}"
 	fi
 }
 
@@ -33,8 +35,8 @@ PKGDIR="/var/lib/portage/pkgs"
 PORT_LOGDIR="/var/log/portage"
 PORTDIR="/var/lib/portage/portage-stable"
 PORTDIR_OVERLAY="/var/lib/portage/coreos-overlay"
-PORTAGE_BINHOST="$(get_binhost_url 'pkgs')
-$(get_binhost_url 'toolchain')"
+PORTAGE_BINHOST="$(get_binhost_url $2 'pkgs')
+$(get_binhost_url $2 'toolchain')"
 EOF
 
 sudo_clobber "$1/etc/portage/repos.conf/coreos.conf" <<EOF
@@ -90,7 +92,7 @@ create_dev_container() {
   insert_licenses "${BUILD_DIR}/${image_licenses}" "${root_fs_dir}"
 
   # Setup portage for emerge and gmerge
-  configure_dev_portage "${root_fs_dir}"
+  configure_dev_portage "${root_fs_dir}" "${update_group}"
 
   # Mark the image as a developer image (input to chromeos_startup).
   # TODO(arkaitzr): Remove this file when applications no longer rely on it