mirrors/flatcar-scripts
1
0
Fork 0
mirror of https://github.com/flatcar/scripts.git synced 2025-09-23 06:31:18 +02:00
Code Issues Packages Projects Releases Wiki Activity

Update the azure pro package reference to the oem-azure-pro

Browse Source 
This commit also fixes the BINHOST URL for the for the developer
container portage

Signed-off-by: Sayan Chowdhury <sayan@kinvolk.io>
This commit is contained in:
Sayan Chowdhury 2020-11-17 00:08:17 +05:30
parent 81d4ed8940
commit 9e2098bfff
No known key found for this signature in database
GPG Key ID: B02399319CD05C8B
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
build_library/dev_container_util.sh
View File

@ -2,6 +2,14 @@
# Use of this source code is governed by a BSD-style license that can be # Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file. # 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() { configure_dev_portage() {
# Need profiles at the bare minimum # Need profiles at the bare minimum
local repo local repo
@ -25,8 +33,8 @@ PKGDIR="/var/lib/portage/pkgs"
PORT_LOGDIR="/var/log/portage" PORT_LOGDIR="/var/log/portage"
PORTDIR="/var/lib/portage/portage-stable" PORTDIR="/var/lib/portage/portage-stable"
PORTDIR_OVERLAY="/var/lib/portage/coreos-overlay" PORTDIR_OVERLAY="/var/lib/portage/coreos-overlay"
PORTAGE_BINHOST="https://storage.googleapis.com/flatcar-jenkins/boards/${BOARD}/${FLATCAR_VERSION_ID}/pkgs/ PORTAGE_BINHOST="$(get_binhost_url 'pkgs')
https://storage.googleapis.com/flatcar-jenkins/boards/${BOARD}/${FLATCAR_VERSION_ID}/toolchain/" $(get_binhost_url 'toolchain')"
EOF EOF
sudo_clobber "$1/etc/portage/repos.conf/coreos.conf" <<EOF sudo_clobber "$1/etc/portage/repos.conf/coreos.conf" <<EOF

2
build_library/vm_image_util.sh
View File

@ -278,7 +278,7 @@ IMG_azure_OEM_PACKAGE=oem-azure
## azure pro ## azure pro
IMG_azure_pro_DISK_FORMAT=vhd IMG_azure_pro_DISK_FORMAT=vhd
IMG_azure_pro_DISK_LAYOUT=azure IMG_azure_pro_DISK_LAYOUT=azure
IMG_azure_pro_OEM_PACKAGE=oem-azure IMG_azure_pro_OEM_PACKAGE=oem-azure-pro
## hyper-v ## hyper-v
IMG_hyperv_DISK_FORMAT=vhd IMG_hyperv_DISK_FORMAT=vhd