From 44e0c64748574ba2ae0d3bb2c08da5bc0cb26329 Mon Sep 17 00:00:00 2001 From: Yue Tao Date: Tue, 7 Dec 2021 16:56:27 +0800 Subject: [PATCH] helm: update meta_data.yaml and remove dl_hook "dl_files" replaces the ${HELM_SOURCE} in dl_hook "src_path" replaces the ${SRC} in dl_hook debrepack deploys the 2 fields to build directory, so no longer need dl_hook Test Plan: Pass: successfully build test Story: 2009101 Task: 43715 Signed-off-by: Yue Tao Change-Id: Icae8471dc5480f8176946143361e65f626ca5fef --- kubernetes/helm/debian/dl_hook | 18 ------------------ kubernetes/helm/debian/meta_data.yaml | 7 ++++++- 2 files changed, 6 insertions(+), 19 deletions(-) delete mode 100755 kubernetes/helm/debian/dl_hook diff --git a/kubernetes/helm/debian/dl_hook b/kubernetes/helm/debian/dl_hook deleted file mode 100755 index 455a64075..000000000 --- a/kubernetes/helm/debian/dl_hook +++ /dev/null @@ -1,18 +0,0 @@ -#!/bin/bash -set -x - -PKG_BUILD_NAME=$1 -PKG_BUILD_ROOT=$(realpath `pwd`/${PKG_BUILD_NAME}) -STX_BASE=$(realpath ${MY_REPO}/stx) -SRC=$(realpath ${STX_BASE}/integ/kubernetes/helm/centos/files) - -mkdir ${PKG_BUILD_ROOT} -pushd ${PKG_BUILD_ROOT} -cp -pr ${SRC}/* ${PKG_BUILD_ROOT}/ - -# Local mirror workaround until CGCS_BASE mirror is supported. -STX_MIRROR=$(realpath "/import/mirrors/starlingx") - -# Download and extract helm source package. -HELM_SOURCE=$(realpath ${STX_MIRROR}/downloads/helm-v3.2.1-linux-amd64.tar.gz) -cp ${HELM_SOURCE} ${PKG_BUILD_ROOT} diff --git a/kubernetes/helm/debian/meta_data.yaml b/kubernetes/helm/debian/meta_data.yaml index 477278a8e..7ad896cc9 100644 --- a/kubernetes/helm/debian/meta_data.yaml +++ b/kubernetes/helm/debian/meta_data.yaml @@ -1,7 +1,12 @@ --- debname: helm debver: 3.2.1-1 -dl_hook: dl_hook +src_path: centos/files +dl_files: + helm-v3.2.1-linux-amd64.tar.gz: + topdir: linux-amd64 + url: https://get.helm.sh/helm-v3.2.1-linux-amd64.tar.gz + md5sum: 98764c2c0175bd306223cc985700d619 revision: dist: $STX_DIST PKG_GITREVCOUNT: true