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

/data_store->/awips2/data_store; EDEX raw data purge every hour; incl. hydroapps linux32 libs in RPM build; other pkg updates

Browse source
This commit is contained in:
mjames-upc 2016-07-28 14:04:15 -06:00
parent 1ae577ee7a
commit 65ea1370ad
10 changed files with 67 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
RadarServer/com.raytheon.rcm.server/src/com/raytheon/rcm/config/importer/Importer.java
View file

@ -147,7 +147,7 @@ public class Importer {
// Create a fallback configuration if the if necessary.
if (ec == null) {
ec = new EndpointConfig();
ec.setArchiveRoot("/data_store/radar");
ec.setArchiveRoot("/awips2/data_store/radar");
ec.setConnectionURL("amqp://guest:guest@/edex?brokerlist='tcp://edex-server:5672'");
}
doc.endpointConfig = ec;

6
edexOsgi/com.raytheon.uf.edex.archive/utility/common_static/base/archiver/purger/RAW_DATA.xml
View file

@ -118,7 +118,7 @@
Example with multiple <dirPattern>s
<category>
<name>Observation</name>
<selectedRetentionHours>168</selectedRetentionHours>
<selectedRetentionHours>1</selectedRetentionHours>
<dataSet>
<dirPattern>(acars|airep|airmet|taf)</dirPattern>
<dirPattern>(bufrsigwx|sfcobs)/.*</dirPattern>
@ -140,8 +140,8 @@
-->
<archive>
<name>Raw</name>
<rootDir>/data_store/</rootDir>
<defaultRetentionHours>168</defaultRetentionHours>
<rootDir>/awips2/data_store/</rootDir>
<defaultRetentionHours>1</defaultRetentionHours>
<category>
<name>Local</name>
<selectedRetentionHours>1</selectedRetentionHours>

7
rpms/awips2.core/Installer.hydroapps/component.spec
View file

@ -49,6 +49,13 @@ if [ $? -ne 0 ]; then
exit 1
fi
FILES_STATIC="%{_static_files}/hydroapps"
/bin/cp -rf ${FILES_STATIC}/* \
%{_build_root}/awips2/edex/data/share/hydroapps/lib/native/linux32/
if [ $? -ne 0 ]; then
exit 1
fi
/usr/bin/find %{_build_root}/awips2/edex/data/share -name .gitignore -exec rm -rf {} \;
if [ $? -ne 0 ]; then
exit 1

2
rpms/awips2.core/Installer.ldm/patch/bin/monitor_data_store.sh
View file

@ -6,7 +6,7 @@ then
exit 0
fi
cd /data_store
cd /awips2/data_store
while true
do
for _dir in `ls`

3
rpms/awips2.core/deploy.builder/build.sh
View file

@ -136,9 +136,8 @@ function buildLocalizationRPMs()
--define '_component_release %(echo ${AWIPSII_RELEASE})' \
--define '_component_name %(echo ${COMPONENT_NAME})' \
--define '_baseline_workspace %(echo ${WORKSPACE_DIR})' \
--define '_localization_site %(echo ${site})' \
--define '_localization_directory %(echo ${LOCALIZATION_DIRECTORY})' \
--define '_build_site %(echo ${AWIPSII_BUILD_SITE})' \
--define '_build_site %(echo ${AWIPSII_BUILD_SITE})' \
--buildroot ${BUILDROOT_DIR} \
../Installer.localization/component.spec
RC=$?

1
rpms/awips2.edex/Installer.edex/component.spec
View file

@ -20,6 +20,7 @@ requires: awips2-python
requires: awips2-java
requires: awips2-psql
requires: awips2-yajsw
Obsoletes: awips2-edex-grib < 16.1.6
%description
AWIPS II Edex Installation - Installs and configures AWIPS II Edex.

38
rpms/build/x86_64/build.sh
View file

@ -107,31 +107,31 @@ if [ "${1}" = "-jep" ]; then
buildRPM "awips2-python-jep"
fi
if [ "${1}" = "-pydev" ]; then
buildRPM "awips2-python"
buildRPM "awips2-python-scientific"
#buildRPM "awips2-python"
#buildRPM "awips2-python-scientific"
buildRPM "awips2-python-awips"
buildRPM "awips2-python-jep"
buildRPM "awips2-python-gfe"
buildRPM "awips2-python-numpy"
buildRPM "awips2-python-pyparsing"
buildRPM "awips2-python-six"
buildRPM "awips2-python-nose"
buildRPM "awips2-python-h5py"
#buildRPM "awips2-python-jep"
#buildRPM "awips2-python-gfe"
#buildRPM "awips2-python-numpy"
#buildRPM "awips2-python-pyparsing"
#buildRPM "awips2-python-six"
#buildRPM "awips2-python-nose"
#buildRPM "awips2-python-h5py"
#buildRPM "awips2-pypies"
buildRPM "awips2-python-cycler"
buildRPM "awips2-python-shapely"
buildRPM "awips2-python-cython"
#buildRPM "awips2-python-cycler"
#buildRPM "awips2-python-shapely"
#buildRPM "awips2-python-cython"
buildRPM "awips2-python-metpy"
buildRPM "awips2-python-cartopy"
buildRPM "awips2-python-scipy"
buildRPM "awips2-python-matplotlib"
buildRPM "awips2-python-basemap"
#buildRPM "awips2-python-metpy"
#buildRPM "awips2-python-cartopy"
#buildRPM "awips2-python-scipy"
#buildRPM "awips2-python-matplotlib"
#buildRPM "awips2-python-basemap"
# DONE
buildRPM "awips2-python-pint"
buildRPM "awips2-python-dateutil"
#buildRPM "awips2-python-pint"
#buildRPM "awips2-python-dateutil"
exit 0
fi

32
rpms/build/x86_64/rpms.sh
View file

@ -102,8 +102,38 @@ function buildCAVE()
return 0
}
function buildLocalizationRPMs()
{
awips2_core_directory=${WORKSPACE}/rpms/awips2.core
installer_localization_directory="${awips2_core_directory}/Installer.localization"
localization_SPECIFICATION="${installer_localization_directory}/component.spec"
export LOCALIZATION_DIRECTORY="localization"
export COMPONENT_NAME="awips2-localization"
echo "Building localization rpm"
rpmbuild -ba \
--define '_topdir %(echo ${AWIPSII_TOP_DIR})' \
--define '_component_version %(echo ${AWIPSII_VERSION})' \
--define '_component_release %(echo ${AWIPSII_RELEASE})' \
--define '_component_name %(echo ${COMPONENT_NAME})' \
--define '_baseline_workspace %(echo ${WORKSPACE})' \
--define '_localization_directory %(echo ${LOCALIZATION_DIRECTORY})' \
--define '_build_site %(echo ${AWIPSII_BUILD_SITE})' \
--buildroot ${AWIPSII_BUILD_ROOT} \
${localization_SPECIFICATION}
RC=$?
unset LOCALIZATION_DIRECTORY
unset COMPONENT_NAME
if [ ${RC} -ne 0 ]; then
return 1
fi
return 0
}
function buildLocalizationRPMs2()
{
awips2_core_directory=${WORKSPACE}/rpms/awips2.core
extract_site_pl="${awips2_core_directory}/deploy.builder/extractSite.pl"

4
rpms/python.site-packages/Installer.python-awips/component.spec
View file

@ -9,7 +9,7 @@
Name: awips2-python-awips
Summary: AWIPS II Python awips Distribution
Version: 0.9.4
Release: 1
Release: 2
Group: AWIPSII
BuildRoot: %{_build_root}
BuildArch: %{_build_arch}
@ -46,7 +46,7 @@ fi
%build
%install
PYTHON_AWIPS=/home/awips/python-awips
PYTHON_AWIPS=/home/${USER}/python-awips
# awips (ufpy)
mkdir -p %{_build_root}/awips2/python/lib/python2.7/site-packages/awips

2
rpms/unidata/buildEnvironment.sh
View file

@ -15,7 +15,7 @@ export BUILD_WORKSPACE=${BUILD_DIR}/workspace
# baseline is...
export BASELINE="${JENKINS_WORKSPACE}"
export AWIPSII_VERSION="16.2.2"
export AWIPSII_RELEASE="3"
export AWIPSII_RELEASE="4"
export AWIPSII_TOP_DIR="${BUILD_WORKSPACE}/tmp/rpms_built_dir"