From 1a1fcadf0a4ded71a7f0a1a1a073a9e8a7ef3815 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kai=20L=C3=BCke?= <kai@kinvolk.io>
Date: Wed, 22 Jan 2020 10:42:12 +0100
Subject: [PATCH] Use same APPID for arm64 and amd64

Nebraska supports an additional arch
variable to distinguish both boards.
---
 build_library/set_lsb_release |  5 -----
 signing/transfer.sh           | 16 +++++++---------
 2 files changed, 7 insertions(+), 14 deletions(-)

diff --git a/build_library/set_lsb_release b/build_library/set_lsb_release
index c6a680135d..97b278c8e9 100755
--- a/build_library/set_lsb_release
+++ b/build_library/set_lsb_release
@@ -31,12 +31,7 @@ OS_ID="flatcar"
 OS_ID_LIKE="coreos"
 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}"
-if [[ "${FLAGS_board}" == arm64-* ]]; then
-  FLATCAR_APPID="{103867da-e3a2-4c92-b0b3-7fbd7f7d8b71}"
-fi
 
 # DISTRIB_* are the standard lsb-release names
 sudo mkdir -p "${ROOT_FS_DIR}/usr/share/flatcar" "${ROOT_FS_DIR}/etc/flatcar"
diff --git a/signing/transfer.sh b/signing/transfer.sh
index 361146c773..c308fc48d4 100755
--- a/signing/transfer.sh
+++ b/signing/transfer.sh
@@ -2,9 +2,7 @@
 
 set -eux
 
-declare -A APPID
-APPID[amd64-usr]=e96281a6-d1af-4bde-9a0a-97b76e56dc57
-APPID[arm64-usr]=103867da-e3a2-4c92-b0b3-7fbd7f7d8b71
+APPID=e96281a6-d1af-4bde-9a0a-97b76e56dc57
 
 declare -A RELEASE_CHANNEL
 RELEASE_CHANNEL[alpha]=Alpha
@@ -92,7 +90,7 @@ upload() {
     "$(dirname $0)/../core_roller_upload" \
         --user="${ROLLER_USERNAME}" \
         --api_key="${ROLLER_API_KEY}" \
-        --app_id="${APPID[${board}]}" \
+        --app_id="${APPID}" \
         --board="${board}" \
         --version="${version}" \
         --payload="${payload}"
@@ -111,7 +109,7 @@ upload() {
             --user="${ROLLER_USERNAME}" \
             --key="${ROLLER_API_KEY}" \
             channel update \
-            --app-id="${APPID[${board}]}" \
+            --app-id="${APPID}" \
             --channel="${canary_channel}" \
             --version="${version}"
     fi
@@ -130,7 +128,7 @@ ready() {
         --user="${ROLLER_USERNAME}" \
         --key="${ROLLER_API_KEY}" \
         group percent \
-        --app-id="${APPID[${board}]}" \
+        --app-id="${APPID}" \
         --group-id="${channel}" \
         --update-percent=0
 
@@ -141,7 +139,7 @@ ready() {
         --user="${ROLLER_USERNAME}" \
         --key="${ROLLER_API_KEY}" \
         channel update \
-        --app-id="${APPID[${board}]}" \
+        --app-id="${APPID}" \
         --channel="${RELEASE_CHANNEL[${channel}]}" \
         --publish=true \
         --version="${version}"
@@ -162,7 +160,7 @@ roll() {
             --user="${ROLLER_USERNAME}" \
             --key="${ROLLER_API_KEY}" \
             group percent \
-            --app-id="${APPID[${board}]}" \
+            --app-id="${APPID}" \
             --group-id="${channel}" \
             --update-percent=100
     else
@@ -174,7 +172,7 @@ roll() {
             --user="${ROLLER_USERNAME}" \
             --key="${ROLLER_API_KEY}" \
             rollout create linear \
-            --app-id="${APPID[${board}]}" \
+            --app-id="${APPID}" \
             --group-id="${channel}" \
             --duration="${seconds}" \
             --frame-size="60"