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

Use same APPID for arm64 and amd64

Browse Source 
Nebraska supports an additional arch
variable to distinguish both boards.
This commit is contained in:
Kai Lüke 2020-01-22 10:42:12 +01:00
parent b085b38ef4
commit 1a1fcadf0a
No known key found for this signature in database
GPG Key ID: E5601DA3A1D902A8
2 changed files with 7 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
build_library/set_lsb_release
View File

@ -31,12 +31,7 @@ OS_ID="flatcar"
OS_ID_LIKE="coreos" OS_ID_LIKE="coreos"
OS_PRETTY_NAME="$OS_NAME $FLATCAR_VERSION (${OS_CODENAME})" OS_PRETTY_NAME="$OS_NAME $FLATCAR_VERSION (${OS_CODENAME})"
# temporarily point arm at a different appid until update support
# is completed in update_engine and the CoreUpdate service.
FLATCAR_APPID="{e96281a6-d1af-4bde-9a0a-97b76e56dc57}" FLATCAR_APPID="{e96281a6-d1af-4bde-9a0a-97b76e56dc57}"
if [[ "${FLAGS_board}" == arm64-* ]]; then
FLATCAR_APPID="{103867da-e3a2-4c92-b0b3-7fbd7f7d8b71}"
fi
# DISTRIB_* are the standard lsb-release names # DISTRIB_* are the standard lsb-release names
sudo mkdir -p "${ROOT_FS_DIR}/usr/share/flatcar" "${ROOT_FS_DIR}/etc/flatcar" sudo mkdir -p "${ROOT_FS_DIR}/usr/share/flatcar" "${ROOT_FS_DIR}/etc/flatcar"

16
signing/transfer.sh
View File

@ -2,9 +2,7 @@
set -eux set -eux
declare -A APPID APPID=e96281a6-d1af-4bde-9a0a-97b76e56dc57
APPID[amd64-usr]=e96281a6-d1af-4bde-9a0a-97b76e56dc57
APPID[arm64-usr]=103867da-e3a2-4c92-b0b3-7fbd7f7d8b71
declare -A RELEASE_CHANNEL declare -A RELEASE_CHANNEL
RELEASE_CHANNEL[alpha]=Alpha RELEASE_CHANNEL[alpha]=Alpha
@ -92,7 +90,7 @@ upload() {
"$(dirname $0)/../core_roller_upload" \ "$(dirname $0)/../core_roller_upload" \
--user="${ROLLER_USERNAME}" \ --user="${ROLLER_USERNAME}" \
--api_key="${ROLLER_API_KEY}" \ --api_key="${ROLLER_API_KEY}" \
--app_id="${APPID[${board}]}" \ --app_id="${APPID}" \
--board="${board}" \ --board="${board}" \
--version="${version}" \ --version="${version}" \
--payload="${payload}" --payload="${payload}"
@ -111,7 +109,7 @@ upload() {
--user="${ROLLER_USERNAME}" \ --user="${ROLLER_USERNAME}" \
--key="${ROLLER_API_KEY}" \ --key="${ROLLER_API_KEY}" \
channel update \ channel update \
--app-id="${APPID[${board}]}" \ --app-id="${APPID}" \
--channel="${canary_channel}" \ --channel="${canary_channel}" \
--version="${version}" --version="${version}"
fi fi
@ -130,7 +128,7 @@ ready() {
--user="${ROLLER_USERNAME}" \ --user="${ROLLER_USERNAME}" \
--key="${ROLLER_API_KEY}" \ --key="${ROLLER_API_KEY}" \
group percent \ group percent \
--app-id="${APPID[${board}]}" \ --app-id="${APPID}" \
--group-id="${channel}" \ --group-id="${channel}" \
--update-percent=0 --update-percent=0
@ -141,7 +139,7 @@ ready() {
--user="${ROLLER_USERNAME}" \ --user="${ROLLER_USERNAME}" \
--key="${ROLLER_API_KEY}" \ --key="${ROLLER_API_KEY}" \
channel update \ channel update \
--app-id="${APPID[${board}]}" \ --app-id="${APPID}" \
--channel="${RELEASE_CHANNEL[${channel}]}" \ --channel="${RELEASE_CHANNEL[${channel}]}" \
--publish=true \ --publish=true \
--version="${version}" --version="${version}"
@ -162,7 +160,7 @@ roll() {
--user="${ROLLER_USERNAME}" \ --user="${ROLLER_USERNAME}" \
--key="${ROLLER_API_KEY}" \ --key="${ROLLER_API_KEY}" \
group percent \ group percent \
--app-id="${APPID[${board}]}" \ --app-id="${APPID}" \
--group-id="${channel}" \ --group-id="${channel}" \
--update-percent=100 --update-percent=100
else else
@ -174,7 +172,7 @@ roll() {
--user="${ROLLER_USERNAME}" \ --user="${ROLLER_USERNAME}" \
--key="${ROLLER_API_KEY}" \ --key="${ROLLER_API_KEY}" \
rollout create linear \ rollout create linear \
--app-id="${APPID[${board}]}" \ --app-id="${APPID}" \
--group-id="${channel}" \ --group-id="${channel}" \
--duration="${seconds}" \ --duration="${seconds}" \
--frame-size="60" --frame-size="60"