starlingx/meta-starlingx
Code Issues Proposed changes

stx-openstack-helm: update for stx 5.0

Browse Source 
* rename the bb with _git

* update PV and PR so the generated rpm match the one
  in stx 5.0: stx-openstack-helm-1.0-83.tis.noarch.rpm

* inherit stx-metadata to help get updated files.

* inherit stx-chartmuseum to help build the helm charts.

* add dependency on python-k8sapp-openstack according
  to the spec in stx 5.0

Story: 2008952
Task: 42576

Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
Change-Id: Id90344a300dc6e40c31f8f510ef0c5867e3e528c
This commit is contained in:
Jackie Huang 2021-06-23 14:55:10 +08:00
parent 1ac299fd5f
commit 9a05441b33
1 changed files with 27 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

67
meta-stx-flock/stx-openstack-armada-app/stx-openstack-helm_1.0.bb → meta-stx-flock/stx-openstack-armada-app/stx-openstack-helm_git.bb
View File

@ -1,26 +1,26 @@
SUMMARY = "StarlingX Openstack Application Helm charts"
DESCRIPTION = "StarlingX Openstack Application Helm charts"
LICENSE = "Apache-2.0"
LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10"
PV = "1.0"
PR = "83"
PRAUTO = "tis"
DEPENDS += " \
helm-native \
openstack-helm \
openstack-helm-infra \
stx-platform-helm \
"
PROTOCOL = "https"
BRANCH = "r/stx.3.0"
SRCREV = "863f4b9733d3d4f4fd490606a94b84cfdaf2df2c"
SRC_URI = "git://opendev.org/starlingx/openstack-armada-app;protocol=${PROTOCOL};branch=${BRANCH}"
S = "${WORKDIR}/git/stx-openstack-helm/stx-openstack-helm"
inherit allarch
inherit stx-chartmuseum
inherit stx-metadata
STX_REPO = "openstack-armada-app"
STX_SUBPATH = "${BPN}/${BPN}"
S = "${WORKDIR}/${BPN}"
helm_folder = "${nonarch_libdir}/helm"
armada_folder = "${nonarch_libdir}/armada"
@ -30,37 +30,22 @@ helmchart_version = "0.1.0"
do_configure[noexec] = "1"
do_unpack_append() {
bb.build.exec_func('do_restore_files', d)
}
do_restore_files() {
cp -rf ${STX_METADATA_PATH} ${WORKDIR}
}
do_compile () {
# initialize helm and build the toolkit
# helm init --client-only does not work if there is no networking
# The following commands do essentially the same as: helm init
export HOME="${B}/${USER}"
export helm_home="${B}/${USER}/.helm"
rm -rf ${helm_home}
mkdir -p ${helm_home}
mkdir ${helm_home}/repository
mkdir ${helm_home}/repository/cache
mkdir ${helm_home}/repository/local
mkdir ${helm_home}/plugins
mkdir ${helm_home}/starters
mkdir ${helm_home}/cache
mkdir ${helm_home}/cache/archive
# Stage a repository file that only has a local repo
cp ${S}/files/repositories.yaml ${helm_home}/repository/repositories.yaml
# Stage a local repo index that can be updated by the build
cp ${S}/files/index.yaml ${helm_home}/repository/local/index.yaml
# Stage helm-toolkit in the local repo
cp ${RECIPE_SYSROOT}${helm_folder}/helm-toolkit-${toolkit_version}.tgz .
cp ${RECIPE_SYSROOT}${helm_folder}/helm-toolkit-${toolkit_version}.tgz ${S}/helm-charts/
# Host a server for the charts
helm serve --repo-path . &
sleep 1
helm repo rm local
helm repo add local http://localhost:8879/charts
chartmuseum --debug --port=${CHARTMUSEUM_PORT} --context-path='/charts' --storage="local" --storage-local-rootdir="./helm-charts" &
sleep 2
helm repo add local http://localhost:${CHARTMUSEUM_PORT}/charts
# Make the charts. These produce a tgz file
cd ${S}/helm-charts
@ -70,14 +55,14 @@ do_compile () {
make fm-rest-api
make nginx-ports-control
make dcdbsync
make psp-rolebinding
cd -
# terminate helm server (the last backgrounded task)
kill $!
rm -rf ${helm_home}
# Remove the helm-toolkit tarball
rm helm-toolkit-${toolkit_version}.tgz
rm ${S}/helm-charts/helm-toolkit-${toolkit_version}.tgz
}
do_install () {
@ -99,4 +84,6 @@ RDEPENDS_${PN} = " \
helm \
openstack-helm \
openstack-helm-infra \
python-k8sapp-openstack \
python-k8sapp-openstack-wheels \
"