diff --git a/build/build_rpms.sh b/build/build_rpms.sh index eb7f08d6a3..694c41bb99 100755 --- a/build/build_rpms.sh +++ b/build/build_rpms.sh @@ -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 diff --git a/build/setup.sh b/build/setup.sh index 56dc334c8c..8bf6447cdd 100755 --- a/build/setup.sh +++ b/build/setup.sh @@ -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