From 9e2098bfff34ce7411d97bb5098980efa85b68a8 Mon Sep 17 00:00:00 2001 From: Sayan Chowdhury Date: Tue, 17 Nov 2020 00:08:17 +0530 Subject: [PATCH] Update the azure pro package reference to the oem-azure-pro This commit also fixes the BINHOST URL for the for the developer container portage Signed-off-by: Sayan Chowdhury --- build_library/dev_container_util.sh | 12 ++++++++++-- build_library/vm_image_util.sh | 2 +- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/build_library/dev_container_util.sh b/build_library/dev_container_util.sh index 201cf7d0a7e..b4bba72d3df 100755 --- a/build_library/dev_container_util.sh +++ b/build_library/dev_container_util.sh @@ -2,6 +2,14 @@ # Use of this source code is governed by a BSD-style license that can be # 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" + else + echo "https://storage.googleapis.com/flatcar-jenkins/boards/${BOARD}/${FLATCAR_VERSION_ID}/$1" + fi +} + configure_dev_portage() { # Need profiles at the bare minimum local repo @@ -25,8 +33,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="https://storage.googleapis.com/flatcar-jenkins/boards/${BOARD}/${FLATCAR_VERSION_ID}/pkgs/ -https://storage.googleapis.com/flatcar-jenkins/boards/${BOARD}/${FLATCAR_VERSION_ID}/toolchain/" +PORTAGE_BINHOST="$(get_binhost_url 'pkgs') +$(get_binhost_url 'toolchain')" EOF sudo_clobber "$1/etc/portage/repos.conf/coreos.conf" <