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

   1 From 1b3c2bf1aa20eb17cbafd54e85e7afe806a91aaf Mon Sep 17 00:00:00 2001
   2 From: Jackie Huang <jackie.huang@windriver.com>
   3 Date: Wed, 12 Jul 2023 10:32:54 +0800
   4 Subject: [PATCH 2/2] puppet-manifests: add arm64 support for etcd
   5
   6 Add environmnet ETCD_UNSUPPORTED_ARCH=arm64 for etcd
   7 so it will workaround the unsupported warning.
   8
   9 Test Plan:
  10 PASS: build-pkgs on x86-64 host
  11 PASS: build-image on x86-64 host
  12 PASS: build-pkgs on arm64 host
  13 PASS: build-image on arm64 host
  14 PASS: install AIO-SX on x86-64 targets
  15 PASS: install AIO-SX on arm64 targets
  16
  17 Story: 2010739
  18 Task: 48284
  19
  20 Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
  21 ---
  22  puppet-manifests/debian/deb_folder/rules | 2 ++
  23  1 file changed, 2 insertions(+)
  24
  25 diff --git a/puppet-manifests/debian/deb_folder/rules b/puppet-manifests/debian/deb_folder/rules
  26 index f5ba9a01..081e869c 100755
  27 --- a/puppet-manifests/debian/deb_folder/rules
  28 +++ b/puppet-manifests/debian/deb_folder/rules
  29 @@ -14,6 +14,8 @@ override_dh_usrlocal:
  30  override_dh_install:
  31  ifeq ($(DEB_HOST_ARCH),arm64)
  32         sed -i "s/amd64/arm64/" $(CURDIR)/bin/puppet-update-grub-env.py
  33 +       sed -i '/EnvironmentFile/a Environment="ETCD_UNSUPPORTED_ARCH=arm64"' \
  34 +               $(CURDIR)/modules/platform/templates/etcd-override.conf.erb
  35  endif
  36         $(MAKE) install hiera_v5=true ignore_puppet_warnings=true \
  37                 BINDIR=$(CURDIR)/debian/tmp/usr/local/bin \
  38 --
  39 2.30.2
  40