gerrit.o-ran-sc Code Review - pti/rtp.git/blob

   1 From 5ea4c7ef61e071e82d771c8d1f457f950a736eea Mon Sep 17 00:00:00 2001
   2 From: Jackie Huang <jackie.huang@windriver.com>
   3 Date: Wed, 8 Feb 2023 01:19:56 -0500
   4 Subject: [PATCH 05/12] helm: add dl_files_arm64 and fix the rules
   5
   6 The dl_files for arm64 are different whith the ones for x86,
   7 so add dl_files_arm64 for arm64.
   8
   9 Use DEB_HOST_ARCH to replace the hardcoded arch name in the
  10 rules file.
  11
  12 Test Plan:
  13 PASS: build-pkgs on x86-64 host
  14 PASS: build-image on x86-64 host
  15 PASS: build-pkgs on arm64 host
  16 PASS: build-image on arm64 host
  17 PASS: Deploy AIO-SX on x86-64 target
  18 PASS: Deploy AIO-SX on arm64 target
  19 PASS: Deploy AIO-DX on arm64 targets
  20 PASS: Deploy std (2+2+2) on arm64 targets
  21
  22 Story: 2010739
  23 Task: 47981
  24
  25 Depends-On: https://review.opendev.org/c/starlingx/root/+/889686
  26
  27 Change-Id: Ie71073e590fdde8ecf8d10d08c31e07904d89964
  28 Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
  29 ---
  30  kubernetes/helm/debian/deb_folder/rules | 7 ++++---
  31  kubernetes/helm/debian/meta_data.yaml   | 9 +++++++++
  32  2 files changed, 13 insertions(+), 3 deletions(-)
  33
  34 diff --git a/kubernetes/helm/debian/deb_folder/rules b/kubernetes/helm/debian/deb_folder/rules
  35 index 6bac58e6..343a59b9 100755
  36 --- a/kubernetes/helm/debian/deb_folder/rules
  37 +++ b/kubernetes/helm/debian/deb_folder/rules
  38 @@ -6,12 +6,13 @@ export ROOT = debian/tmp
  39  export SBINDIR = $(ROOT)/usr/sbin
  40  export SUDOERDIR = $(ROOT)/etc/sudoers.d
  41
  42 +export DEB_HOST_ARCH = $(shell dpkg-architecture -qDEB_HOST_ARCH 2>/dev/null)
  43  export HELM_VERSION = 3.12.2
  44 -export HELM_EXECUTABLE = linux-amd64/helm
  45 -export HELM_PKG = helm-v$(HELM_VERSION)-linux-amd64.tar.gz
  46 +export HELM_EXECUTABLE = linux-$(DEB_HOST_ARCH)/helm
  47 +export HELM_PKG = helm-v$(HELM_VERSION)-linux-$(DEB_HOST_ARCH).tar.gz
  48
  49  export HELM_MAPKUBEAPIS_VERSION =  0.4.1
  50 -export HELM_MAPKUBEAPIS_PKG = helm-mapkubeapis_$(HELM_MAPKUBEAPIS_VERSION)_linux_amd64.tar.gz
  51 +export HELM_MAPKUBEAPIS_PKG = helm-mapkubeapis_$(HELM_MAPKUBEAPIS_VERSION)_linux_$(DEB_HOST_ARCH).tar.gz
  52
  53  %:
  54         dh $@
  55 diff --git a/kubernetes/helm/debian/meta_data.yaml b/kubernetes/helm/debian/meta_data.yaml
  56 index 915e3e4b..c210350d 100644
  57 --- a/kubernetes/helm/debian/meta_data.yaml
  58 +++ b/kubernetes/helm/debian/meta_data.yaml
  59 @@ -11,6 +11,15 @@ dl_files:
  60      topdir: mapkubeapis
  61      url: https://github.com/helm/helm-mapkubeapis/releases/download/v0.4.1/helm-mapkubeapis_0.4.1_linux_amd64.tar.gz
  62      sha256sum: e90a22c4acee76774589042f6a5901e136ee33c10630790d6cff37d169905a78
  63 +dl_files_arm64:
  64 +  helm-v3.12.2-linux-arm64.tar.gz:
  65 +    topdir: linux-arm64
  66 +    url: https://get.helm.sh/helm-v3.12.2-linux-arm64.tar.gz
  67 +    sha256sum: cfafbae85c31afde88c69f0e5053610c8c455826081c1b2d665d9b44c31b3759
  68 +  helm-mapkubeapis_0.4.1_linux_arm64.tar.gz:
  69 +    topdir: mapkubeapis
  70 +    url: https://github.com/helm/helm-mapkubeapis/releases/download/v0.4.1/helm-mapkubeapis_0.4.1_linux_arm64.tar.gz
  71 +    sha256sum: 893ccab831d0d868768ba1bd63c0186f83ffda89cd95c0bc86cb12add9fe0d05
  72
  73  revision:
  74    dist: $STX_DIST
  75 --
  76 2.30.2
  77