starlingx/meta-starlingx
Code Issues Proposed changes

armada-app: fix build failure on centos

Browse Source 
- use $! instead of pidof to get the last backgrounded helm service
- add a sleep after helm serve to ensure the servie is running

Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
Signed-off-by: Babak Sarashki <Babak.SarAshki@windriver.com>
This commit is contained in:
Jackie Huang 2020-04-25 20:58:07 -07:00 committed by Babak Sarashki
parent 33d09aa4c3
commit 4d09853400
6 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
meta-stx-flock/stx-monitor-armada-app/monitor-helm-elastic_1.0.bb
View File

@ -65,6 +65,7 @@ do_compile () {
# Host a server for the charts # Host a server for the charts
helm serve --repo-path . & helm serve --repo-path . &
sleep 1
helm repo rm local helm repo rm local
helm repo add local http://localhost:8879/charts helm repo add local http://localhost:8879/charts
@ -72,9 +73,8 @@ do_compile () {
rm elasticsearch/Makefile rm elasticsearch/Makefile
make elasticsearch make elasticsearch
# terminate helm server # terminate helm server (the last backgrounded task)
pid=`/bin/pidof helm` kill $!
kill ${pid}
rm -rf ${helm_home} rm -rf ${helm_home}
} }

6
meta-stx-flock/stx-monitor-armada-app/monitor-helm_1.0.bb
View File

@ -72,6 +72,7 @@ do_compile () {
# Host a server for the charts # Host a server for the charts
helm serve --repo-path . & helm serve --repo-path . &
sleep 1
helm repo rm local helm repo rm local
helm repo add local http://localhost:8879/charts helm repo add local http://localhost:8879/charts
@ -85,9 +86,8 @@ do_compile () {
make logstash make logstash
make elasticsearch-curator make elasticsearch-curator
# terminate helm server # terminate helm server (the last backgrounded task)
pid=`/bin/pidof helm` kill $!
kill ${pid}
rm -rf ${helm_home} rm -rf ${helm_home}
} }

6
meta-stx-flock/stx-openstack-armada-app/openstack-helm-infra_1.0.bb
View File

@ -62,6 +62,7 @@ do_compile () {
# Host a server for the charts # Host a server for the charts
tmpdir=`mktemp -d ${B}/charts-XXXXXX` tmpdir=`mktemp -d ${B}/charts-XXXXXX`
helm serve ${tmpdir} --address localhost:8879 --url http://localhost:8879/charts & helm serve ${tmpdir} --address localhost:8879 --url http://localhost:8879/charts &
sleep 1
helm repo rm local helm repo rm local
helm repo add local http://localhost:8879/charts helm repo add local http://localhost:8879/charts
@ -76,9 +77,8 @@ do_compile () {
make rabbitmq make rabbitmq
make ceph-rgw make ceph-rgw
# terminate helm server # terminate helm server (the last backgrounded task)
pid=`/bin/pidof helm` kill $!
kill ${pid}
rm -rf ${helm_home} rm -rf ${helm_home}
} }

6
meta-stx-flock/stx-openstack-armada-app/openstack-helm_1.0.bb
View File

@ -69,6 +69,7 @@ do_compile () {
# Host a server for the charts # Host a server for the charts
helm serve --repo-path . & helm serve --repo-path . &
sleep 1
helm repo rm local helm repo rm local
helm repo add local http://localhost:8879/charts helm repo add local http://localhost:8879/charts
@ -88,9 +89,8 @@ do_compile () {
make panko make panko
make placement make placement
# terminate helm server # terminate helm server (the last backgrounded task)
pid=`/bin/pidof helm` kill $!
kill ${pid}
rm -rf ${helm_home} rm -rf ${helm_home}
# Remove the helm-toolkit tarball # Remove the helm-toolkit tarball

6
meta-stx-flock/stx-openstack-armada-app/stx-openstack-helm_1.0.bb
View File

@ -58,6 +58,7 @@ do_compile () {
# Host a server for the charts # Host a server for the charts
helm serve --repo-path . & helm serve --repo-path . &
sleep 1
helm repo rm local helm repo rm local
helm repo add local http://localhost:8879/charts helm repo add local http://localhost:8879/charts
@ -71,9 +72,8 @@ do_compile () {
make dcdbsync make dcdbsync
cd - cd -
# terminate helm server # terminate helm server (the last backgrounded task)
pid=`/bin/pidof helm` kill $!
kill ${pid}
rm -rf ${helm_home} rm -rf ${helm_home}
# Remove the helm-toolkit tarball # Remove the helm-toolkit tarball

6
meta-stx-flock/stx-platform-armada-app/stx-platform-helm_1.0.bb
View File

@ -64,6 +64,7 @@ do_compile () {
# Host a server for the charts # Host a server for the charts
helm serve --repo-path . & helm serve --repo-path . &
sleep 1
helm repo rm local helm repo rm local
helm repo add local http://localhost:8879/charts helm repo add local http://localhost:8879/charts
@ -76,9 +77,8 @@ do_compile () {
make node-feature-discovery make node-feature-discovery
cd - cd -
# Terminate helm server # Terminate helm server (the last backgrounded task)
pid=`/bin/pidof helm` kill $!
kill ${pid}
rm -rf ${helm_home} rm -rf ${helm_home}
# Create a chart tarball compliant with sysinv kube-app.py # Create a chart tarball compliant with sysinv kube-app.py