Sorry, there is the third commit also need to be cherry-picked :

================================================

commit e0bf31f63f2278648a63632af22ad3d183873807

Author: Jim Gauld <james.gauld@windriver.com>

Date:   Tue Apr 7 14:13:34 2020 -0400

Add support for Helm v3, chartmuseum, and armada chart

B,R
Haiqing Bai

From: Bai, Haiqing
Sent: Wednesday, November 25, 2020 4:45 PM
To: starlingx-discuss@lists.starlingx.io
Cc: Wold, Saul <Saul.Wold@windriver.com>; Tao, Yue <Yue.Tao@windriver.com>; Zhang, Xiao <xiao.zhang@windriver.com>; Fu, YongX <yongx.fu@intel.com>; haridhar.kalvala@intel.com; 'lilong-neu' <lilong-neu@neusoft.com>; 'cdq' <chen.dq@neusoft.com>
Subject: RE: [centos8] build-pkgs failed to build on f/centos8 branch: No matching package to install: 'chartmuseum'

Hi,

       There are some building issues caused by  ‘chartmuseum’,  hope the below two commits can be merged into f/centos8 branch soon, thanks.

=======starlingx/tools=====================================

commit 572ffec838388bd603b059324ef468dc859f1b6f

Author: Jim Gauld <james.gauld@windriver.com>

Date:   Tue Jun 2 12:04:04 2020 -0400

    Special handling of chartmuseum binary download

commit 0cdd4acac8f6f9e596a9d3c8c65a01d956b65d61

Author: Jim Gauld <james.gauld@windriver.com>

Date:   Tue Jun 2 16:48:15 2020 -0400

    Add helm v3, chartmuseum, and armada tarballs

B,R

Haiqing Bai

From: Bai, Haiqing
Sent: Thursday, November 19, 2020 3:16 PM
To: 'starlingx-discuss@lists.starlingx.io' <starlingx-discuss@lists.starlingx.io>
Cc: Wold, Saul <Saul.Wold@windriver.com>; Tao, Yue <Yue.Tao@windriver.com>; Zhang, Xiao <xiao.zhang@windriver.com>; 'Fu, YongX' <yongx.fu@intel.com>; 'haridhar.kalvala@intel.com' <haridhar.kalvala@intel.com>; 'lilong-neu' <lilong-neu@neusoft.com>; 'cdq' <chen.dq@neusoft.com>
Subject: [centos8] build-pkgs failed to build on f/centos8 branch: No matching package to install: 'chartmuseum'

Build-pkgs on f/centos8 branch has below issue for some “helm” packages:

DEBUG util.py:634:  Ignoring repositories: local-installer

DEBUG util.py:634:  No matching package to install: 'chartmuseum'

DEBUG util.py:634:  Not all dependencies satisfied

DEBUG util.py:634:  Error: Some packages could not be found.

DEBUG util.py:787:  Child return code was: 1

DEBUG util.py:359:  kill orphans

Talked this issue with Fuyong,   actually chartmuseum is built from chartmuseum-v0.12.0-amd64,

to fix this issue, the below commit on “master” must be cherry-picked:

=======starlingx/tools=====================================

commit 572ffec838388bd603b059324ef468dc859f1b6f

Author: Jim Gauld <james.gauld@windriver.com>

Date:   Tue Jun 2 12:04:04 2020 -0400

    Special handling of chartmuseum binary download

    This enables chartmuseum binary v0.12.0 as a download target

    instead of expecting a tarball. This is looking for the specific

    tarball-dl.lst entry !chartmuseum-v0.12.0-amd64 .

    The chartmuseum binary is required to build helm charts.

    Change-Id: Iae7f3543313894310c85f6c55bb6d8f58cfb71ae

    Story: 2007000

    Task: 38893

Signed-off-by: Jim Gauld <james.gauld@windriver.com>

=====starlingx/integ========================================

commit 0cdd4acac8f6f9e596a9d3c8c65a01d956b65d61

Author: Jim Gauld <james.gauld@windriver.com>

Date:   Tue Jun 2 16:48:15 2020 -0400

    Add helm v3, chartmuseum, and armada tarballs

    This includes download tarballs required to support Helm v3

    and containerized armada:

    - armada

    - helm v3.2.0

    - chartmuseum 0.12.0, and binary

    The helm 2.13.1 version is to be removed in a subsequent commit.

    Depends-On: https://review.opendev.org/732731

    Change-Id: I3b694c4b2421ed00cb95ea01e4a79bf7c633678b

    Story: 2007000

    Task: 38893

Signed-off-by: Jim Gauld james.gauld@windriver.com

It seems this case is very typical  to show the  importance of rebasing “f/centos8”,  to avoid

much double effort on the same issue.