From e61db8ae7d9eccf2182d9f71e21869f96422965a Mon Sep 17 00:00:00 2001 From: Yue Tao Date: Wed, 17 Nov 2021 17:37:34 +0800 Subject: [PATCH] armada-helm-toolkit: use dl_path instead of dl_hook The "dl_path" is used to set the downloading information of the source tar ball of a package, and debrepack module can extract the tar ball by parsing the meta_data.yaml automatically, that is equal to "dl_hook" scripts. Test Plan: Pass: successfully build test Story: 2009221 Task: 43917 Signed-off-by: Yue Tao Change-Id: Ie70517814a16852a9ab20495c2fc51622acd8e2f --- kubernetes/armada-helm-toolkit/debian/dl_hook | 20 ------------------- .../armada-helm-toolkit/debian/meta_data.yaml | 5 ++++- 2 files changed, 4 insertions(+), 21 deletions(-) delete mode 100755 kubernetes/armada-helm-toolkit/debian/dl_hook diff --git a/kubernetes/armada-helm-toolkit/debian/dl_hook b/kubernetes/armada-helm-toolkit/debian/dl_hook deleted file mode 100755 index c3961ce7c..000000000 --- a/kubernetes/armada-helm-toolkit/debian/dl_hook +++ /dev/null @@ -1,20 +0,0 @@ -#!/bin/bash -set -x - -PKG_BUILD_NAME=$1 -PKG="openstack-helm-infra" -PKG_BUILD_ROOT=$(realpath `pwd`/${PKG_BUILD_NAME}) -mkdir -p ${PKG_BUILD_ROOT} -pushd ${PKG_BUILD_ROOT} - -# Local mirror workaround until CGCS_BASE mirror is supported. -STX_MIRROR=$(realpath "/import/mirrors/starlingx") - -# Download armada-helm-toolkit helm source package. -ARMADA_HELM_TOOLKIT_PKG="openstack-helm-infra-c9d6676bf9a5aceb311dc31dadd07cba6a3d6392.tar.gz" -ARMADA_HELM_TOOLKIT_SRC_PATH=$(realpath ${STX_MIRROR}/downloads/${ARMADA_HELM_TOOLKIT_PKG}) -cp ${ARMADA_HELM_TOOLKIT_SRC_PATH} ${PKG_BUILD_ROOT} - -# Extract the armada tar file. -tar xfz ${ARMADA_HELM_TOOLKIT_PKG} -cp -pr ${PKG}/* ${PKG_BUILD_ROOT} diff --git a/kubernetes/armada-helm-toolkit/debian/meta_data.yaml b/kubernetes/armada-helm-toolkit/debian/meta_data.yaml index b94dad673..694a10796 100644 --- a/kubernetes/armada-helm-toolkit/debian/meta_data.yaml +++ b/kubernetes/armada-helm-toolkit/debian/meta_data.yaml @@ -1,7 +1,10 @@ --- debname: armada-helm-toolkit debver: 1.0-1 -dl_hook: dl_hook +dl_path: + name: openstack-helm-infra-c9d6676bf9a5aceb311dc31dadd07cba6a3d6392.tar.gz + url: https://github.com/openstack/openstack-helm-infra/archive/c9d6676bf9a5aceb311dc31dadd07cba6a3d6392.tar.gz + md5sum: 6b4ad40b343c346ee54443337edd2be3 revision: dist: $STX_DIST PKG_GITREVCOUNT: true