build cleanup for 17.1.1-5

This commit is contained in:
mjames-upc 2018-01-22 17:13:13 -07:00
parent 04a100af8f
commit 3797c07649
4 changed files with 12 additions and 8 deletions

View file

@ -1,7 +1,7 @@
#!/bin/bash #!/bin/bash
# Version # Version
export AWIPSII_VERSION="17.1.1" export AWIPSII_VERSION="17.1.1"
export AWIPSII_RELEASE="4" export AWIPSII_RELEASE="5"
# Author # Author
export AWIPSII_BUILD_VENDOR="UCAR" export AWIPSII_BUILD_VENDOR="UCAR"
export AWIPSII_BUILD_SITE="Unidata" export AWIPSII_BUILD_SITE="Unidata"

View file

@ -13,6 +13,7 @@ pushd $REPO
# if not mounted to docker container, clone from github # if not mounted to docker container, clone from github
if [ ! -d awips2-ncep ]; then git clone https://github.com/Unidata/awips2-ncep.git --branch unidata_${AWIPSII_VERSION} --single-branch ;fi if [ ! -d awips2-ncep ]; then git clone https://github.com/Unidata/awips2-ncep.git --branch unidata_${AWIPSII_VERSION} --single-branch ;fi
if [ ! -d awips2-goesr ]; then git clone https://github.com/Unidata/awips2-goesr.git --branch unidata_${AWIPSII_VERSION} --single-branch ;fi
if [ ! -d awips2-core ]; then git clone https://github.com/Unidata/awips2-core.git --branch unidata_${AWIPSII_VERSION} --single-branch ;fi if [ ! -d awips2-core ]; then git clone https://github.com/Unidata/awips2-core.git --branch unidata_${AWIPSII_VERSION} --single-branch ;fi
if [ ! -d awips2-core-foss ]; then git clone https://github.com/Unidata/awips2-core-foss.git --branch unidata_${AWIPSII_VERSION} --single-branch ;fi if [ ! -d awips2-core-foss ]; then git clone https://github.com/Unidata/awips2-core-foss.git --branch unidata_${AWIPSII_VERSION} --single-branch ;fi
if [ ! -d awips2-foss ]; then git clone https://github.com/Unidata/awips2-foss.git --branch unidata_${AWIPSII_VERSION} --single-branch ;fi if [ ! -d awips2-foss ]; then git clone https://github.com/Unidata/awips2-foss.git --branch unidata_${AWIPSII_VERSION} --single-branch ;fi
@ -35,13 +36,13 @@ if [ ! -z "$prog" ]; then
su - awips -c "/bin/bash $buildsh -b $prog" su - awips -c "/bin/bash $buildsh -b $prog"
else else
# Build all groups (in this order) # Build all groups (in this order)
#su - awips -c "/bin/bash $buildsh -ade" su - awips -c "/bin/bash $buildsh -ade"
#su - awips -c "/bin/bash $buildsh -python" su - awips -c "/bin/bash $buildsh -python"
#su - awips -c "/bin/bash $buildsh -qpid" su - awips -c "/bin/bash $buildsh -qpid"
#su - awips -c "/bin/bash $buildsh -server" su - awips -c "/bin/bash $buildsh -server"
su - awips -c "/bin/bash $buildsh -edex" su - awips -c "/bin/bash $buildsh -edex"
#su - awips -c "/bin/bash $buildsh -database" su - awips -c "/bin/bash $buildsh -database"
#su - awips -c "/bin/bash $buildsh -cave" su - awips -c "/bin/bash $buildsh -cave"
fi fi
# Manage RPMs # Manage RPMs

View file

@ -17,3 +17,5 @@ javaUtilities/* rpms pythonPackages nativeLib/*
../awips2-ncep/viz/* ../awips2-ncep/viz/*
../awips2-ncep/features/* ../awips2-ncep/features/*
../awips2-ncep/edex/* ../awips2-ncep/edex/*
../awips2-goesr/edexOsgi/*
../awips2-goesr/cave/*

View file

@ -14,8 +14,9 @@ if [ -d /awips2/repo/awips2-core-foss ]; then corefoss_dir=" -v /awips2/repo/awi
if [ -d /awips2/repo/awips2-foss ]; then foss_dir=" -v /awips2/repo/awips2-foss:/awips2/repo/awips2-foss " ;fi if [ -d /awips2/repo/awips2-foss ]; then foss_dir=" -v /awips2/repo/awips2-foss:/awips2/repo/awips2-foss " ;fi
if [ -d /awips2/repo/awips2-nws ]; then nws_dir=" -v /awips2/repo/awips2-nws:/awips2/repo/awips2-nws " ;fi if [ -d /awips2/repo/awips2-nws ]; then nws_dir=" -v /awips2/repo/awips2-nws:/awips2/repo/awips2-nws " ;fi
if [ -d /awips2/repo/awips2-ncep ]; then ncep_dir=" -v /awips2/repo/awips2-ncep:/awips2/repo/awips2-ncep " ;fi if [ -d /awips2/repo/awips2-ncep ]; then ncep_dir=" -v /awips2/repo/awips2-ncep:/awips2/repo/awips2-ncep " ;fi
if [ -d /awips2/repo/awips2-goesr ]; then goesr_dir=" -v /awips2/repo/awips2-goesr:/awips2/repo/awips2-goesr " ;fi
if [ -d /awips2/repo/python-awips ]; then python_dir=" -v /awips2/repo/python-awips:/awips2/repo/python-awips " ;fi if [ -d /awips2/repo/python-awips ]; then python_dir=" -v /awips2/repo/python-awips:/awips2/repo/python-awips " ;fi
dirs=$builds_dir$static_dir$rpm_dir$core_dir$corefoss_dir$foss_dir$nws_dir$ncep_dir$python_dir dirs=$builds_dir$static_dir$rpm_dir$core_dir$corefoss_dir$foss_dir$nws_dir$ncep_dir$goesr_dir$python_dir
# run # run
sudo docker run --entrypoint=/bin/bash --privileged -d -ti -e "container=docker" $dirs unidata/awips-ade:17.1.1-$os_version sudo docker run --entrypoint=/bin/bash --privileged -d -ti -e "container=docker" $dirs unidata/awips-ade:17.1.1-$os_version