xan/awips2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

docker build use cli arg for rpm name if provided

Browse source
This commit is contained in:
mjames-upc 2017-11-16 09:55:32 -07:00
parent b4f0e4bfec
commit 828535dfc1
2 changed files with 17 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
build/build_rpms.sh
View file

@ -26,20 +26,23 @@ if [ ! -d awips2-static ]; then
rm -rf static.tar
fi
# Test build procedure on a quick rpm
#su - awips -c "/bin/bash $buildsh -b awips2"
#su - awips -c "/bin/bash $buildsh -b awips2-maps-database"
su - awips -c "/bin/bash $buildsh -b awips2-database"
#su - awips -c "/bin/bash $buildsh -b awips2-ncep-database"
# to test the dockerized build procedure on a quick rpm
#su - awips -c "/bin/bash $buildsh -b awips2-ldm"
# Build all groups (in this order)
#su - awips -c "/bin/bash $buildsh -ade"
#su - awips -c "/bin/bash $buildsh -python"
#su - awips -c "/bin/bash $buildsh -qpid"
#su - awips -c "/bin/bash $buildsh -server"
#su - awips -c "/bin/bash $buildsh -edex"
#su - awips -c "/bin/bash $buildsh -database"
#su - awips -c "/bin/bash $buildsh -cave"
# provides rpm name as arg (ex: ./build/setup.sh el7 awips2-python-jep)
prog=$2
if [ ! -z "$prog" ]; then
su - awips -c "/bin/bash $buildsh -b $prog"
else
# Build all groups (in this order)
#su - awips -c "/bin/bash $buildsh -ade"
#su - awips -c "/bin/bash $buildsh -python"
#su - awips -c "/bin/bash $buildsh -qpid"
#su - awips -c "/bin/bash $buildsh -server"
su - awips -c "/bin/bash $buildsh -edex"
#su - awips -c "/bin/bash $buildsh -database"
#su - awips -c "/bin/bash $buildsh -cave"
fi
# Manage RPMs
if [ "$(ls -A ${JENKINS_HOME}/build/rpms/awips2_${AWIPSII_VERSION}/x86_64/)" ]; then

2
build/setup.sh
View file

@ -21,7 +21,7 @@ dirs=$builds_dir$static_dir$rpm_dir$core_dir$corefoss_dir$foss_dir$nws_dir$ncep_
sudo docker run --entrypoint=/bin/bash --privileged -d -ti -e "container=docker" $dirs unidata/awips-ade:17.1.1-$os_version
dockerID=$(sudo docker ps | grep awips-ade | awk '{print $1}' | head -1 )
sudo docker logs $dockerID
sudo docker exec -ti $dockerID /bin/bash -xec "/awips2/repo/awips2-builds/build/build_rpms.sh $os_version";
sudo docker exec -ti $dockerID /bin/bash -xec "/awips2/repo/awips2-builds/build/build_rpms.sh $os_version $2";
sudo docker stop $dockerID
sudo docker rm -v $dockerID